about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorNiko Matsakis <niko@alum.mit.edu>2016-03-16 16:37:19 -0400
committerNiko Matsakis <niko@alum.mit.edu>2016-03-25 14:07:20 -0400
commitaf057bdb1cab90764dff895952ecf34eaffe6b5e (patch)
tree4477a15f1744ece35bfb069f40b7c4c6cde1d0d8 /src
parent86fa58d6c86360c9b98dbb8bfc6c3f65447f9d4c (diff)
downloadrust-af057bdb1cab90764dff895952ecf34eaffe6b5e.tar.gz
rust-af057bdb1cab90764dff895952ecf34eaffe6b5e.zip
renumber diagnostic to avoid conflict
specialization nabbed E0520
Diffstat (limited to 'src')
-rw-r--r--src/librustc_metadata/creader.rs2
-rw-r--r--src/librustc_metadata/diagnostics.rs2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/librustc_metadata/creader.rs b/src/librustc_metadata/creader.rs
index 4fe10aea2e0..2318dc161fc 100644
--- a/src/librustc_metadata/creader.rs
+++ b/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.",
diff --git a/src/librustc_metadata/diagnostics.rs b/src/librustc_metadata/diagnostics.rs
index ebc7a4b461e..7c9eff30629 100644
--- a/src/librustc_metadata/diagnostics.rs
+++ b/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
 }