Skip to content

Commit

Permalink
Rollup merge of rust-lang#112729 - jieyouxu:unused-qualifications-sug…
Browse files Browse the repository at this point in the history
…gestion, r=b-naber

Add machine-applicable suggestion for `unused_qualifications` lint

```
error: unnecessary qualification
  --> $DIR/unused-qualifications-suggestion.rs:17:5
   |
LL |     foo::bar();
   |     ^^^^^^^^
   |
note: the lint level is defined here
  --> $DIR/unused-qualifications-suggestion.rs:3:9
   |
LL | #![deny(unused_qualifications)]
   |         ^^^^^^^^^^^^^^^^^^^^^
help: replace it with the unqualified path
   |
LL |     bar();
   |     ~~~
```

Closes rust-lang#92198.
  • Loading branch information
matthiaskrgr authored Jul 13, 2023
2 parents e251083 + 0b5c683 commit 93563cc
Show file tree
Hide file tree
Showing 7 changed files with 98 additions and 1 deletion.
8 changes: 8 additions & 0 deletions compiler/rustc_lint/src/context.rs
Original file line number Diff line number Diff line change
Expand Up @@ -956,6 +956,14 @@ pub trait LintContext: Sized {
db.span_note(glob_reexport_span, format!("the name `{}` in the {} namespace is supposed to be publicly re-exported here", name, namespace));
db.span_note(private_item_span, "but the private item here shadows it".to_owned());
}
BuiltinLintDiagnostics::UnusedQualifications { path_span, unqualified_path } => {
db.span_suggestion_verbose(
path_span,
"replace it with the unqualified path",
unqualified_path,
Applicability::MachineApplicable
);
}
}
// Rewrap `db`, and pass control to the user.
decorate(db)
Expand Down
6 changes: 6 additions & 0 deletions compiler/rustc_lint_defs/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -550,6 +550,12 @@ pub enum BuiltinLintDiagnostics {
/// The local binding that shadows the glob reexport.
private_item_span: Span,
},
UnusedQualifications {
/// The span of the unnecessarily-qualified path.
path_span: Span,
/// The replacement unqualified path.
unqualified_path: Ident,
},
}

/// Lints that are buffered up early on in the `Session` before the
Expand Down
6 changes: 5 additions & 1 deletion compiler/rustc_resolve/src/late.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3917,11 +3917,15 @@ impl<'a: 'ast, 'b, 'ast, 'tcx> LateResolutionVisitor<'a, 'b, 'ast, 'tcx> {
};
if res == unqualified_result {
let lint = lint::builtin::UNUSED_QUALIFICATIONS;
self.r.lint_buffer.buffer_lint(
self.r.lint_buffer.buffer_lint_with_diagnostic(
lint,
finalize.node_id,
finalize.path_span,
"unnecessary qualification",
lint::BuiltinLintDiagnostics::UnusedQualifications {
path_span: finalize.path_span,
unqualified_path: path.last().unwrap().ident
}
)
}
}
Expand Down
4 changes: 4 additions & 0 deletions tests/ui/lint/lint-qualification.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ note: the lint level is defined here
|
LL | #![deny(unused_qualifications)]
| ^^^^^^^^^^^^^^^^^^^^^
help: replace it with the unqualified path
|
LL | bar();
| ~~~

error: aborting due to previous error

23 changes: 23 additions & 0 deletions tests/ui/resolve/unused-qualifications-suggestion.fixed
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
// run-rustfix

#![deny(unused_qualifications)]

mod foo {
pub fn bar() {}
}

mod baz {
pub mod qux {
pub fn quux() {}
}
}

fn main() {
use foo::bar;
bar();
//~^ ERROR unnecessary qualification

use baz::qux::quux;
quux();
//~^ ERROR unnecessary qualification
}
23 changes: 23 additions & 0 deletions tests/ui/resolve/unused-qualifications-suggestion.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
// run-rustfix

#![deny(unused_qualifications)]

mod foo {
pub fn bar() {}
}

mod baz {
pub mod qux {
pub fn quux() {}
}
}

fn main() {
use foo::bar;
foo::bar();
//~^ ERROR unnecessary qualification

use baz::qux::quux;
baz::qux::quux();
//~^ ERROR unnecessary qualification
}
29 changes: 29 additions & 0 deletions tests/ui/resolve/unused-qualifications-suggestion.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
error: unnecessary qualification
--> $DIR/unused-qualifications-suggestion.rs:17:5
|
LL | foo::bar();
| ^^^^^^^^
|
note: the lint level is defined here
--> $DIR/unused-qualifications-suggestion.rs:3:9
|
LL | #![deny(unused_qualifications)]
| ^^^^^^^^^^^^^^^^^^^^^
help: replace it with the unqualified path
|
LL | bar();
| ~~~

error: unnecessary qualification
--> $DIR/unused-qualifications-suggestion.rs:21:5
|
LL | baz::qux::quux();
| ^^^^^^^^^^^^^^
|
help: replace it with the unqualified path
|
LL | quux();
| ~~~~

error: aborting due to 2 previous errors

0 comments on commit 93563cc

Please sign in to comment.