From b71a09fda07efa16c4bdc0d4849f0b1b5e012dba Mon Sep 17 00:00:00 2001 From: Michael Goulet Date: Thu, 14 Jul 2022 20:45:23 -0700 Subject: [PATCH 1/2] Fix ICE in named_arguments_used_positionally lint --- compiler/rustc_builtin_macros/src/format.rs | 17 ++++++++--------- src/test/ui/macros/issue-99261.rs | 17 +++++++++++++++++ 2 files changed, 25 insertions(+), 9 deletions(-) create mode 100644 src/test/ui/macros/issue-99261.rs diff --git a/compiler/rustc_builtin_macros/src/format.rs b/compiler/rustc_builtin_macros/src/format.rs index 4791151c7d309..d5eb8d4eeb9a8 100644 --- a/compiler/rustc_builtin_macros/src/format.rs +++ b/compiler/rustc_builtin_macros/src/format.rs @@ -16,7 +16,7 @@ use smallvec::SmallVec; use rustc_lint_defs::builtin::NAMED_ARGUMENTS_USED_POSITIONALLY; use rustc_lint_defs::{BufferedEarlyLint, BuiltinLintDiagnostics, LintId}; -use rustc_parse_format::{Count, FormatSpec}; +use rustc_parse_format::Count; use std::borrow::Cow; use std::collections::hash_map::Entry; @@ -985,20 +985,19 @@ fn lint_named_arguments_used_positionally( } _ => {} }; - match a.format { - FormatSpec { width: Count::CountIsName(s, _), .. } - | FormatSpec { precision: Count::CountIsName(s, _), .. } => { - used_argument_names.insert(s); - } - _ => {} - }; + if let Count::CountIsName(s, _) = a.format.width { + used_argument_names.insert(s); + } + if let Count::CountIsName(s, _) = a.format.precision { + used_argument_names.insert(s); + } } } for (symbol, (index, span)) in names { if !used_argument_names.contains(symbol.as_str()) { let msg = format!("named argument `{}` is not used by name", symbol.as_str()); - let arg_span = cx.arg_spans[index]; + let arg_span = cx.arg_spans.get(index).copied().unwrap_or(span); cx.ecx.buffered_early_lint.push(BufferedEarlyLint { span: MultiSpan::from_span(span), msg: msg.clone(), diff --git a/src/test/ui/macros/issue-99261.rs b/src/test/ui/macros/issue-99261.rs new file mode 100644 index 0000000000000..40d26d08cba11 --- /dev/null +++ b/src/test/ui/macros/issue-99261.rs @@ -0,0 +1,17 @@ +// check-pass + +#![deny(named_arguments_used_positionally)] + +fn main() { + let value: f64 = 314.15926; + let digits_before_decimal = 1; + let digits_after_decimal = 2; + let width = digits_before_decimal + 1 + digits_after_decimal; + + println!( + "{value:0>width$.digits_after_decimal$}", + value = value, + width = width, + digits_after_decimal = digits_after_decimal, + ); +} From 2902b92769a29d24f9107d2e322ed9c92990da98 Mon Sep 17 00:00:00 2001 From: Michael Goulet Date: Fri, 15 Jul 2022 17:32:15 +0000 Subject: [PATCH 2/2] Only suggest if span is not erroneous --- compiler/rustc_builtin_macros/src/format.rs | 2 +- compiler/rustc_lint/src/context.rs | 19 ++++++++++--------- compiler/rustc_lint_defs/src/lib.rs | 2 +- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/compiler/rustc_builtin_macros/src/format.rs b/compiler/rustc_builtin_macros/src/format.rs index d5eb8d4eeb9a8..3b7e2102ffa9b 100644 --- a/compiler/rustc_builtin_macros/src/format.rs +++ b/compiler/rustc_builtin_macros/src/format.rs @@ -997,7 +997,7 @@ fn lint_named_arguments_used_positionally( for (symbol, (index, span)) in names { if !used_argument_names.contains(symbol.as_str()) { let msg = format!("named argument `{}` is not used by name", symbol.as_str()); - let arg_span = cx.arg_spans.get(index).copied().unwrap_or(span); + let arg_span = cx.arg_spans.get(index).copied(); cx.ecx.buffered_early_lint.push(BufferedEarlyLint { span: MultiSpan::from_span(span), msg: msg.clone(), diff --git a/compiler/rustc_lint/src/context.rs b/compiler/rustc_lint/src/context.rs index 50e9383cacc12..b4b472fe2df78 100644 --- a/compiler/rustc_lint/src/context.rs +++ b/compiler/rustc_lint/src/context.rs @@ -858,15 +858,16 @@ pub trait LintContext: Sized { }, BuiltinLintDiagnostics::NamedArgumentUsedPositionally(positional_arg, named_arg, name) => { db.span_label(named_arg, "this named argument is only referred to by position in formatting string"); - let msg = format!("this formatting argument uses named argument `{}` by position", name); - db.span_label(positional_arg, msg); - db.span_suggestion_verbose( - positional_arg, - "use the named argument by name to avoid ambiguity", - format!("{{{}}}", name), - Applicability::MaybeIncorrect, - ); - + if let Some(positional_arg) = positional_arg { + let msg = format!("this formatting argument uses named argument `{}` by position", name); + db.span_label(positional_arg, msg); + db.span_suggestion_verbose( + positional_arg, + "use the named argument by name to avoid ambiguity", + format!("{{{}}}", name), + Applicability::MaybeIncorrect, + ); + } } } // Rewrap `db`, and pass control to the user. diff --git a/compiler/rustc_lint_defs/src/lib.rs b/compiler/rustc_lint_defs/src/lib.rs index 1bc7e7de66040..4fd57ed853379 100644 --- a/compiler/rustc_lint_defs/src/lib.rs +++ b/compiler/rustc_lint_defs/src/lib.rs @@ -467,7 +467,7 @@ pub enum BuiltinLintDiagnostics { /// If true, the lifetime will be fully elided. use_span: Option<(Span, bool)>, }, - NamedArgumentUsedPositionally(Span, Span, String), + NamedArgumentUsedPositionally(Option, Span, String), } /// Lints that are buffered up early on in the `Session` before the