---

yaml
---
r: 271539
b: refs/heads/auto
c: af057bd
h: refs/heads/master
i:
  271537: 665e08b
  271535: e71a512

Author: nikomatsakis

[refs]

@@ -8,7 +8,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 86fa58d6c86360c9b98dbb8bfc6c3f65447f9d4c
+refs/heads/auto: af057bdb1cab90764dff895952ecf34eaffe6b5e
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336
 refs/tags/0.2: 1754d02027f2924bed83b0160ee340c7f41d5ea1

branches/auto/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, E0520,
+                span_fatal!(self.sess, span, E0521,
                         "found two different crates with name `{}` that are \
                          not distinguished by differing `-C metadata`. This \
                          will result in symbol conflicts between the two.",

branches/auto/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)
-    E0520, // two dependencies have same (crate-name, disambiguator) but different SVH
+    E0521, // two dependencies have same (crate-name, disambiguator) but different SVH
 }