Skip to content

Commit 7f565ed

Browse files
compiler-errorscompiler-errors
committed
Don't pass lint back out of lint decorator
1 parent 4d1bd0d commit 7f565ed

38 files changed

+50
-116
lines changed

‎compiler/rustc_codegen_ssa/src/codegen_attrs.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -578,7 +578,9 @@ fn codegen_fn_attrs(tcx: TyCtxt<'_>, did: LocalDefId) -> CodegenFnAttrs {
578578
hir_id,
579579
no_sanitize_span,
580580
"`no_sanitize` will have no effect after inlining",
581-
|lint| lint.span_note(inline_span, "inlining requested here"),
581+
|lint| {
582+
lint.span_note(inline_span, "inlining requested here");
583+
},
582584
)
583585
}
584586
}

‎compiler/rustc_hir_analysis/src/astconv/generics.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -661,7 +661,7 @@ pub(crate) fn prohibit_explicit_late_bound_lifetimes(
661661
args.args[0].hir_id(),
662662
multispan,
663663
msg,
664-
|lint| lint,
664+
|_| {},
665665
);
666666
}
667667

‎compiler/rustc_hir_analysis/src/astconv/lint.rs

-1
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,6 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
122122
Applicability::MachineApplicable,
123123
);
124124
self.maybe_lint_blanket_trait_impl(self_ty, lint);
125-
lint
126125
},
127126
);
128127
}

‎compiler/rustc_hir_analysis/src/astconv/mod.rs

-2
Original file line numberDiff line numberDiff line change
@@ -1506,8 +1506,6 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
15061506
format!("<{} as {}>::{}", qself_ty, tcx.item_name(trait_did), assoc_ident),
15071507
Applicability::MachineApplicable,
15081508
);
1509-
1510-
lint
15111509
},
15121510
);
15131511
}

‎compiler/rustc_hir_analysis/src/check/check.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ pub fn check_abi(tcx: TyCtxt<'_>, hir_id: hir::HirId, span: Span, abi: Abi) {
5151
hir_id,
5252
span,
5353
"use of calling convention not supported on this target",
54-
|lint| lint,
54+
|_| {},
5555
);
5656
}
5757
}
@@ -190,7 +190,7 @@ fn check_static_inhabited(tcx: TyCtxt<'_>, def_id: LocalDefId) {
190190
"static of uninhabited type",
191191
|lint| {
192192
lint
193-
.note("uninhabited statics cannot be initialized, and any access would be an immediate error")
193+
.note("uninhabited statics cannot be initialized, and any access would be an immediate error");
194194
},
195195
);
196196
}
@@ -1093,7 +1093,7 @@ pub(super) fn check_transparent<'tcx>(tcx: TyCtxt<'tcx>, adt: ty::AdtDef<'tcx>)
10931093
"this {descr} contains `{field_ty}`, which {note}, \
10941094
and makes it not a breaking change to become \
10951095
non-zero-sized in the future."
1096-
))
1096+
));
10971097
},
10981098
)
10991099
} else {

‎compiler/rustc_hir_analysis/src/check/compare_impl_item.rs

-1
Original file line numberDiff line numberDiff line change
@@ -574,7 +574,6 @@ fn emit_implied_wf_lint<'tcx>(
574574
Applicability::MaybeIncorrect,
575575
);
576576
}
577-
lint
578577
},
579578
);
580579
}

‎compiler/rustc_hir_analysis/src/check/intrinsicck.rs

-1
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,6 @@ impl<'a, 'tcx> InlineAsmCtxt<'a, 'tcx> {
269269
lint.help(format!(
270270
"or use `{{{idx}:{default_modifier}}}` to keep the default formatting of `{default_result}`",
271271
));
272-
lint
273272
},
274273
);
275274
}

‎compiler/rustc_hir_analysis/src/check_unused.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ fn check_unused_traits(tcx: TyCtxt<'_>, (): ()) {
4545
item.hir_id(),
4646
path.span,
4747
msg,
48-
|lint| lint,
48+
|_| {},
4949
);
5050
}
5151
}

‎compiler/rustc_hir_analysis/src/coherence/orphan.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -522,7 +522,7 @@ fn lint_auto_trait_impl<'tcx>(
522522
format!(
523523
"try using the same sequence of generic parameters as the {self_descr} definition",
524524
),
525-
)
525+
);
526526
},
527527
);
528528
}

‎compiler/rustc_hir_analysis/src/collect/generics_of.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ pub(super) fn generics_of(tcx: TyCtxt<'_>, def_id: LocalDefId) -> ty::Generics {
279279
param.hir_id,
280280
param.span,
281281
TYPE_DEFAULT_NOT_ALLOWED,
282-
|lint| lint,
282+
|_| {},
283283
);
284284
}
285285
Defaults::Deny => {

‎compiler/rustc_hir_analysis/src/collect/resolve_bound_vars.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -925,7 +925,7 @@ impl<'a, 'tcx> Visitor<'tcx> for BoundVarContext<'a, 'tcx> {
925925
"you can use the `'static` lifetime directly, in place of `{}`",
926926
lifetime.ident,
927927
);
928-
lint.help(help)
928+
lint.help(help);
929929
},
930930
);
931931
}

‎compiler/rustc_hir_typeck/src/fn_ctxt/_impl.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
7272
orig_span,
7373
custom_note
7474
.unwrap_or("any code following this expression is unreachable"),
75-
)
75+
);
7676
},
7777
)
7878
}

‎compiler/rustc_hir_typeck/src/method/prelude2021.rs

-6
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,6 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
122122
format!("disambiguate the method call with `({self_adjusted})`",),
123123
);
124124
}
125-
126-
lint
127125
},
128126
);
129127
} else {
@@ -187,8 +185,6 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
187185
),
188186
);
189187
}
190-
191-
lint
192188
},
193189
);
194190
}
@@ -307,8 +303,6 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
307303
format!("<{} as {}>::{}", self_ty_name, trait_name, method_name.name,),
308304
Applicability::MachineApplicable,
309305
);
310-
311-
lint
312306
},
313307
);
314308
}

‎compiler/rustc_hir_typeck/src/method/probe.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -445,7 +445,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
445445
scope_expr_id,
446446
span,
447447
"type annotations needed",
448-
|lint| lint,
448+
|_| {},
449449
);
450450
}
451451
} else {
@@ -1427,8 +1427,6 @@ impl<'tcx> Pick<'tcx> {
14271427
));
14281428
}
14291429
}
1430-
1431-
lint
14321430
},
14331431
);
14341432
}

‎compiler/rustc_hir_typeck/src/pat.rs

-2
Original file line numberDiff line numberDiff line change
@@ -1845,8 +1845,6 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
18451845
lint.note(format!(
18461846
"the pattern is of type `{ty}` and the `non_exhaustive_omitted_patterns` attribute was found",
18471847
));
1848-
1849-
lint
18501848
});
18511849
}
18521850

‎compiler/rustc_hir_typeck/src/upvar.rs

-2
Original file line numberDiff line numberDiff line change
@@ -912,8 +912,6 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
912912
Applicability::HasPlaceholders
913913
);
914914
}
915-
916-
lint
917915
},
918916
);
919917
}

‎compiler/rustc_lint/src/builtin.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2800,7 +2800,7 @@ impl<'tcx> LateLintPass<'tcx> for NamedAsmLabels {
28002800
NAMED_ASM_LABELS,
28012801
Some(target_spans),
28022802
fluent::lint_builtin_asm_labels,
2803-
|lint| lint,
2803+
|_| {},
28042804
BuiltinLintDiagnostics::NamedAsmLabel(
28052805
"only local labels of the form `<number>:` should be used in inline asm"
28062806
.to_string(),

‎compiler/rustc_lint/src/context.rs

+10-20
Original file line numberDiff line numberDiff line change
@@ -530,9 +530,7 @@ pub trait LintContext {
530530
lint: &'static Lint,
531531
span: Option<impl Into<MultiSpan>>,
532532
msg: impl Into<DiagnosticMessage>,
533-
decorate: impl for<'a, 'b> FnOnce(
534-
&'b mut DiagnosticBuilder<'a, ()>,
535-
) -> &'b mut DiagnosticBuilder<'a, ()>,
533+
decorate: impl for<'a, 'b> FnOnce(&'b mut DiagnosticBuilder<'a, ()>),
536534
diagnostic: BuiltinLintDiagnostics,
537535
) {
538536
// We first generate a blank diagnostic.
@@ -995,9 +993,7 @@ pub trait LintContext {
995993
lint: &'static Lint,
996994
span: Option<S>,
997995
msg: impl Into<DiagnosticMessage>,
998-
decorate: impl for<'a, 'b> FnOnce(
999-
&'b mut DiagnosticBuilder<'a, ()>,
1000-
) -> &'b mut DiagnosticBuilder<'a, ()>,
996+
decorate: impl for<'a, 'b> FnOnce(&'b mut DiagnosticBuilder<'a, ()>),
1001997
);
1002998

1003999
/// Emit a lint at `span` from a lint struct (some type that implements `DecorateLint`,
@@ -1008,7 +1004,9 @@ pub trait LintContext {
10081004
span: S,
10091005
decorator: impl for<'a> DecorateLint<'a, ()>,
10101006
) {
1011-
self.lookup(lint, Some(span), decorator.msg(), |diag| decorator.decorate_lint(diag));
1007+
self.lookup(lint, Some(span), decorator.msg(), |diag| {
1008+
decorator.decorate_lint(diag);
1009+
});
10121010
}
10131011

10141012
/// Emit a lint at the appropriate level, with an associated span.
@@ -1022,9 +1020,7 @@ pub trait LintContext {
10221020
lint: &'static Lint,
10231021
span: S,
10241022
msg: impl Into<DiagnosticMessage>,
1025-
decorate: impl for<'a, 'b> FnOnce(
1026-
&'b mut DiagnosticBuilder<'a, ()>,
1027-
) -> &'b mut DiagnosticBuilder<'a, ()>,
1023+
decorate: impl for<'a, 'b> FnOnce(&'b mut DiagnosticBuilder<'a, ()>),
10281024
) {
10291025
self.lookup(lint, Some(span), msg, decorate);
10301026
}
@@ -1033,7 +1029,7 @@ pub trait LintContext {
10331029
/// generated by `#[derive(LintDiagnostic)]`).
10341030
fn emit_lint(&self, lint: &'static Lint, decorator: impl for<'a> DecorateLint<'a, ()>) {
10351031
self.lookup(lint, None as Option<Span>, decorator.msg(), |diag| {
1036-
decorator.decorate_lint(diag)
1032+
decorator.decorate_lint(diag);
10371033
});
10381034
}
10391035

@@ -1047,9 +1043,7 @@ pub trait LintContext {
10471043
&self,
10481044
lint: &'static Lint,
10491045
msg: impl Into<DiagnosticMessage>,
1050-
decorate: impl for<'a, 'b> FnOnce(
1051-
&'b mut DiagnosticBuilder<'a, ()>,
1052-
) -> &'b mut DiagnosticBuilder<'a, ()>,
1046+
decorate: impl for<'a, 'b> FnOnce(&'b mut DiagnosticBuilder<'a, ()>),
10531047
) {
10541048
self.lookup(lint, None as Option<Span>, msg, decorate);
10551049
}
@@ -1113,9 +1107,7 @@ impl<'tcx> LintContext for LateContext<'tcx> {
11131107
lint: &'static Lint,
11141108
span: Option<S>,
11151109
msg: impl Into<DiagnosticMessage>,
1116-
decorate: impl for<'a, 'b> FnOnce(
1117-
&'b mut DiagnosticBuilder<'a, ()>,
1118-
) -> &'b mut DiagnosticBuilder<'a, ()>,
1110+
decorate: impl for<'a, 'b> FnOnce(&'b mut DiagnosticBuilder<'a, ()>),
11191111
) {
11201112
let hir_id = self.last_node_with_lint_attrs;
11211113

@@ -1142,9 +1134,7 @@ impl LintContext for EarlyContext<'_> {
11421134
lint: &'static Lint,
11431135
span: Option<S>,
11441136
msg: impl Into<DiagnosticMessage>,
1145-
decorate: impl for<'a, 'b> FnOnce(
1146-
&'b mut DiagnosticBuilder<'a, ()>,
1147-
) -> &'b mut DiagnosticBuilder<'a, ()>,
1137+
decorate: impl for<'a, 'b> FnOnce(&'b mut DiagnosticBuilder<'a, ()>),
11481138
) {
11491139
self.builder.struct_lint(lint, span.map(|s| s.into()), msg, decorate)
11501140
}

‎compiler/rustc_lint/src/early.rs

+1-7
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,7 @@ impl<'a, T: EarlyLintPass> EarlyContextAndPass<'a, T> {
4545
fn inlined_check_id(&mut self, id: ast::NodeId) {
4646
for early_lint in self.context.buffered.take(id) {
4747
let BufferedEarlyLint { span, msg, node_id: _, lint_id, diagnostic } = early_lint;
48-
self.context.lookup_with_diagnostics(
49-
lint_id.lint,
50-
Some(span),
51-
msg,
52-
|lint| lint,
53-
diagnostic,
54-
);
48+
self.context.lookup_with_diagnostics(lint_id.lint, Some(span), msg, |_| {}, diagnostic);
5549
}
5650
}
5751

‎compiler/rustc_lint/src/levels.rs

+3-6
Original file line numberDiff line numberDiff line change
@@ -1077,7 +1077,6 @@ impl<'s, P: LintLevelsProvider> LintLevelsBuilder<'s, P> {
10771077
GateIssue::Language,
10781078
lint_from_cli,
10791079
);
1080-
lint
10811080
},
10821081
);
10831082
return false;
@@ -1104,9 +1103,7 @@ impl<'s, P: LintLevelsProvider> LintLevelsBuilder<'s, P> {
11041103
lint: &'static Lint,
11051104
span: Option<MultiSpan>,
11061105
msg: impl Into<DiagnosticMessage>,
1107-
decorate: impl for<'a, 'b> FnOnce(
1108-
&'b mut DiagnosticBuilder<'a, ()>,
1109-
) -> &'b mut DiagnosticBuilder<'a, ()>,
1106+
decorate: impl for<'a, 'b> FnOnce(&'b mut DiagnosticBuilder<'a, ()>),
11101107
) {
11111108
let (level, src) = self.lint_level(lint);
11121109
struct_lint_level(self.sess, lint, level, src, span, msg, decorate)
@@ -1121,15 +1118,15 @@ impl<'s, P: LintLevelsProvider> LintLevelsBuilder<'s, P> {
11211118
) {
11221119
let (level, src) = self.lint_level(lint);
11231120
struct_lint_level(self.sess, lint, level, src, Some(span), decorate.msg(), |lint| {
1124-
decorate.decorate_lint(lint)
1121+
decorate.decorate_lint(lint);
11251122
});
11261123
}
11271124

11281125
#[track_caller]
11291126
pub fn emit_lint(&self, lint: &'static Lint, decorate: impl for<'a> DecorateLint<'a, ()>) {
11301127
let (level, src) = self.lint_level(lint);
11311128
struct_lint_level(self.sess, lint, level, src, None, decorate.msg(), |lint| {
1132-
decorate.decorate_lint(lint)
1129+
decorate.decorate_lint(lint);
11331130
});
11341131
}
11351132
}

‎compiler/rustc_lint/src/non_fmt_panic.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ fn check_panic<'tcx>(cx: &LateContext<'tcx>, f: &'tcx hir::Expr<'tcx>, arg: &'tc
126126
lint.note(fluent::lint_more_info_note);
127127
if !is_arg_inside_call(arg_span, span) {
128128
// No clue where this argument is coming from.
129-
return lint;
129+
return;
130130
}
131131
if arg_macro.is_some_and(|id| cx.tcx.is_diagnostic_item(sym::format_macro, id)) {
132132
// A case of `panic!(format!(..))`.
@@ -207,7 +207,6 @@ fn check_panic<'tcx>(cx: &LateContext<'tcx>, f: &'tcx hir::Expr<'tcx>, arg: &'tc
207207
}
208208
}
209209
}
210-
lint
211210
});
212211
}
213212

‎compiler/rustc_middle/src/lint.rs

+2-9
Original file line numberDiff line numberDiff line change
@@ -284,9 +284,7 @@ pub fn struct_lint_level(
284284
src: LintLevelSource,
285285
span: Option<MultiSpan>,
286286
msg: impl Into<DiagnosticMessage>,
287-
decorate: impl for<'a, 'b> FnOnce(
288-
&'b mut DiagnosticBuilder<'a, ()>,
289-
) -> &'b mut DiagnosticBuilder<'a, ()>,
287+
decorate: impl for<'a, 'b> FnOnce(&'b mut DiagnosticBuilder<'a, ()>),
290288
) {
291289
// Avoid codegen bloat from monomorphization by immediately doing dyn dispatch of `decorate` to
292290
// the "real" work.
@@ -298,12 +296,7 @@ pub fn struct_lint_level(
298296
src: LintLevelSource,
299297
span: Option<MultiSpan>,
300298
msg: impl Into<DiagnosticMessage>,
301-
decorate: Box<
302-
dyn '_
303-
+ for<'a, 'b> FnOnce(
304-
&'b mut DiagnosticBuilder<'a, ()>,
305-
) -> &'b mut DiagnosticBuilder<'a, ()>,
306-
>,
299+
decorate: Box<dyn '_ + for<'a, 'b> FnOnce(&'b mut DiagnosticBuilder<'a, ()>)>,
307300
) {
308301
// Check for future incompatibility lints and issue a stronger warning.
309302
let future_incompatible = lint.future_incompatible;

‎compiler/rustc_middle/src/middle/stability.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,6 @@ fn late_report_deprecation(
223223
let kind = tcx.def_descr(def_id);
224224
deprecation_suggestion(diag, kind, suggestion, method_span);
225225
}
226-
diag
227226
});
228227
}
229228

@@ -587,7 +586,7 @@ impl<'tcx> TyCtxt<'tcx> {
587586
unmarked: impl FnOnce(Span, DefId),
588587
) -> bool {
589588
let soft_handler = |lint, span, msg: String| {
590-
self.struct_span_lint_hir(lint, id.unwrap_or(hir::CRATE_HIR_ID), span, msg, |lint| lint)
589+
self.struct_span_lint_hir(lint, id.unwrap_or(hir::CRATE_HIR_ID), span, msg, |_| {})
591590
};
592591
let eval_result =
593592
self.eval_stability_allow_unstable(def_id, id, span, method_span, allow_unstable);

0 commit comments

Comments
 (0)