squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Add span to some import resolution errors

Browse source
This commit is contained in:
Corey Richardson 2013-05-14 14:19:59 -04:00
parent 52f8b22d4f
commit 62cbea1ca1
2 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/librustc/middle/resolve.rs
View file

@ -2058,7 +2058,8 @@ pub impl Resolver {
self.resolve_single_import(module_,
containing_module,
target,
source);
source,
span);
}
GlobImport => {
let span = import_directive.span;
@ -2121,7 +2122,8 @@ pub impl Resolver {
module_: @mut Module,
containing_module: @mut Module,
target: ident,
source: ident)
source: ident,
span: span)
-> ResolveResult<()> {
debug!("(resolving single import) resolving `%s` = `%s::%s` from \
`%s`",
@ -2325,14 +2327,14 @@ pub impl Resolver {
}
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)));
self.session.span_err(span, 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)));
self.session.span_err(span, fmt!("unresolved import: found `%s` in `%s` but it is \
private", *self.session.str_of(source),
self.module_to_str(containing_module)));
return Failed;
}

6
src/test/compile-fail/unresolved-import.rs
View file

@ -9,9 +9,9 @@
// except according to those terms.
use foo::bar; //~ ERROR unresolved import. maybe a missing `extern mod foo`?
//~^ ERROR failed to resolve import
use x = bar::baz; //~ ERROR unresolved import: could not find `baz` in `bar`
//~^ ERROR failed to resolve import
//~^ ERROR failed to resolve import `foo::bar`
use x = bar::baz; //~ ERROR unresolved import: there is no `baz` in `bar`
//~^ ERROR failed to resolve import `bar::baz`
mod bar {
struct bar;