Skip to content

Commit 4dd31ca

Browse files
JonathanBrouwerJonathanBrouwer
authored
Rollup merge of #155936 - GuillaumeGomez:small-cleanup, r=JonathanBrouwer,Urgau
Rename `SharedContext::emit_dyn_lint*` into `emit_lint*` Part of #153099. Very small cleanup while I figure out how to have a `Diagnostic` argument instead of the current closures. r? @JonathanBrouwer
2 parents 6b48f6f + 81d67b7 commit 4dd31ca

13 files changed

Lines changed: 52 additions & 52 deletions

File tree

‎compiler/rustc_attr_parsing/src/attributes/cfg.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,15 +224,15 @@ pub(crate) fn parse_name_value<S: Stage>(
224224

225225
match cx.sess.psess.check_config.expecteds.get(&name) {
226226
Some(ExpectedValues::Some(values)) if !values.contains(&value.map(|(v, _)| v)) => cx
227-
.emit_dyn_lint_with_sess(
227+
.emit_lint_with_sess(
228228
UNEXPECTED_CFGS,
229229
move |dcx, level, sess| {
230230
check_cfg::unexpected_cfg_value(sess, (name, name_span), value)
231231
.into_diag(dcx, level)
232232
},
233233
span,
234234
),
235-
None if cx.sess.psess.check_config.exhaustive_names => cx.emit_dyn_lint_with_sess(
235+
None if cx.sess.psess.check_config.exhaustive_names => cx.emit_lint_with_sess(
236236
UNEXPECTED_CFGS,
237237
move |dcx, level, sess| {
238238
check_cfg::unexpected_cfg_name(sess, (name, name_span), value).into_diag(dcx, level)

‎compiler/rustc_attr_parsing/src/attributes/crate_level.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ impl<S: Stage> CombineAttributeParser<S> for CrateTypeParser {
6767
None,
6868
);
6969
let span = n.value_span;
70-
cx.emit_dyn_lint(
70+
cx.emit_lint(
7171
UNKNOWN_CRATE_TYPES,
7272
move |dcx, level| {
7373
UnknownCrateTypes {

‎compiler/rustc_attr_parsing/src/attributes/diagnostic/do_not_recommend.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ impl<S: Stage> SingleAttributeParser<S> for DoNotRecommendParser {
2424
fn convert(cx: &mut AcceptContext<'_, '_, S>, args: &ArgParser) -> Option<AttributeKind> {
2525
let attr_span = cx.attr_span;
2626
if !matches!(args, ArgParser::NoArgs) {
27-
cx.emit_dyn_lint(
27+
cx.emit_lint(
2828
MALFORMED_DIAGNOSTIC_ATTRIBUTES,
2929
|dcx, level| crate::errors::DoNotRecommendDoesNotExpectArgs.into_diag(dcx, level),
3030
attr_span,
@@ -33,7 +33,7 @@ impl<S: Stage> SingleAttributeParser<S> for DoNotRecommendParser {
3333

3434
if !matches!(cx.target, Target::Impl { of_trait: true }) {
3535
let target_span = cx.target_span;
36-
cx.emit_dyn_lint(
36+
cx.emit_lint(
3737
MISPLACED_DIAGNOSTIC_ATTRIBUTES,
3838
move |dcx, level| {
3939
IncorrectDoNotRecommendLocation { target_span }.into_diag(dcx, level)

‎compiler/rustc_attr_parsing/src/attributes/diagnostic/mod.rs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ fn merge<T, S: Stage>(
140140
(Some(_) | None, None) => {}
141141
(Some((first_span, _)), Some((later_span, _))) => {
142142
let first_span = *first_span;
143-
cx.emit_dyn_lint(
143+
cx.emit_lint(
144144
MALFORMED_DIAGNOSTIC_ATTRIBUTES,
145145
move |dcx, level| {
146146
IgnoredDiagnosticOption { first_span, later_span, option_name }
@@ -167,14 +167,14 @@ fn parse_list<'p, S: Stage>(
167167
// We're dealing with `#[diagnostic::attr()]`.
168168
// This can be because that is what the user typed, but that's also what we'd see
169169
// if the user used non-metaitem syntax. See `ArgParser::from_attr_args`.
170-
cx.emit_dyn_lint(
170+
cx.emit_lint(
171171
MALFORMED_DIAGNOSTIC_ATTRIBUTES,
172172
move |dcx, level| NonMetaItemDiagnosticAttribute.into_diag(dcx, level),
173173
list.span,
174174
);
175175
}
176176
ArgParser::NoArgs => {
177-
cx.emit_dyn_lint(
177+
cx.emit_lint(
178178
MALFORMED_DIAGNOSTIC_ATTRIBUTES,
179179
move |dcx, level| {
180180
MissingOptionsForDiagnosticAttribute {
@@ -187,7 +187,7 @@ fn parse_list<'p, S: Stage>(
187187
);
188188
}
189189
ArgParser::NameValue(_) => {
190-
cx.emit_dyn_lint(
190+
cx.emit_lint(
191191
MALFORMED_DIAGNOSTIC_ATTRIBUTES,
192192
move |dcx, level| {
193193
MalFormedDiagnosticAttributeLint {
@@ -221,7 +221,7 @@ fn parse_directive_items<'p, S: Stage>(
221221
let span = item.span();
222222

223223
macro malformed() {{
224-
cx.emit_dyn_lint(
224+
cx.emit_lint(
225225
MALFORMED_DIAGNOSTIC_ATTRIBUTES,
226226
move |dcx, level| {
227227
MalFormedDiagnosticAttributeLint {
@@ -249,7 +249,7 @@ fn parse_directive_items<'p, S: Stage>(
249249

250250
macro duplicate($name: ident, $($first_span:tt)*) {{
251251
let first_span = $($first_span)*;
252-
cx.emit_dyn_lint(
252+
cx.emit_lint(
253253
MALFORMED_DIAGNOSTIC_ATTRIBUTES,
254254
move |dcx, level| IgnoredDiagnosticOption {
255255
first_span,
@@ -285,7 +285,7 @@ fn parse_directive_items<'p, S: Stage>(
285285
| FormatWarning::PositionalArgument { span }
286286
| FormatWarning::IndexedArgument { span }
287287
| FormatWarning::DisallowedPlaceholder { span, .. }) = warning;
288-
cx.emit_dyn_lint(
288+
cx.emit_lint(
289289
MALFORMED_DIAGNOSTIC_FORMAT_LITERALS,
290290
move |dcx, level| warning.into_diag(dcx, level),
291291
span,
@@ -295,7 +295,7 @@ fn parse_directive_items<'p, S: Stage>(
295295
f
296296
}
297297
Err(e) => {
298-
cx.emit_dyn_lint(
298+
cx.emit_lint(
299299
MALFORMED_DIAGNOSTIC_FORMAT_LITERALS,
300300
move |dcx, level| {
301301
WrappedParserError {

‎compiler/rustc_attr_parsing/src/attributes/diagnostic/on_const.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ impl<S: Stage> AttributeParser<S> for OnConstParser {
2828
// so non-constness is still checked in check_attr.rs
2929
if !matches!(cx.target, Target::Impl { of_trait: true }) {
3030
let target_span = cx.target_span;
31-
cx.emit_dyn_lint(
31+
cx.emit_lint(
3232
MISPLACED_DIAGNOSTIC_ATTRIBUTES,
3333
move |dcx, level| {
3434
DiagnosticOnConstOnlyForTraitImpls { target_span }.into_diag(dcx, level)

‎compiler/rustc_attr_parsing/src/attributes/diagnostic/on_move.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ impl OnMoveParser {
3333
self.span = Some(span);
3434

3535
if !matches!(cx.target, Target::Enum | Target::Struct | Target::Union) {
36-
cx.emit_dyn_lint(
36+
cx.emit_lint(
3737
MISPLACED_DIAGNOSTIC_ATTRIBUTES,
3838
move |dcx, level| DiagnosticOnMoveOnlyForAdt.into_diag(dcx, level),
3939
span,

‎compiler/rustc_attr_parsing/src/attributes/diagnostic/on_unimplemented.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ impl OnUnimplementedParser {
2323
self.span = Some(span);
2424

2525
if !matches!(cx.target, Target::Trait) {
26-
cx.emit_dyn_lint(
26+
cx.emit_lint(
2727
MISPLACED_DIAGNOSTIC_ATTRIBUTES,
2828
move |dcx, level| DiagnosticOnUnimplementedOnlyForTraits.into_diag(dcx, level),
2929
span,

‎compiler/rustc_attr_parsing/src/attributes/diagnostic/on_unknown.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ impl OnUnknownParser {
3535

3636
if !early && !matches!(cx.target, Target::Use) {
3737
let target_span = cx.target_span;
38-
cx.emit_dyn_lint(
38+
cx.emit_lint(
3939
MISPLACED_DIAGNOSTIC_ATTRIBUTES,
4040
move |dcx, level| {
4141
DiagnosticOnUnknownOnlyForImports { target_span }.into_diag(dcx, level)

‎compiler/rustc_attr_parsing/src/attributes/diagnostic/on_unmatch_args.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ impl<S: Stage> AttributeParser<S> for OnUnmatchArgsParser {
2525
this.span = Some(span);
2626

2727
if !matches!(cx.target, Target::MacroDef) {
28-
cx.emit_dyn_lint(
28+
cx.emit_lint(
2929
MISPLACED_DIAGNOSTIC_ATTRIBUTES,
3030
move |dcx, level| DiagnosticOnUnmatchArgsOnlyForMacros.into_diag(dcx, level),
3131
span,

‎compiler/rustc_attr_parsing/src/attributes/doc.rs‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ fn check_attr_not_crate_level<S: Stage>(
6868
/// Checks that an attribute is used at the crate level. Returns `true` if valid.
6969
fn check_attr_crate_level<S: Stage>(cx: &mut AcceptContext<'_, '_, S>, span: Span) -> bool {
7070
if cx.shared.target != Target::Crate {
71-
cx.emit_dyn_lint(
71+
cx.emit_lint(
7272
rustc_session::lint::builtin::INVALID_DOC_ATTRIBUTES,
7373
|dcx, level| AttrCrateLevelOnly.into_diag(dcx, level),
7474
span,
@@ -84,7 +84,7 @@ fn expected_name_value<S: Stage>(
8484
span: Span,
8585
_name: Option<Symbol>,
8686
) {
87-
cx.emit_dyn_lint(
87+
cx.emit_lint(
8888
rustc_session::lint::builtin::INVALID_DOC_ATTRIBUTES,
8989
|dcx, level| ExpectedNameValue.into_diag(dcx, level),
9090
span,
@@ -93,7 +93,7 @@ fn expected_name_value<S: Stage>(
9393

9494
// FIXME: remove this method once merged and use `cx.expected_no_args(span)` instead.
9595
fn expected_no_args<S: Stage>(cx: &mut AcceptContext<'_, '_, S>, span: Span) {
96-
cx.emit_dyn_lint(
96+
cx.emit_lint(
9797
rustc_session::lint::builtin::INVALID_DOC_ATTRIBUTES,
9898
|dcx, level| ExpectedNoArgs.into_diag(dcx, level),
9999
span,
@@ -107,7 +107,7 @@ fn expected_string_literal<S: Stage>(
107107
span: Span,
108108
_actual_literal: Option<&MetaItemLit>,
109109
) {
110-
cx.emit_dyn_lint(
110+
cx.emit_lint(
111111
rustc_session::lint::builtin::INVALID_DOC_ATTRIBUTES,
112112
|dcx, level| MalformedDoc.into_diag(dcx, level),
113113
span,
@@ -177,7 +177,7 @@ impl DocParser {
177177

178178
if let Some(used_span) = self.attribute.no_crate_inject {
179179
let unused_span = path.span();
180-
cx.emit_dyn_lint(
180+
cx.emit_lint(
181181
rustc_session::lint::builtin::INVALID_DOC_ATTRIBUTES,
182182
move |dcx, level| {
183183
rustc_errors::lints::UnusedDuplicate {
@@ -203,7 +203,7 @@ impl DocParser {
203203
// FIXME: remove this method once merged and uncomment the line below instead.
204204
// cx.expected_list(cx.attr_span, args);
205205
let span = cx.attr_span;
206-
cx.emit_dyn_lint(
206+
cx.emit_lint(
207207
rustc_session::lint::builtin::INVALID_DOC_ATTRIBUTES,
208208
|dcx, level| MalformedDoc.into_diag(dcx, level),
209209
span,
@@ -217,14 +217,14 @@ impl DocParser {
217217
}
218218
}
219219
Some(name) => {
220-
cx.emit_dyn_lint(
220+
cx.emit_lint(
221221
rustc_session::lint::builtin::INVALID_DOC_ATTRIBUTES,
222222
move |dcx, level| DocTestUnknown { name }.into_diag(dcx, level),
223223
path.span(),
224224
);
225225
}
226226
None => {
227-
cx.emit_dyn_lint(
227+
cx.emit_lint(
228228
rustc_session::lint::builtin::INVALID_DOC_ATTRIBUTES,
229229
|dcx, level| DocTestLiteral.into_diag(dcx, level),
230230
path.span(),
@@ -261,7 +261,7 @@ impl DocParser {
261261
}
262262

263263
if let Some(first_definition) = self.attribute.aliases.get(&alias).copied() {
264-
cx.emit_dyn_lint(
264+
cx.emit_lint(
265265
rustc_session::lint::builtin::UNUSED_ATTRIBUTES,
266266
move |dcx, level| DocAliasDuplicated { first_definition }.into_diag(dcx, level),
267267
span,
@@ -349,7 +349,7 @@ impl DocParser {
349349
ArgParser::List(list) => {
350350
for meta in list.mixed() {
351351
let MetaItemOrLitParser::MetaItemParser(item) = meta else {
352-
cx.emit_dyn_lint(
352+
cx.emit_lint(
353353
rustc_session::lint::builtin::INVALID_DOC_ATTRIBUTES,
354354
|dcx, level| DocAutoCfgExpectsHideOrShow.into_diag(dcx, level),
355355
meta.span(),
@@ -360,7 +360,7 @@ impl DocParser {
360360
Some(sym::hide) => (HideOrShow::Hide, sym::hide),
361361
Some(sym::show) => (HideOrShow::Show, sym::show),
362362
_ => {
363-
cx.emit_dyn_lint(
363+
cx.emit_lint(
364364
rustc_session::lint::builtin::INVALID_DOC_ATTRIBUTES,
365365
|dcx, level| DocAutoCfgExpectsHideOrShow.into_diag(dcx, level),
366366
item.span(),
@@ -369,7 +369,7 @@ impl DocParser {
369369
}
370370
};
371371
let ArgParser::List(list) = item.args() else {
372-
cx.emit_dyn_lint(
372+
cx.emit_lint(
373373
rustc_session::lint::builtin::INVALID_DOC_ATTRIBUTES,
374374
move |dcx, level| {
375375
DocAutoCfgHideShowExpectsList { attr_name }.into_diag(dcx, level)
@@ -383,7 +383,7 @@ impl DocParser {
383383

384384
for item in list.mixed() {
385385
let MetaItemOrLitParser::MetaItemParser(sub_item) = item else {
386-
cx.emit_dyn_lint(
386+
cx.emit_lint(
387387
rustc_session::lint::builtin::INVALID_DOC_ATTRIBUTES,
388388
move |dcx, level| {
389389
DocAutoCfgHideShowUnexpectedItem { attr_name }
@@ -399,7 +399,7 @@ impl DocParser {
399399
// FIXME: remove this method once merged and uncomment the line
400400
// below instead.
401401
// cx.expected_identifier(sub_item.path().span());
402-
cx.emit_dyn_lint(
402+
cx.emit_lint(
403403
rustc_session::lint::builtin::INVALID_DOC_ATTRIBUTES,
404404
|dcx, level| MalformedDoc.into_diag(dcx, level),
405405
sub_item.path().span(),
@@ -426,7 +426,7 @@ impl DocParser {
426426
}
427427
}
428428
_ => {
429-
cx.emit_dyn_lint(
429+
cx.emit_lint(
430430
rustc_session::lint::builtin::INVALID_DOC_ATTRIBUTES,
431431
move |dcx, level| {
432432
DocAutoCfgHideShowUnexpectedItem { attr_name }
@@ -444,7 +444,7 @@ impl DocParser {
444444
ArgParser::NameValue(nv) => {
445445
let MetaItemLit { kind: LitKind::Bool(bool_value), span, .. } = nv.value_as_lit()
446446
else {
447-
cx.emit_dyn_lint(
447+
cx.emit_lint(
448448
rustc_session::lint::builtin::INVALID_DOC_ATTRIBUTES,
449449
move |dcx, level| DocAutoCfgWrongLiteral.into_diag(dcx, level),
450450
nv.value_span,
@@ -588,7 +588,7 @@ impl DocParser {
588588
Some(sym::auto_cfg) => self.parse_auto_cfg(cx, path, args),
589589
Some(sym::test) => {
590590
let Some(list) = args.as_list() else {
591-
cx.emit_dyn_lint(
591+
cx.emit_lint(
592592
rustc_session::lint::builtin::INVALID_DOC_ATTRIBUTES,
593593
|dcx, level| DocTestTakesList.into_diag(dcx, level),
594594
args.span().unwrap_or(path.span()),
@@ -605,7 +605,7 @@ impl DocParser {
605605
// FIXME: remove this method once merged and uncomment the line
606606
// below instead.
607607
// cx.unexpected_literal(lit.span);
608-
cx.emit_dyn_lint(
608+
cx.emit_lint(
609609
rustc_session::lint::builtin::INVALID_DOC_ATTRIBUTES,
610610
|dcx, level| MalformedDoc.into_diag(dcx, level),
611611
lit.span,
@@ -616,7 +616,7 @@ impl DocParser {
616616
}
617617
Some(sym::spotlight) => {
618618
let span = path.span();
619-
cx.emit_dyn_lint(
619+
cx.emit_lint(
620620
rustc_session::lint::builtin::INVALID_DOC_ATTRIBUTES,
621621
move |dcx, level| DocUnknownSpotlight { sugg_span: span }.into_diag(dcx, level),
622622
span,
@@ -629,7 +629,7 @@ impl DocParser {
629629
};
630630
let value = nv.value_as_lit().symbol;
631631
let span = path.span();
632-
cx.emit_dyn_lint(
632+
cx.emit_lint(
633633
rustc_session::lint::builtin::INVALID_DOC_ATTRIBUTES,
634634
move |dcx, level| {
635635
DocUnknownInclude {
@@ -644,7 +644,7 @@ impl DocParser {
644644
}
645645
Some(name @ (sym::passes | sym::no_default_passes)) => {
646646
let span = path.span();
647-
cx.emit_dyn_lint(
647+
cx.emit_lint(
648648
rustc_session::lint::builtin::INVALID_DOC_ATTRIBUTES,
649649
move |dcx, level| {
650650
DocUnknownPasses { name, note_span: span }.into_diag(dcx, level)
@@ -654,14 +654,14 @@ impl DocParser {
654654
}
655655
Some(sym::plugins) => {
656656
let span = path.span();
657-
cx.emit_dyn_lint(
657+
cx.emit_lint(
658658
rustc_session::lint::builtin::INVALID_DOC_ATTRIBUTES,
659659
move |dcx, level| DocUnknownPlugins { label_span: span }.into_diag(dcx, level),
660660
span,
661661
);
662662
}
663663
Some(name) => {
664-
cx.emit_dyn_lint(
664+
cx.emit_lint(
665665
rustc_session::lint::builtin::INVALID_DOC_ATTRIBUTES,
666666
move |dcx, level| DocUnknownAny { name }.into_diag(dcx, level),
667667
path.span(),
@@ -671,7 +671,7 @@ impl DocParser {
671671
let full_name =
672672
path.segments().map(|s| s.as_str()).intersperse("::").collect::<String>();
673673
let name = Symbol::intern(&full_name);
674-
cx.emit_dyn_lint(
674+
cx.emit_lint(
675675
rustc_session::lint::builtin::INVALID_DOC_ATTRIBUTES,
676676
move |dcx, level| DocUnknownAny { name }.into_diag(dcx, level),
677677
path.span(),
@@ -689,7 +689,7 @@ impl DocParser {
689689
ArgParser::NoArgs => {
690690
let suggestions = cx.adcx().suggestions();
691691
let span = cx.attr_span;
692-
cx.emit_dyn_lint(
692+
cx.emit_lint(
693693
rustc_session::lint::builtin::INVALID_DOC_ATTRIBUTES,
694694
move |dcx, level| {
695695
IllFormedAttributeInput::new(&suggestions, None, None).into_diag(dcx, level)

0 commit comments

Comments
 (0)