Fix fixme, add crate check

rust-lang · Sep 8, 2015 · a3f05f6 · a3f05f6
1 parent b48ffa0
commit a3f05f6
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/librustc/middle/infer/error_reporting.rs b/src/librustc/middle/infer/error_reporting.rs
@@ -501,7 +501,7 @@ impl<'a, 'tcx> ErrorReporting<'tcx> for InferCtxt<'a, 'tcx> {
         let report_path_match = |did1: DefId, did2: DefId| {
             // Only external crates, if either is from a local
             // module we could have false positives
-            if !(did1.is_local() || did2.is_local()) {
+            if !(did1.is_local() || did2.is_local()) && did1.krate != did2.krate {
                 let exp_path = self.tcx.with_path(did1,
                                                   |p| p.map(|x| x.to_string())
                                                        .collect::<Vec<_>>());
@@ -535,7 +535,7 @@ impl<'a, 'tcx> ErrorReporting<'tcx> for InferCtxt<'a, 'tcx> {
                 self.tcx.sess.note("errrr0");
                 report_path_match(exp_found.expected, exp_found.found);
             },
-            _ => () // FIXME(Manishearth) handle traits and stuff
+            _ => () // FIXME(#22750) handle traits and stuff
         }
     }