From 8ed58d8cccf61a23d9c97024c41d2fbf4a0f8ecd Mon Sep 17 00:00:00 2001
From: Vadim Petrochenkov <vadim.petrochenkov@gmail.com>
Date: Thu, 12 Feb 2015 20:31:31 +0300
Subject: [PATCH] Fix duplicate error code
---
src/librustc_resolve/diagnostics.rs | 2 +-
src/librustc_resolve/lib.rs | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
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 @@ register_diagnostics! {
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 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
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");
}
}