From: Vadim Petrochenkov <vadim.petrochenkov@gmail.com>
Date: Thu, 12 Feb 2015 17:31:31 +0000 (+0300)
Subject: Fix duplicate error code
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=8ed58d8cccf61a23d9c97024c41d2fbf4a0f8ecd;p=rust.git

Fix duplicate error code
---

diff --git a/src/librustc_resolve/diagnostics.rs b/src/librustc_resolve/diagnostics.rs
index 5361cf3a79a..2ee402712a9 100644
--- a/src/librustc_resolve/diagnostics.rs
+++ b/src/librustc_resolve/diagnostics.rs
@@ -24,7 +24,7 @@
     E0258, // import conflicts with existing submodule
     E0259, // an extern crate has already been imported into this module
     E0260, // name conflicts with an external crate that has been imported into this module
-    E0316 // user-defined types or type parameters cannot shadow the primitive types
+    E0317 // user-defined types or type parameters cannot shadow the primitive types
 }
 
 __build_diagnostic_array! { DIAGNOSTICS }
diff --git a/src/librustc_resolve/lib.rs b/src/librustc_resolve/lib.rs
index d4002e17236..f0182403d99 100644
--- a/src/librustc_resolve/lib.rs
+++ b/src/librustc_resolve/lib.rs
@@ -2786,7 +2786,7 @@ fn resolve_crate(&mut self, krate: &ast::Crate) {
 
     fn check_if_primitive_type_name(&self, name: Name, span: Span) {
         if let Some(_) = self.primitive_type_table.primitive_types.get(&name) {
-            span_err!(self.session, span, E0316,
+            span_err!(self.session, span, E0317,
                 "user-defined types or type parameters cannot shadow the primitive types");
         }
     }