]> git.lizzy.rs Git - rust.git/commitdiff
pacify the merciless tidy: s/E0521/E0522
authorNiko Matsakis <niko@alum.mit.edu>
Thu, 17 Mar 2016 09:32:04 +0000 (05:32 -0400)
committerNiko Matsakis <niko@alum.mit.edu>
Fri, 25 Mar 2016 18:07:20 +0000 (14:07 -0400)
Gah. I always find it confusing that make tidy gives me the highest error
code, but not the **next** error code.

src/librustc_metadata/creader.rs
src/librustc_metadata/diagnostics.rs

index 2318dc161fc0d843c2614a0c7fd60ee0f435e056..7965228d43bef451cadba7cc40117a5e43f7fd61 100644 (file)
@@ -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, E0521,
+                span_fatal!(self.sess, span, E0522,
                         "found two different crates with name `{}` that are \
                          not distinguished by differing `-C metadata`. This \
                          will result in symbol conflicts between the two.",
index 7c9eff306298551c2613517d8fff94521b0b4b38..ea6e4b57bbae74bc4db3c359af821d8623f0c9cc 100644 (file)
@@ -88,5 +88,5 @@
     E0469, // imported macro not found
     E0470, // reexported macro not found
     E0519, // local crate and dependency have same (crate-name, disambiguator)
-    E0521, // two dependencies have same (crate-name, disambiguator) but different SVH
+    E0522, // two dependencies have same (crate-name, disambiguator) but different SVH
 }