bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Fix suggestions

Browse source
This commit is contained in:
Jeffrey Seyfried 2016-03-31 04:44:04 +00:00
parent 3d9db59566
commit 6f09deaa32
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/librustc_resolve/resolve_imports.rs
View file

@ -537,8 +537,14 @@ impl<'a, 'b:'a, 'tcx:'b> ImportResolver<'a, 'b, 'tcx> {
match (&value_result, &type_result) { match (&value_result, &type_result) {
(&Indeterminate, _) | (_, &Indeterminate) => return Indeterminate, (&Indeterminate, _) | (_, &Indeterminate) => return Indeterminate,
(&Failed(_), &Failed(_)) => { (&Failed(_), &Failed(_)) => {
let children = target_module.resolutions.borrow(); let resolutions = target_module.resolutions.borrow();
let names = children.keys().map(|&(ref name, _)| name); let names = resolutions.iter().filter_map(|(&(ref name, _), resolution)| {
match *resolution.borrow() {
NameResolution { binding: Some(_), .. } => Some(name),
NameResolution { single_imports: SingleImports::None, .. } => None,
_ => Some(name),
}
});
let lev_suggestion = match find_best_match_for_name(names, &source.as_str(), None) { let lev_suggestion = match find_best_match_for_name(names, &source.as_str(), None) {
Some(name) => format!(". Did you mean to use `{}`?", name), Some(name) => format!(". Did you mean to use `{}`?", name),
None => "".to_owned(), None => "".to_owned(),