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

Print correct crate name

Browse source
This commit is contained in:
Manish Goregaokar 2015-09-09 01:22:03 +05:30
parent 00e70051dc
commit c65d33819c
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/librustc/middle/infer/error_reporting.rs
View file

@ -511,9 +511,11 @@ impl<'a, 'tcx> ErrorReporting<'tcx> for InferCtxt<'a, 'tcx> {
// We compare strings because PathMod and PathName can be different
// for imported and non-imported crates
if exp_path == found_path {
let crate_name = self.tcx.sess.cstore
.get_crate_data(did1.krate).name();
self.tcx.sess.span_note(sp, &format!("Perhaps two different versions \
of crate `{}` are being used?",
exp_path[0]));
crate_name));
}
}
};

4
src/test/compile-fail/type-mismatch-same-crate-name.rs
View file

@ -25,9 +25,9 @@ fn main() {
extern crate crate_a1 as a;
a::try_foo(foo2); //~ ERROR mismatched types
//~^ HELP run
//~^^ NOTE Perhaps two different versions of crate `main`
//~^^ NOTE Perhaps two different versions of crate `crate_a1`
a::try_bar(bar2); //~ ERROR mismatched types
//~^ HELP run
//~^^ NOTE Perhaps two different versions of crate `main`
//~^^ NOTE Perhaps two different versions of crate `crate_a1`
}
}