Skip to content

Rename SharedContext::emit_dyn_lint* into emit_lint* #155936

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rust-bors merged 1 commit into from
Apr 28, 2026
Merged

Rename SharedContext::emit_dyn_lint* into emit_lint* #155936

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions compiler/rustc_attr_parsing/src/attributes/cfg.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,15 +224,15 @@ pub(crate) fn parse_name_value<S: Stage>(

match cx.sess.psess.check_config.expecteds.get(&name) {
Some(ExpectedValues::Some(values)) if !values.contains(&value.map(|(v, _)| v)) => cx
.emit_dyn_lint_with_sess(
.emit_lint_with_sess(
UNEXPECTED_CFGS,
move |dcx, level, sess| {
check_cfg::unexpected_cfg_value(sess, (name, name_span), value)
.into_diag(dcx, level)
},
span,
),
None if cx.sess.psess.check_config.exhaustive_names => cx.emit_dyn_lint_with_sess(
None if cx.sess.psess.check_config.exhaustive_names => cx.emit_lint_with_sess(
UNEXPECTED_CFGS,
move |dcx, level, sess| {
check_cfg::unexpected_cfg_name(sess, (name, name_span), value).into_diag(dcx, level)
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_attr_parsing/src/attributes/crate_level.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ impl<S: Stage> CombineAttributeParser<S> for CrateTypeParser {
None,
);
let span = n.value_span;
cx.emit_dyn_lint(
cx.emit_lint(
UNKNOWN_CRATE_TYPES,
move |dcx, level| {
UnknownCrateTypes {
Expand Down
4 changes: 2 additions & 2 deletions compiler/rustc_attr_parsing/src/attributes/diagnostic/do_not_recommend.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ impl<S: Stage> SingleAttributeParser<S> for DoNotRecommendParser {
fn convert(cx: &mut AcceptContext<'_, '_, S>, args: &ArgParser) -> Option<AttributeKind> {
let attr_span = cx.attr_span;
if !matches!(args, ArgParser::NoArgs) {
cx.emit_dyn_lint(
cx.emit_lint(
MALFORMED_DIAGNOSTIC_ATTRIBUTES,
|dcx, level| crate::errors::DoNotRecommendDoesNotExpectArgs.into_diag(dcx, level),
attr_span,
Expand All @@ -33,7 +33,7 @@ impl<S: Stage> SingleAttributeParser<S> for DoNotRecommendParser {

if !matches!(cx.target, Target::Impl { of_trait: true }) {
let target_span = cx.target_span;
cx.emit_dyn_lint(
cx.emit_lint(
MISPLACED_DIAGNOSTIC_ATTRIBUTES,
move |dcx, level| {
IncorrectDoNotRecommendLocation { target_span }.into_diag(dcx, level)
Expand Down
16 changes: 8 additions & 8 deletions compiler/rustc_attr_parsing/src/attributes/diagnostic/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ fn merge<T, S: Stage>(
(Some(_) | None, None) => {}
(Some((first_span, _)), Some((later_span, _))) => {
let first_span = *first_span;
cx.emit_dyn_lint(
cx.emit_lint(
MALFORMED_DIAGNOSTIC_ATTRIBUTES,
move |dcx, level| {
IgnoredDiagnosticOption { first_span, later_span, option_name }
Expand All @@ -167,14 +167,14 @@ fn parse_list<'p, S: Stage>(
// We're dealing with `#[diagnostic::attr()]`.
// This can be because that is what the user typed, but that's also what we'd see
// if the user used non-metaitem syntax. See `ArgParser::from_attr_args`.
cx.emit_dyn_lint(
cx.emit_lint(
MALFORMED_DIAGNOSTIC_ATTRIBUTES,
move |dcx, level| NonMetaItemDiagnosticAttribute.into_diag(dcx, level),
list.span,
);
}
ArgParser::NoArgs => {
cx.emit_dyn_lint(
cx.emit_lint(
MALFORMED_DIAGNOSTIC_ATTRIBUTES,
move |dcx, level| {
MissingOptionsForDiagnosticAttribute {
Expand All @@ -187,7 +187,7 @@ fn parse_list<'p, S: Stage>(
);
}
ArgParser::NameValue(_) => {
cx.emit_dyn_lint(
cx.emit_lint(
MALFORMED_DIAGNOSTIC_ATTRIBUTES,
move |dcx, level| {
MalFormedDiagnosticAttributeLint {
Expand Down Expand Up @@ -221,7 +221,7 @@ fn parse_directive_items<'p, S: Stage>(
let span = item.span();

macro malformed() {{
cx.emit_dyn_lint(
cx.emit_lint(
MALFORMED_DIAGNOSTIC_ATTRIBUTES,
move |dcx, level| {
MalFormedDiagnosticAttributeLint {
Expand Down Expand Up @@ -249,7 +249,7 @@ fn parse_directive_items<'p, S: Stage>(

macro duplicate($name: ident, $($first_span:tt)*) {{
let first_span = $($first_span)*;
cx.emit_dyn_lint(
cx.emit_lint(
MALFORMED_DIAGNOSTIC_ATTRIBUTES,
move |dcx, level| IgnoredDiagnosticOption {
first_span,
Expand Down Expand Up @@ -285,7 +285,7 @@ fn parse_directive_items<'p, S: Stage>(
| FormatWarning::PositionalArgument { span }
| FormatWarning::IndexedArgument { span }
| FormatWarning::DisallowedPlaceholder { span, .. }) = warning;
cx.emit_dyn_lint(
cx.emit_lint(
MALFORMED_DIAGNOSTIC_FORMAT_LITERALS,
move |dcx, level| warning.into_diag(dcx, level),
span,
Expand All @@ -295,7 +295,7 @@ fn parse_directive_items<'p, S: Stage>(
f
}
Err(e) => {
cx.emit_dyn_lint(
cx.emit_lint(
MALFORMED_DIAGNOSTIC_FORMAT_LITERALS,
move |dcx, level| {
WrappedParserError {
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_attr_parsing/src/attributes/diagnostic/on_const.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ impl<S: Stage> AttributeParser<S> for OnConstParser {
// so non-constness is still checked in check_attr.rs
if !matches!(cx.target, Target::Impl { of_trait: true }) {
let target_span = cx.target_span;
cx.emit_dyn_lint(
cx.emit_lint(
MISPLACED_DIAGNOSTIC_ATTRIBUTES,
move |dcx, level| {
DiagnosticOnConstOnlyForTraitImpls { target_span }.into_diag(dcx, level)
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_attr_parsing/src/attributes/diagnostic/on_move.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ impl OnMoveParser {
self.span = Some(span);

if !matches!(cx.target, Target::Enum | Target::Struct | Target::Union) {
cx.emit_dyn_lint(
cx.emit_lint(
MISPLACED_DIAGNOSTIC_ATTRIBUTES,
move |dcx, level| DiagnosticOnMoveOnlyForAdt.into_diag(dcx, level),
span,
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_attr_parsing/src/attributes/diagnostic/on_unimplemented.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ impl OnUnimplementedParser {
self.span = Some(span);

if !matches!(cx.target, Target::Trait) {
cx.emit_dyn_lint(
cx.emit_lint(
MISPLACED_DIAGNOSTIC_ATTRIBUTES,
move |dcx, level| DiagnosticOnUnimplementedOnlyForTraits.into_diag(dcx, level),
span,
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_attr_parsing/src/attributes/diagnostic/on_unknown.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ impl OnUnknownParser {

if !early && !matches!(cx.target, Target::Use) {
let target_span = cx.target_span;
cx.emit_dyn_lint(
cx.emit_lint(
MISPLACED_DIAGNOSTIC_ATTRIBUTES,
move |dcx, level| {
DiagnosticOnUnknownOnlyForImports { target_span }.into_diag(dcx, level)
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_attr_parsing/src/attributes/diagnostic/on_unmatch_args.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ impl<S: Stage> AttributeParser<S> for OnUnmatchArgsParser {
this.span = Some(span);

if !matches!(cx.target, Target::MacroDef) {
cx.emit_dyn_lint(
cx.emit_lint(
MISPLACED_DIAGNOSTIC_ATTRIBUTES,
move |dcx, level| DiagnosticOnUnmatchArgsOnlyForMacros.into_diag(dcx, level),
span,
Expand Down
50 changes: 25 additions & 25 deletions compiler/rustc_attr_parsing/src/attributes/doc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ fn check_attr_not_crate_level<S: Stage>(
/// Checks that an attribute is used at the crate level. Returns `true` if valid.
fn check_attr_crate_level<S: Stage>(cx: &mut AcceptContext<'_, '_, S>, span: Span) -> bool {
if cx.shared.target != Target::Crate {
cx.emit_dyn_lint(
cx.emit_lint(
rustc_session::lint::builtin::INVALID_DOC_ATTRIBUTES,
|dcx, level| AttrCrateLevelOnly.into_diag(dcx, level),
span,
Expand All @@ -84,7 +84,7 @@ fn expected_name_value<S: Stage>(
span: Span,
_name: Option<Symbol>,
) {
cx.emit_dyn_lint(
cx.emit_lint(
rustc_session::lint::builtin::INVALID_DOC_ATTRIBUTES,
|dcx, level| ExpectedNameValue.into_diag(dcx, level),
span,
Expand All @@ -93,7 +93,7 @@ fn expected_name_value<S: Stage>(

// FIXME: remove this method once merged and use `cx.expected_no_args(span)` instead.
fn expected_no_args<S: Stage>(cx: &mut AcceptContext<'_, '_, S>, span: Span) {
cx.emit_dyn_lint(
cx.emit_lint(
rustc_session::lint::builtin::INVALID_DOC_ATTRIBUTES,
|dcx, level| ExpectedNoArgs.into_diag(dcx, level),
span,
Expand All @@ -107,7 +107,7 @@ fn expected_string_literal<S: Stage>(
span: Span,
_actual_literal: Option<&MetaItemLit>,
) {
cx.emit_dyn_lint(
cx.emit_lint(
rustc_session::lint::builtin::INVALID_DOC_ATTRIBUTES,
|dcx, level| MalformedDoc.into_diag(dcx, level),
span,
Expand Down Expand Up @@ -177,7 +177,7 @@ impl DocParser {

if let Some(used_span) = self.attribute.no_crate_inject {
let unused_span = path.span();
cx.emit_dyn_lint(
cx.emit_lint(
rustc_session::lint::builtin::INVALID_DOC_ATTRIBUTES,
move |dcx, level| {
rustc_errors::lints::UnusedDuplicate {
Expand All @@ -203,7 +203,7 @@ impl DocParser {
// FIXME: remove this method once merged and uncomment the line below instead.
// cx.expected_list(cx.attr_span, args);
let span = cx.attr_span;
cx.emit_dyn_lint(
cx.emit_lint(
rustc_session::lint::builtin::INVALID_DOC_ATTRIBUTES,
|dcx, level| MalformedDoc.into_diag(dcx, level),
span,
Expand All @@ -217,14 +217,14 @@ impl DocParser {
}
}
Some(name) => {
cx.emit_dyn_lint(
cx.emit_lint(
rustc_session::lint::builtin::INVALID_DOC_ATTRIBUTES,
move |dcx, level| DocTestUnknown { name }.into_diag(dcx, level),
path.span(),
);
}
None => {
cx.emit_dyn_lint(
cx.emit_lint(
rustc_session::lint::builtin::INVALID_DOC_ATTRIBUTES,
|dcx, level| DocTestLiteral.into_diag(dcx, level),
path.span(),
Expand Down Expand Up @@ -261,7 +261,7 @@ impl DocParser {
}

if let Some(first_definition) = self.attribute.aliases.get(&alias).copied() {
cx.emit_dyn_lint(
cx.emit_lint(
rustc_session::lint::builtin::UNUSED_ATTRIBUTES,
move |dcx, level| DocAliasDuplicated { first_definition }.into_diag(dcx, level),
span,
Expand Down Expand Up @@ -349,7 +349,7 @@ impl DocParser {
ArgParser::List(list) => {
for meta in list.mixed() {
let MetaItemOrLitParser::MetaItemParser(item) = meta else {
cx.emit_dyn_lint(
cx.emit_lint(
rustc_session::lint::builtin::INVALID_DOC_ATTRIBUTES,
|dcx, level| DocAutoCfgExpectsHideOrShow.into_diag(dcx, level),
meta.span(),
Expand All @@ -360,7 +360,7 @@ impl DocParser {
Some(sym::hide) => (HideOrShow::Hide, sym::hide),
Some(sym::show) => (HideOrShow::Show, sym::show),
_ => {
cx.emit_dyn_lint(
cx.emit_lint(
rustc_session::lint::builtin::INVALID_DOC_ATTRIBUTES,
|dcx, level| DocAutoCfgExpectsHideOrShow.into_diag(dcx, level),
item.span(),
Expand All @@ -369,7 +369,7 @@ impl DocParser {
}
};
let ArgParser::List(list) = item.args() else {
cx.emit_dyn_lint(
cx.emit_lint(
rustc_session::lint::builtin::INVALID_DOC_ATTRIBUTES,
move |dcx, level| {
DocAutoCfgHideShowExpectsList { attr_name }.into_diag(dcx, level)
Expand All @@ -383,7 +383,7 @@ impl DocParser {

for item in list.mixed() {
let MetaItemOrLitParser::MetaItemParser(sub_item) = item else {
cx.emit_dyn_lint(
cx.emit_lint(
rustc_session::lint::builtin::INVALID_DOC_ATTRIBUTES,
move |dcx, level| {
DocAutoCfgHideShowUnexpectedItem { attr_name }
Expand All @@ -399,7 +399,7 @@ impl DocParser {
// FIXME: remove this method once merged and uncomment the line
// below instead.
// cx.expected_identifier(sub_item.path().span());
cx.emit_dyn_lint(
cx.emit_lint(
rustc_session::lint::builtin::INVALID_DOC_ATTRIBUTES,
|dcx, level| MalformedDoc.into_diag(dcx, level),
sub_item.path().span(),
Expand All @@ -426,7 +426,7 @@ impl DocParser {
}
}
_ => {
cx.emit_dyn_lint(
cx.emit_lint(
rustc_session::lint::builtin::INVALID_DOC_ATTRIBUTES,
move |dcx, level| {
DocAutoCfgHideShowUnexpectedItem { attr_name }
Expand All @@ -444,7 +444,7 @@ impl DocParser {
ArgParser::NameValue(nv) => {
let MetaItemLit { kind: LitKind::Bool(bool_value), span, .. } = nv.value_as_lit()
else {
cx.emit_dyn_lint(
cx.emit_lint(
rustc_session::lint::builtin::INVALID_DOC_ATTRIBUTES,
move |dcx, level| DocAutoCfgWrongLiteral.into_diag(dcx, level),
nv.value_span,
Expand Down Expand Up @@ -588,7 +588,7 @@ impl DocParser {
Some(sym::auto_cfg) => self.parse_auto_cfg(cx, path, args),
Some(sym::test) => {
let Some(list) = args.as_list() else {
cx.emit_dyn_lint(
cx.emit_lint(
rustc_session::lint::builtin::INVALID_DOC_ATTRIBUTES,
|dcx, level| DocTestTakesList.into_diag(dcx, level),
args.span().unwrap_or(path.span()),
Expand All @@ -605,7 +605,7 @@ impl DocParser {
// FIXME: remove this method once merged and uncomment the line
// below instead.
// cx.unexpected_literal(lit.span);
cx.emit_dyn_lint(
cx.emit_lint(
rustc_session::lint::builtin::INVALID_DOC_ATTRIBUTES,
|dcx, level| MalformedDoc.into_diag(dcx, level),
lit.span,
Expand All @@ -616,7 +616,7 @@ impl DocParser {
}
Some(sym::spotlight) => {
let span = path.span();
cx.emit_dyn_lint(
cx.emit_lint(
rustc_session::lint::builtin::INVALID_DOC_ATTRIBUTES,
move |dcx, level| DocUnknownSpotlight { sugg_span: span }.into_diag(dcx, level),
span,
Expand All @@ -629,7 +629,7 @@ impl DocParser {
};
let value = nv.value_as_lit().symbol;
let span = path.span();
cx.emit_dyn_lint(
cx.emit_lint(
rustc_session::lint::builtin::INVALID_DOC_ATTRIBUTES,
move |dcx, level| {
DocUnknownInclude {
Expand All @@ -644,7 +644,7 @@ impl DocParser {
}
Some(name @ (sym::passes | sym::no_default_passes)) => {
let span = path.span();
cx.emit_dyn_lint(
cx.emit_lint(
rustc_session::lint::builtin::INVALID_DOC_ATTRIBUTES,
move |dcx, level| {
DocUnknownPasses { name, note_span: span }.into_diag(dcx, level)
Expand All @@ -654,14 +654,14 @@ impl DocParser {
}
Some(sym::plugins) => {
let span = path.span();
cx.emit_dyn_lint(
cx.emit_lint(
rustc_session::lint::builtin::INVALID_DOC_ATTRIBUTES,
move |dcx, level| DocUnknownPlugins { label_span: span }.into_diag(dcx, level),
span,
);
}
Some(name) => {
cx.emit_dyn_lint(
cx.emit_lint(
rustc_session::lint::builtin::INVALID_DOC_ATTRIBUTES,
move |dcx, level| DocUnknownAny { name }.into_diag(dcx, level),
path.span(),
Expand All @@ -671,7 +671,7 @@ impl DocParser {
let full_name =
path.segments().map(|s| s.as_str()).intersperse("::").collect::<String>();
let name = Symbol::intern(&full_name);
cx.emit_dyn_lint(
cx.emit_lint(
rustc_session::lint::builtin::INVALID_DOC_ATTRIBUTES,
move |dcx, level| DocUnknownAny { name }.into_diag(dcx, level),
path.span(),
Expand All @@ -689,7 +689,7 @@ impl DocParser {
ArgParser::NoArgs => {
let suggestions = cx.adcx().suggestions();
let span = cx.attr_span;
cx.emit_dyn_lint(
cx.emit_lint(
rustc_session::lint::builtin::INVALID_DOC_ATTRIBUTES,
move |dcx, level| {
IllFormedAttributeInput::new(&suggestions, None, None).into_diag(dcx, level)
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_attr_parsing/src/attributes/proc_macro_attrs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ fn parse_derive_like<S: Stage>(
return None;
}
if rustc_feature::is_builtin_attr_name(ident.name) {
cx.emit_dyn_lint(
cx.emit_lint(
AMBIGUOUS_DERIVE_HELPERS,
|dcx, level| crate::errors::AmbiguousDeriveHelpers.into_diag(dcx, level),
ident.span,
Expand Down
Loading
Loading