renumber diagnostic to avoid conflict

specialization nabbed E0520

diff --git a/src/librustc_metadata/creader.rs b/src/librustc_metadata/creader.rs
index 4fe10aea2e0fb3bdaa4b950409897731e262a61a..2318dc161fc0d843c2614a0c7fd60ee0f435e056 100644 (file)
--- a/src/librustc_metadata/creader.rs
+++ b/src/librustc_metadata/creader.rs
@@ -298,7 +298,7 @@ fn verify_no_symbol_conflicts(&self,
             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.",

diff --git a/src/librustc_metadata/diagnostics.rs b/src/librustc_metadata/diagnostics.rs
index ebc7a4b461e682c35306f5b99bfff9bbe06e6eb7..7c9eff306298551c2613517d8fff94521b0b4b38 100644 (file)
--- a/src/librustc_metadata/diagnostics.rs
+++ b/src/librustc_metadata/diagnostics.rs
@@ -88,5 +88,5 @@
     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
 }