Skip to content

Commit

Permalink
Rollup merge of #60359 - petrochenkov:imperruse, r=estebank
Browse files Browse the repository at this point in the history
resolve: Consider erroneous imports used to avoid duplicate diagnostics

Supersedes #60295
Fixes #48244
r? @estebank
  • Loading branch information
Centril authored Apr 29, 2019
2 parents 49946dd + fbbec76 commit 4369f03
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 0 deletions.
2 changes: 2 additions & 0 deletions src/librustc_resolve/resolve_imports.rs
Original file line number Diff line number Diff line change
Expand Up @@ -627,6 +627,8 @@ impl<'a> Resolver<'a> {
let dummy_binding = self.import(dummy_binding, directive);
self.per_ns(|this, ns| {
let _ = this.try_define(directive.parent_scope.module, target, ns, dummy_binding);
// Consider erroneous imports used to avoid duplicate diagnostics.
this.record_use(target, ns, dummy_binding, false);
});
}
}
Expand Down
12 changes: 12 additions & 0 deletions src/test/ui/imports/unresolved-imports-used.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
// There should be *no* unused import errors.
#![deny(unused_imports)]

mod qux {
fn quz() {}
}

use qux::quz; //~ ERROR function `quz` is private
use qux::bar; //~ ERROR unresolved import `qux::bar`
use foo::bar; //~ ERROR unresolved import `foo`

fn main() {}
22 changes: 22 additions & 0 deletions src/test/ui/imports/unresolved-imports-used.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
error[E0432]: unresolved import `qux::bar`
--> $DIR/unresolved-imports-used.rs:9:5
|
LL | use qux::bar;
| ^^^^^^^^ no `bar` in `qux`

error[E0432]: unresolved import `foo`
--> $DIR/unresolved-imports-used.rs:10:5
|
LL | use foo::bar;
| ^^^ maybe a missing `extern crate foo;`?

error[E0603]: function `quz` is private
--> $DIR/unresolved-imports-used.rs:8:10
|
LL | use qux::quz;
| ^^^

error: aborting due to 3 previous errors

Some errors have detailed explanations: E0432, E0603.
For more information about an error, try `rustc --explain E0432`.

0 comments on commit 4369f03

Please sign in to comment.