renumber error from E0522 to E0523

another name was added in the meantime

diff --git a/src/librustc_metadata/creader.rs b/src/librustc_metadata/creader.rs
index 7965228d43bef451cadba7cc40117a5e43f7fd61..d07179749d9ab2dd9cc2271cdfa167beac05cb8f 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, 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.",

diff --git a/src/librustc_metadata/diagnostics.rs b/src/librustc_metadata/diagnostics.rs
index ea6e4b57bbae74bc4db3c359af821d8623f0c9cc..8fa23de9a2d16ffc618ea2a865a6d50f9b7def8d 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)
-    E0522, // two dependencies have same (crate-name, disambiguator) but different SVH
+    E0523, // two dependencies have same (crate-name, disambiguator) but different SVH
 }