user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Auto merge of #51740 - GuillaumeGomez:fix-error-code-numbers, r=cramertj

Browse source 
Fix error code numbers

Fixes issue created by #51580.

r? @cramertj
This commit is contained in:
bors 2018-06-24 15:08:48 +00:00
commit 01cc982e93
4 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/librustc/diagnostics.rs
View file

@ -2132,9 +2132,9 @@ register_diagnostics! {
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`
}

8
src/librustc/hir/lowering.rs
View file

@ -2043,7 +2043,7 @@ impl<'a> LoweringContext<'a> {
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")
@ -2055,7 +2055,7 @@ impl<'a> LoweringContext<'a> {
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")
@ -3549,7 +3549,7 @@ impl<'a> LoweringContext<'a> {
struct_span_err!(
this.sess,
fn_decl_span,
E0727,
E0708,
"`async` non-`move` closures with arguments \
are not currently supported",
)
@ -3610,7 +3610,7 @@ impl<'a> LoweringContext<'a> {
span_err!(
this.sess,
fn_decl_span,
E0906,
E0697,
"closures cannot be static"
);
}

6
src/test/ui/async-fn-multiple-lifetimes.stderr
View file

@ -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`.

4
src/test/ui/no-args-non-move-async-closure.stderr
View file

@ -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`.