diff options
| author | Niko Matsakis <niko@alum.mit.edu> | 2016-03-22 12:18:30 -0400 |
|---|---|---|
| committer | Niko Matsakis <niko@alum.mit.edu> | 2016-03-25 14:07:20 -0400 |
| commit | 751c24d345cd016429583e4d6654538ed881748a (patch) | |
| tree | a6eefc9284cfa51da2032e9f436af532677b546b | |
| parent | b184d2712feb3cf5d7becb1808ef969feb058836 (diff) | |
| download | rust-751c24d345cd016429583e4d6654538ed881748a.tar.gz rust-751c24d345cd016429583e4d6654538ed881748a.zip | |
renumber error from E0522 to E0523
another name was added in the meantime
| -rw-r--r-- | src/librustc_metadata/creader.rs | 2 | ||||
| -rw-r--r-- | 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 7965228d43b..d07179749d9 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, 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 ea6e4b57bba..8fa23de9a2d 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) - E0522, // two dependencies have same (crate-name, disambiguator) but different SVH + E0523, // two dependencies have same (crate-name, disambiguator) but different SVH } |
