Skip to content

Commit 21102b1

Browse files
authored
Rollup merge of rust-lang#87967 - m-ou-se:non-fmt-panic-detect-fake-spans, r=cjgillot
Detect fake spans in non_fmt_panic lint. This addresses rust-lang#87621 Some proc_macros claim that the user wrote all of the tokens it outputs, by applying a span from the input to all of the produced tokens. That can result in confusing suggestions, as in rust-lang#87621. This is a simple patch that avoids suggesting anything for `panic!("{}")` if the span of `"{}"` and `panic!(..)` are identical, which is normally not possible.
2 parents fad080a + 079bf75 commit 21102b1

File tree

1 file changed

+11
-3
lines changed

1 file changed

+11
-3
lines changed

compiler/rustc_lint/src/non_fmt_panic.rs

+11-3
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ fn check_panic<'tcx>(cx: &LateContext<'tcx>, f: &'tcx hir::Expr<'tcx>, arg: &'tc
101101
let mut l = lint.build("panic message is not a string literal");
102102
l.note("this usage of panic!() is deprecated; it will be a hard error in Rust 2021");
103103
l.note("for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/panic-macro-consistency.html>");
104-
if !span.contains(arg_span) {
104+
if !is_arg_inside_call(arg_span, span) {
105105
// No clue where this argument is coming from.
106106
l.emit();
107107
return;
@@ -204,7 +204,7 @@ fn check_panic_str<'tcx>(
204204
_ => "panic message contains unused formatting placeholders",
205205
});
206206
l.note("this message is not used as a format string when given without arguments, but will be in Rust 2021");
207-
if span.contains(arg.span) {
207+
if is_arg_inside_call(arg.span, span) {
208208
l.span_suggestion(
209209
arg.span.shrink_to_hi(),
210210
&format!("add the missing argument{}", pluralize!(n_arguments)),
@@ -235,7 +235,7 @@ fn check_panic_str<'tcx>(
235235
cx.struct_span_lint(NON_FMT_PANICS, brace_spans.unwrap_or_else(|| vec![span]), |lint| {
236236
let mut l = lint.build(msg);
237237
l.note("this message is not used as a format string, but will be in Rust 2021");
238-
if span.contains(arg.span) {
238+
if is_arg_inside_call(arg.span, span) {
239239
l.span_suggestion(
240240
arg.span.shrink_to_lo(),
241241
"add a \"{}\" format string to use the message literally",
@@ -283,3 +283,11 @@ fn panic_call<'tcx>(cx: &LateContext<'tcx>, f: &'tcx hir::Expr<'tcx>) -> (Span,
283283
if let hygiene::ExpnKind::Macro(_, symbol) = expn.kind { symbol } else { sym::panic };
284284
(expn.call_site, panic_macro, macro_symbol.as_str())
285285
}
286+
287+
fn is_arg_inside_call(arg: Span, call: Span) -> bool {
288+
// We only add suggestions if the argument we're looking at appears inside the
289+
// panic call in the source file, to avoid invalid suggestions when macros are involved.
290+
// We specifically check for the spans to not be identical, as that happens sometimes when
291+
// proc_macros lie about spans and apply the same span to all the tokens they produce.
292+
call.contains(arg) && !call.source_equal(&arg)
293+
}

0 commit comments

Comments
 (0)