Skip to content

Commit 0c93197

Browse files
Remove AttributeLintKind::DuplicateDocAlias variant
1 parent ef3b800 commit 0c93197

5 files changed

Lines changed: 11 additions & 13 deletions

File tree

compiler/rustc_attr_parsing/src/attributes/doc.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -255,9 +255,11 @@ impl DocParser {
255255
}
256256

257257
if let Some(first_definition) = self.attribute.aliases.get(&alias).copied() {
258-
cx.emit_lint(
258+
cx.emit_dyn_lint(
259259
rustc_session::lint::builtin::UNUSED_ATTRIBUTES,
260-
AttributeLintKind::DuplicateDocAlias { first_definition },
260+
move |dcx, level| {
261+
crate::errors::DocAliasDuplicated { first_definition }.into_diag(dcx, level)
262+
},
261263
span,
262264
);
263265
}

compiler/rustc_attr_parsing/src/errors.rs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,3 +166,10 @@ pub(crate) struct InvalidAttrStyle<'a> {
166166
pub target_span: Option<Span>,
167167
pub target: &'static str,
168168
}
169+
170+
#[derive(Diagnostic)]
171+
#[diag("doc alias is duplicated")]
172+
pub(crate) struct DocAliasDuplicated {
173+
#[label("first defined here")]
174+
pub first_definition: Span,
175+
}

compiler/rustc_lint/src/early/diagnostics.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,6 @@ impl<'a> Diagnostic<'a, ()> for DecorateAttrLint<'_, '_, '_> {
4242
check_cfg::unexpected_cfg_value(self.sess, self.tcx, name, value)
4343
.into_diag(dcx, level)
4444
}
45-
&AttributeLintKind::DuplicateDocAlias { first_definition } => {
46-
lints::DocAliasDuplicated { first_defn: first_definition }.into_diag(dcx, level)
47-
}
4845

4946
&AttributeLintKind::DocAutoCfgExpectsHideOrShow => {
5047
lints::DocAutoCfgExpectsHideOrShow.into_diag(dcx, level)

compiler/rustc_lint/src/lints.rs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3303,13 +3303,6 @@ pub(crate) struct ExpectedNoArgs;
33033303
)]
33043304
pub(crate) struct ExpectedNameValue;
33053305

3306-
#[derive(Diagnostic)]
3307-
#[diag("doc alias is duplicated")]
3308-
pub(crate) struct DocAliasDuplicated {
3309-
#[label("first defined here")]
3310-
pub first_defn: Span,
3311-
}
3312-
33133306
#[derive(Diagnostic)]
33143307
#[diag("only `hide` or `show` are allowed in `#[doc(auto_cfg(...))]`")]
33153308
pub(crate) struct DocAutoCfgExpectsHideOrShow;

compiler/rustc_lint_defs/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -656,7 +656,6 @@ pub enum DeprecatedSinceKind {
656656
pub enum AttributeLintKind {
657657
UnexpectedCfgName((Symbol, Span), Option<(Symbol, Span)>),
658658
UnexpectedCfgValue((Symbol, Span), Option<(Symbol, Span)>),
659-
DuplicateDocAlias { first_definition: Span },
660659
DocAutoCfgExpectsHideOrShow,
661660
DocAutoCfgHideShowUnexpectedItem { attr_name: Symbol },
662661
DocAutoCfgHideShowExpectsList { attr_name: Symbol },

0 commit comments

Comments
 (0)