OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Better error for some unresolved imports

Browse Source 
When trying to import nonexistent items from existing modules, specify that
that is what happened, rather than just reporting "unresolved name".
This commit is contained in:
Corey Richardson 2013-05-12 09:03:39 -04:00
parent 8291e36f18
commit be82449a9a
2 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/librustc/middle/resolve.rs
View File

@ -2282,17 +2282,19 @@ pub impl Resolver {
}
let i = import_resolution;
let mut resolve_fail = false;
let mut priv_fail = false;
match (i.value_target, i.type_target) {
// If this name wasn't found in either namespace, it's definitely
// unresolved.
(None, None) => { return Failed; }
(None, None) => { resolve_fail = true; }
// If it's private, it's also unresolved.
(Some(t), None) | (None, Some(t)) => {
let bindings = &mut *t.bindings;
match bindings.type_def {
Some(ref type_def) => {
if type_def.privacy == Private {
return Failed;
priv_fail = true;
}
}
_ => ()
@ -2300,7 +2302,7 @@ pub impl Resolver {
match bindings.value_def {
Some(ref value_def) => {
if value_def.privacy == Private {
return Failed;
priv_fail = true;
}
}
_ => ()
@ -2313,13 +2315,25 @@ pub impl Resolver {
(Some(ref value_def), Some(ref type_def)) =>
if value_def.privacy == Private
&& type_def.privacy == Private {
return Failed;
priv_fail = true;
},
_ => ()
}
}
}
if resolve_fail {
self.session.err(fmt!("unresolved import: there is no `%s` in `%s`",
*self.session.str_of(source),
self.module_to_str(containing_module)));
return Failed;
} else if priv_fail {
self.session.err(fmt!("unresolved import: found `%s` in `%s` but it is private",
*self.session.str_of(source),
self.module_to_str(containing_module)));
return Failed;
}
assert!(import_resolution.outstanding_references >= 1);
import_resolution.outstanding_references -= 1;
@ -2491,7 +2505,8 @@ pub impl Resolver {
*segment_name));
return Failed;
}
self.session.span_err(span, ~"unresolved name");
self.session.span_err(span, fmt!("unresolved import: could not find %s in %s.",
*segment_name, module_name));
return Failed;
}
Indeterminate => {

2
src/test/compile-fail/import2.rs
View File

@ -8,7 +8,7 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.
use baz::zed::bar; //~ ERROR unresolved name
use baz::zed::bar; //~ ERROR unresolved import
//~^ ERROR failed to resolve import
mod baz {}