---

yaml
---
r: 234098
b: refs/heads/beta
c: a3f05f6
h: refs/heads/master
v: v3

Author: Manishearth

[refs]

@@ -23,7 +23,7 @@ refs/tags/0.9: 36870b185fc5f5486636d4515f0e22677493f225
 refs/tags/0.10: ac33f2b15782272ae348dbd7b14b8257b2148b5a
 refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
 refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
-refs/heads/beta: b48ffa073fe81706a0416c6aaf70bf96d380465e
+refs/heads/beta: a3f05f6acec1de07d507f2e26af57522c2335ed7
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
 refs/heads/tmp: 370fe2786109360f7c35b8ba552b83b773dd71d6
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f

branches/beta/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
         }
     }