---

yaml
---
r: 273583
b: refs/heads/beta
c: 751c24d
h: refs/heads/master
i:
  273581: 3263731
  273579: 052a174
  273575: 4d5d911
  273567: dbd7ada

Author: nikomatsakis

[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: b184d2712feb3cf5d7becb1808ef969feb058836
+refs/heads/beta: 751c24d345cd016429583e4d6654538ed881748a
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
 refs/heads/tmp: e06d2ad9fcd5027bcaac5b08fc9aa39a49d0ecd3
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f

branches/beta/src/librustc_metadata/creader.rs

@@ -298,7 +298,7 @@ impl<'a> CrateReader<'a> {
             if other.name() == crate_name && // same crate-name
                other.disambiguator() == disambiguator &&  // same crate-disambiguator
                other.hash() != svh { // but different SVH
-                span_fatal!(self.sess, span, E0522,
+                span_fatal!(self.sess, span, E0523,
                         "found two different crates with name `{}` that are \
                          not distinguished by differing `-C metadata`. This \
                          will result in symbol conflicts between the two.",

branches/beta/src/librustc_metadata/diagnostics.rs

@@ -88,5 +88,5 @@ register_diagnostics! {
     E0469, // imported macro not found
     E0470, // reexported macro not found
     E0519, // local crate and dependency have same (crate-name, disambiguator)
-    E0522, // two dependencies have same (crate-name, disambiguator) but different SVH
+    E0523, // two dependencies have same (crate-name, disambiguator) but different SVH
 }