Skip to content
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.

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

sugg: take into count the debug formatting #100826

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 7 additions & 2 deletions compiler/rustc_lint/src/context.rs
Original file line number Diff line number Diff line change
Expand Up @@ -865,9 +865,14 @@ pub trait LintContext: Sized {

if let Some(positional_arg_to_replace) = position_sp_to_replace {
let name = if is_formatting_arg { named_arg_name + "$" } else { named_arg_name };

let span_to_replace = if let Ok(positional_arg_content) =
self.sess().source_map().span_to_snippet(positional_arg_to_replace) && positional_arg_content.starts_with(":") {
positional_arg_to_replace.shrink_to_lo()
} else {
positional_arg_to_replace
};
db.span_suggestion_verbose(
positional_arg_to_replace,
span_to_replace,
"use the named argument by name to avoid ambiguity",
name,
Applicability::MaybeIncorrect,
Expand Down
10 changes: 10 additions & 0 deletions src/test/ui/suggestions/sugg_with_positional_args_and_debug_fmt.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
// When build the suggesttion take in consideration the `:?`
// https://github.com/rust-lang/rust/issues/100648
#![deny(warnings)]

fn main () {
println!("hello {:?}", world = "world");
//~^ ERROR named argument `world` is not used by name
//~| HELP use the named argument by name to avoid ambiguity
//~| SUGGESTION world
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
error: named argument `world` is not used by name
--> $DIR/sugg_with_positional_args_and_debug_fmt.rs:6:28
|
LL | println!("hello {:?}", world = "world");
| ---- ^^^^^ this named argument is referred to by position in formatting string
| |
| this formatting argument uses named argument `world` by position
|
note: the lint level is defined here
--> $DIR/sugg_with_positional_args_and_debug_fmt.rs:3:9
|
LL | #![deny(warnings)]
| ^^^^^^^^
= note: `#[deny(named_arguments_used_positionally)]` implied by `#[deny(warnings)]`
help: use the named argument by name to avoid ambiguity
|
LL | println!("hello {world:?}", world = "world");
| +++++

error: aborting due to previous error