about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthias Devlamynck <matthias.devlamynck@mailoo.org>2017-09-26 20:51:22 +0200
committerMatthias Devlamynck <matthias.devlamynck@mailoo.org>2017-09-26 20:51:22 +0200
commit838105f09b407aa6e5239ac1aa68e53846b5b712 (patch)
tree4ba2d0abaf02272aadcd9ed617ec61feda338ce0
parent3730dfdaf58057466a2c576184c4647840daaeac (diff)
downloadrust-838105f09b407aa6e5239ac1aa68e53846b5b712.tar.gz
rust-838105f09b407aa6e5239ac1aa68e53846b5b712.zip
Use a different error code to avoid conflicts
-rw-r--r--src/librustc_typeck/check/mod.rs2
-rw-r--r--src/librustc_typeck/diagnostics.rs2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/librustc_typeck/check/mod.rs b/src/librustc_typeck/check/mod.rs
index a06f7b7f63b..a0099a48c89 100644
--- a/src/librustc_typeck/check/mod.rs
+++ b/src/librustc_typeck/check/mod.rs
@@ -4892,7 +4892,7 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> {
                 let mut err = struct_span_err! {
                     self.tcx.sess,
                     span,
-                    E0631,
+                    E0632,
                     "cannot provide explicit type parameters when `impl Trait` is \
                     used in argument position."
                 };
diff --git a/src/librustc_typeck/diagnostics.rs b/src/librustc_typeck/diagnostics.rs
index 4ad1697136a..8df97355574 100644
--- a/src/librustc_typeck/diagnostics.rs
+++ b/src/librustc_typeck/diagnostics.rs
@@ -4677,6 +4677,6 @@ register_diagnostics! {
     E0592, // duplicate definitions with name `{}`
 //  E0613, // Removed (merged with E0609)
     E0627, // yield statement outside of generator literal
-    E0631, // cannot provide explicit type parameters when `impl Trait` is used in
+    E0632, // cannot provide explicit type parameters when `impl Trait` is used in
            // argument position.
 }