user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't unused_qualifications-check global paths.

Browse source
This commit is contained in:
Jeffrey Seyfried 2017-01-03 02:47:18 +00:00
parent d3a2efa14b
commit 7dcacf15b9
2 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/librustc_resolve/lib.rs
View file

@ -2336,20 +2336,19 @@ impl<'a> Resolver<'a> {
PathResult::Indeterminate => bug!("indetermined path result in resolve_qpath"),
};
if path.len() == 1 || global_by_default || result.base_def == Def::Err {
return Some(result);
}
let unqualified_result = {
match self.resolve_path(&[*path.last().unwrap()], Some(ns), None) {
PathResult::NonModule(path_res) => path_res.base_def,
PathResult::Module(module) => module.def().unwrap(),
_ => return Some(result),
if path.len() > 1 && !global_by_default && result.base_def != Def::Err &&
path[0].name != keywords::CrateRoot.name() && path[0].name != "$crate" {
let unqualified_result = {
match self.resolve_path(&[*path.last().unwrap()], Some(ns), None) {
PathResult::NonModule(path_res) => path_res.base_def,
PathResult::Module(module) => module.def().unwrap(),
_ => return Some(result),
}
};
if result.base_def == unqualified_result {
let lint = lint::builtin::UNUSED_QUALIFICATIONS;
self.session.add_lint(lint, id, span, "unnecessary qualification".to_string());
}
};
if result.base_def == unqualified_result && path[0].name != "$crate" {
let lint = lint::builtin::UNUSED_QUALIFICATIONS;
self.session.add_lint(lint, id, span, "unnecessary qualification".to_string());
}
Some(result)

9
src/test/compile-fail/lint-qualification.rs
View file

@ -21,8 +21,9 @@ fn main() {
let _ = || -> Result<(), ()> { try!(Ok(())); Ok(()) }; // issue #37345
macro_rules! m {
() => { $crate::foo::bar(); }
}
m!(); // issue #37357
macro_rules! m { () => {
$crate::foo::bar(); // issue #37357
::foo::bar(); // issue #38682
} }
m!();
}