diff options
| author | Vadim Petrochenkov <vadim.petrochenkov@gmail.com> | 2015-02-12 20:31:31 +0300 |
|---|---|---|
| committer | Vadim Petrochenkov <vadim.petrochenkov@gmail.com> | 2015-02-12 20:31:31 +0300 |
| commit | 8ed58d8cccf61a23d9c97024c41d2fbf4a0f8ecd (patch) | |
| tree | c326de5ce66e9ba6bbc4fbc4119ffafd116c7b38 /src | |
| parent | 6457c9fce29814aefdb072a39f86ee1321615099 (diff) | |
| download | rust-8ed58d8cccf61a23d9c97024c41d2fbf4a0f8ecd.tar.gz rust-8ed58d8cccf61a23d9c97024c41d2fbf4a0f8ecd.zip | |
Fix duplicate error code
Diffstat (limited to 'src')
| -rw-r--r-- | src/librustc_resolve/diagnostics.rs | 2 | ||||
| -rw-r--r-- | 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"); } } |
