From af057bdb1cab90764dff895952ecf34eaffe6b5e Mon Sep 17 00:00:00 2001 From: Niko Matsakis Date: Wed, 16 Mar 2016 16:37:19 -0400 Subject: [PATCH] renumber diagnostic to avoid conflict specialization nabbed E0520 --- src/librustc_metadata/creader.rs | 2 +- src/librustc_metadata/diagnostics.rs | 2 +- 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 @@ 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 ebc7a4b461e..7c9eff30629 100644 --- 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 } -- 2.44.0