Fix error code numbers

diff --git a/src/librustc/diagnostics.rs b/src/librustc/diagnostics.rs
index 09153c144ae805d29a29ca3b713375cb88f33426..5fecf2b15359fcce888cbae08506e00797d3f9ae 100644 (file)
--- a/src/librustc/diagnostics.rs
+++ b/src/librustc/diagnostics.rs
@@ -2132,9 +2132,9 @@ trait Foo { }
     E0687, // in-band lifetimes cannot be used in `fn`/`Fn` syntax
     E0688, // in-band lifetimes cannot be mixed with explicit lifetime binders
 
-    E0906, // closures cannot be static
+    E0697, // closures cannot be static
 
-    E0725, // multiple different lifetimes used in arguments of `async fn`
-    E0726, // multiple elided lifetimes used in arguments of `async fn`
-    E0727, // `async` non-`move` closures with arguments are not currently supported
+    E0707, // multiple elided lifetimes used in arguments of `async fn`
+    E0708, // `async` non-`move` closures with arguments are not currently supported
+    E0709, // multiple different lifetimes used in arguments of `async fn`
 }

diff --git a/src/librustc/hir/lowering.rs b/src/librustc/hir/lowering.rs
index 02e9415fd8e3c401780c948b4ceaa7ae173a62b0..b77f97bdee9adbfc90bb75637f3eb716cc2ccf0a 100644 (file)
--- a/src/librustc/hir/lowering.rs
+++ b/src/librustc/hir/lowering.rs
@@ -2045,7 +2045,7 @@ fn visit_lifetime(&mut self, lifetime: &'v hir::Lifetime) {
                             struct_span_err!(
                                 self.context.sess,
                                 current_lt_span.between(lifetime.span),
-                                E0725,
+                                E0709,
                                 "multiple different lifetimes used in arguments of `async fn`",
                             )
                                 .span_label(current_lt_span, "first lifetime here")
@@ -2057,7 +2057,7 @@ fn visit_lifetime(&mut self, lifetime: &'v hir::Lifetime) {
                             struct_span_err!(
                                 self.context.sess,
                                 current_lt_span.between(lifetime.span),
-                                E0726,
+                                E0707,
                                 "multiple elided lifetimes used in arguments of `async fn`",
                             )
                                 .span_label(current_lt_span, "first lifetime here")
@@ -3551,7 +3551,7 @@ fn lower_expr(&mut self, e: &Expr) -> hir::Expr {
                             struct_span_err!(
                                 this.sess,
                                 fn_decl_span,
-                                E0727,
+                                E0708,
                                 "`async` non-`move` closures with arguments \
                                 are not currently supported",
                             )
@@ -3612,7 +3612,7 @@ fn lower_expr(&mut self, e: &Expr) -> hir::Expr {
                                 span_err!(
                                     this.sess,
                                     fn_decl_span,
-                                    E0906,
+                                    E0697,
                                     "closures cannot be static"
                                 );
                             }

diff --git a/src/test/ui/async-fn-multiple-lifetimes.stderr b/src/test/ui/async-fn-multiple-lifetimes.stderr
index d76bfc5d0e1abb810e9c74225750351a92c203a2..f203d9acf878fe891ce251d7d956b520a66cedc7 100644 (file)
--- a/src/test/ui/async-fn-multiple-lifetimes.stderr
+++ b/src/test/ui/async-fn-multiple-lifetimes.stderr
@@ -1,4 +1,4 @@
-error[E0725]: multiple different lifetimes used in arguments of `async fn`
+error[E0709]: multiple different lifetimes used in arguments of `async fn`
   --> $DIR/async-fn-multiple-lifetimes.rs:17:49
    |
 LL | async fn multiple_named_lifetimes<'a, 'b>(_: &'a u8, _: &'b u8) {}
@@ -8,7 +8,7 @@ LL | async fn multiple_named_lifetimes<'a, 'b>(_: &'a u8, _: &'b u8) {}
    |
    = help: `async fn` can only accept borrowed values with identical lifetimes
 
-error[E0726]: multiple elided lifetimes used in arguments of `async fn`
+error[E0707]: multiple elided lifetimes used in arguments of `async fn`
   --> $DIR/async-fn-multiple-lifetimes.rs:26:39
    |
 LL | async fn multiple_elided_lifetimes(_: &u8, _: &u8) {}
@@ -28,5 +28,5 @@ LL | async fn multiple_elided_lifetimes(_: &u8, _: &u8) {}
 
 error: aborting due to 3 previous errors
 
-Some errors occurred: E0106, E0725, E0726.
+Some errors occurred: E0106, E0707, E0709.
 For more information about an error, try `rustc --explain E0106`.

diff --git a/src/test/ui/no-args-non-move-async-closure.stderr b/src/test/ui/no-args-non-move-async-closure.stderr
index 34cd0069c041dfa470d367e63818ede22e186a41..752816502ebeaa76386ba4299b6a15433a636584 100644 (file)
--- a/src/test/ui/no-args-non-move-async-closure.stderr
+++ b/src/test/ui/no-args-non-move-async-closure.stderr
@@ -1,4 +1,4 @@
-error[E0727]: `async` non-`move` closures with arguments are not currently supported
+error[E0708]: `async` non-`move` closures with arguments are not currently supported
   --> $DIR/no-args-non-move-async-closure.rs:16:13
    |
 LL |     let _ = async |x: u8| {};
@@ -8,4 +8,4 @@ LL |     let _ = async |x: u8| {};
 
 error: aborting due to previous error
 
-For more information about this error, try `rustc --explain E0727`.
+For more information about this error, try `rustc --explain E0708`.