From 838105f09b407aa6e5239ac1aa68e53846b5b712 Mon Sep 17 00:00:00 2001
From: Matthias Devlamynck <matthias.devlamynck@mailoo.org>
Date: Tue, 26 Sep 2017 20:51:22 +0200
Subject: [PATCH] Use a different error code to avoid conflicts

---
 src/librustc_typeck/check/mod.rs   | 2 +-
 src/librustc_typeck/diagnostics.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/librustc_typeck/check/mod.rs b/src/librustc_typeck/check/mod.rs
index a06f7b7f63b6d..a0099a48c896b 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 4ad1697136a22..8df973555744b 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.
 }