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

Suggest only if resolution was previously resolved

Browse source
This commit is contained in:
Son 2017-02-02 22:05:49 +11:00
parent cd692cc7ec
commit 823e185a40
3 changed files with 42 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/librustc_resolve/resolve_imports.rs
View file

@ -639,7 +639,19 @@ impl<'a, 'b:'a> ImportResolver<'a, 'b> {
let names = resolutions.iter().filter_map(|(&(ref i, _), resolution)| {
if *i == ident { return None; } // Never suggest the same name
match *resolution.borrow() {
NameResolution { binding: Some(_), .. } => Some(&i.name),
NameResolution { binding: Some(name_binding), .. } => {
match name_binding.kind {
NameBindingKind::Import { binding, .. } => {
match binding.kind {
// Never suggest the name that has binding error
// i.e. the name that cannot be previously resolved
NameBindingKind::Def(Def::Err) => return None,
_ => Some(&i.name),
}
},
_ => Some(&i.name),
}
},
NameResolution { single_imports: SingleImports::None, .. } => None,
_ => Some(&i.name),
}

15
src/test/ui/did_you_mean/issue-38054-do-not-show-unresolved-names.rs Normal file
View file

@ -0,0 +1,15 @@
// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.
use Foo;
use Foo1;
fn main() {}

14
src/test/ui/did_you_mean/issue-38054-do-not-show-unresolved-names.stderr Normal file
View file

@ -0,0 +1,14 @@
error[E0432]: unresolved import `Foo`
--> $DIR/issue-38054-do-not-show-unresolved-names.rs:11:5
|
11 | use Foo;
| ^^^ no `Foo` in the root
error[E0432]: unresolved import `Foo1`
--> $DIR/issue-38054-do-not-show-unresolved-names.rs:13:5
|
13 | use Foo1;
| ^^^^ no `Foo1` in the root
error: aborting due to 2 previous errors