Skip to content

Commit 172a216

Browse files
AlexendooAlexendoo
committed
Consider middle segments of paths in unused_qualifications 
1 parent b6a23b8 commit 172a216

File tree

4 files changed

+149
-35
lines changed

4 files changed

+149
-35
lines changed

‎compiler/rustc_resolve/src/late.rs‎

Lines changed: 22 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -4150,35 +4150,29 @@ impl<'a: 'ast, 'b, 'ast, 'tcx> LateResolutionVisitor<'a, 'b, 'ast, 'tcx> {
41504150
PathResult::Indeterminate => bug!("indeterminate path result in resolve_qpath"),
41514151
};
41524152

4153-
if path.len() > 1
4154-
&& let Some(res) = result.full_res()
4155-
&& let Some((&last_segment, prev_segs)) = path.split_last()
4156-
&& prev_segs.iter().all(|seg| !seg.has_generic_args)
4157-
&& res != Res::Err
4158-
&& path[0].ident.name != kw::PathRoot
4159-
&& path[0].ident.name != kw::DollarCrate
4153+
let segs_after_generic = match path.iter().position(|seg| seg.has_generic_args) {
4154+
Some(pos) => path.len() - 1 - pos,
4155+
None => 0,
4156+
};
4157+
if path.iter().all(|seg| !seg.ident.span.from_expansion())
4158+
&& let Some(unqualified) =
4159+
path[1..].iter().rev().enumerate().skip(segs_after_generic).find_map(|(i, seg)| {
4160+
let ns = if i == 0 { ns } else { TypeNS };
4161+
let res = self.r.partial_res_map.get(&seg.id?)?.full_res()?;
4162+
let binding = self.resolve_ident_in_lexical_scope(seg.ident, ns, None, None)?;
4163+
4164+
(res == binding.res()).then_some(seg)
4165+
})
41604166
{
4161-
let unqualified_result = {
4162-
match self.resolve_path(&[last_segment], Some(ns), None) {
4163-
PathResult::NonModule(path_res) => path_res.expect_full_res(),
4164-
PathResult::Module(ModuleOrUniformRoot::Module(module)) => {
4165-
module.res().unwrap()
4166-
}
4167-
_ => return Ok(Some(result)),
4168-
}
4169-
};
4170-
if res == unqualified_result {
4171-
let lint = lint::builtin::UNUSED_QUALIFICATIONS;
4172-
self.r.lint_buffer.buffer_lint_with_diagnostic(
4173-
lint,
4174-
finalize.node_id,
4175-
finalize.path_span,
4176-
"unnecessary qualification",
4177-
lint::BuiltinLintDiagnostics::UnusedQualifications {
4178-
removal_span: finalize.path_span.until(last_segment.ident.span),
4179-
},
4180-
)
4181-
}
4167+
self.r.lint_buffer.buffer_lint_with_diagnostic(
4168+
lint::builtin::UNUSED_QUALIFICATIONS,
4169+
finalize.node_id,
4170+
finalize.path_span,
4171+
"unnecessary qualification",
4172+
lint::BuiltinLintDiagnostics::UnusedQualifications {
4173+
removal_span: finalize.path_span.until(unqualified.ident.span),
4174+
},
4175+
)
41824176
}
41834177

41844178
Ok(Some(result))

‎tests/ui/lint/lint-qualification.fixed‎

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//@ run-rustfix
22
#![deny(unused_qualifications)]
3-
#![allow(deprecated)]
3+
#![allow(deprecated, dead_code)]
44

55
mod foo {
66
pub fn bar() {}
@@ -9,13 +9,37 @@ mod foo {
99
fn main() {
1010
use foo::bar;
1111
bar(); //~ ERROR: unnecessary qualification
12+
bar(); //~ ERROR: unnecessary qualification
1213
bar();
1314

1415
let _ = || -> Result<(), ()> { try!(Ok(())); Ok(()) }; // issue #37345
1516

16-
macro_rules! m { () => {
17+
let _ = String::new(); //~ ERROR: unnecessary qualification
18+
let _ = std::env::current_dir(); //~ ERROR: unnecessary qualification
19+
20+
let _: Vec<String> = Vec::<String>::new();
21+
//~^ ERROR: unnecessary qualification
22+
//~| ERROR: unnecessary qualification
23+
24+
use std::fmt;
25+
let _: fmt::Result = Ok(()); //~ ERROR: unnecessary qualification
26+
27+
macro_rules! m { ($a:ident, $b:ident) => {
1728
$crate::foo::bar(); // issue #37357
1829
::foo::bar(); // issue #38682
30+
foo::bar();
31+
foo::$b(); // issue #96698
32+
$a::bar();
1933
} }
20-
m!();
34+
m!(foo, bar);
35+
}
36+
37+
mod conflicting_names {
38+
mod std {}
39+
mod cell {}
40+
41+
fn f() {
42+
let _ = ::std::env::current_dir();
43+
let _ = core::cell::Cell::new(1);
44+
}
2145
}

‎tests/ui/lint/lint-qualification.rs‎

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//@ run-rustfix
22
#![deny(unused_qualifications)]
3-
#![allow(deprecated)]
3+
#![allow(deprecated, dead_code)]
44

55
mod foo {
66
pub fn bar() {}
@@ -9,13 +9,37 @@ mod foo {
99
fn main() {
1010
use foo::bar;
1111
foo::bar(); //~ ERROR: unnecessary qualification
12+
crate::foo::bar(); //~ ERROR: unnecessary qualification
1213
bar();
1314

1415
let _ = || -> Result<(), ()> { try!(Ok(())); Ok(()) }; // issue #37345
1516

16-
macro_rules! m { () => {
17+
let _ = std::string::String::new(); //~ ERROR: unnecessary qualification
18+
let _ = ::std::env::current_dir(); //~ ERROR: unnecessary qualification
19+
20+
let _: std::vec::Vec<String> = std::vec::Vec::<String>::new();
21+
//~^ ERROR: unnecessary qualification
22+
//~| ERROR: unnecessary qualification
23+
24+
use std::fmt;
25+
let _: std::fmt::Result = Ok(()); //~ ERROR: unnecessary qualification
26+
27+
macro_rules! m { ($a:ident, $b:ident) => {
1728
$crate::foo::bar(); // issue #37357
1829
::foo::bar(); // issue #38682
30+
foo::bar();
31+
foo::$b(); // issue #96698
32+
$a::bar();
1933
} }
20-
m!();
34+
m!(foo, bar);
35+
}
36+
37+
mod conflicting_names {
38+
mod std {}
39+
mod cell {}
40+
41+
fn f() {
42+
let _ = ::std::env::current_dir();
43+
let _ = core::cell::Cell::new(1);
44+
}
2145
}

‎tests/ui/lint/lint-qualification.stderr‎

Lines changed: 73 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,77 @@ LL - foo::bar();
1515
LL + bar();
1616
|
1717

18-
error: aborting due to 1 previous error
18+
error: unnecessary qualification
19+
--> $DIR/lint-qualification.rs:12:5
20+
|
21+
LL | crate::foo::bar();
22+
| ^^^^^^^^^^^^^^^
23+
|
24+
help: remove the unnecessary path segments
25+
|
26+
LL - crate::foo::bar();
27+
LL + bar();
28+
|
29+
30+
error: unnecessary qualification
31+
--> $DIR/lint-qualification.rs:17:13
32+
|
33+
LL | let _ = std::string::String::new();
34+
| ^^^^^^^^^^^^^^^^^^^^^^^^
35+
|
36+
help: remove the unnecessary path segments
37+
|
38+
LL - let _ = std::string::String::new();
39+
LL + let _ = String::new();
40+
|
41+
42+
error: unnecessary qualification
43+
--> $DIR/lint-qualification.rs:18:13
44+
|
45+
LL | let _ = ::std::env::current_dir();
46+
| ^^^^^^^^^^^^^^^^^^^^^^^
47+
|
48+
help: remove the unnecessary path segments
49+
|
50+
LL - let _ = ::std::env::current_dir();
51+
LL + let _ = std::env::current_dir();
52+
|
53+
54+
error: unnecessary qualification
55+
--> $DIR/lint-qualification.rs:20:12
56+
|
57+
LL | let _: std::vec::Vec<String> = std::vec::Vec::<String>::new();
58+
| ^^^^^^^^^^^^^^^^^^^^^
59+
|
60+
help: remove the unnecessary path segments
61+
|
62+
LL - let _: std::vec::Vec<String> = std::vec::Vec::<String>::new();
63+
LL + let _: Vec<String> = std::vec::Vec::<String>::new();
64+
|
65+
66+
error: unnecessary qualification
67+
--> $DIR/lint-qualification.rs:20:36
68+
|
69+
LL | let _: std::vec::Vec<String> = std::vec::Vec::<String>::new();
70+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
71+
|
72+
help: remove the unnecessary path segments
73+
|
74+
LL - let _: std::vec::Vec<String> = std::vec::Vec::<String>::new();
75+
LL + let _: std::vec::Vec<String> = Vec::<String>::new();
76+
|
77+
78+
error: unnecessary qualification
79+
--> $DIR/lint-qualification.rs:25:12
80+
|
81+
LL | let _: std::fmt::Result = Ok(());
82+
| ^^^^^^^^^^^^^^^^
83+
|
84+
help: remove the unnecessary path segments
85+
|
86+
LL - let _: std::fmt::Result = Ok(());
87+
LL + let _: fmt::Result = Ok(());
88+
|
89+
90+
error: aborting due to 7 previous errors
1991

0 commit comments

Comments
 (0)