diff options
| author | bors <bors@rust-lang.org> | 2018-06-10 22:30:14 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-06-10 22:30:14 +0000 |
| commit | b202bebdeea73c32c69592fcb60ff2afaa93d354 (patch) | |
| tree | 56ce0075d8ceefd0fb3c685eb9637b3e91a0de8c /src/test | |
| parent | a805a2a5ebba2802f432d79874e59c24e398f82a (diff) | |
| parent | f2349d5ec6d2f184d8b83cebe255834f927568c3 (diff) | |
| download | rust-b202bebdeea73c32c69592fcb60ff2afaa93d354.tar.gz rust-b202bebdeea73c32c69592fcb60ff2afaa93d354.zip | |
Auto merge of #51475 - GuillaumeGomez:fix-error-codes, r=Manishearth
Fix error codes
Diffstat (limited to 'src/test')
4 files changed, 8 insertions, 8 deletions
diff --git a/src/test/compile-fail/edition-raw-pointer-method-2018.rs b/src/test/compile-fail/edition-raw-pointer-method-2018.rs index d01cac019e3..d0cf81d59cf 100644 --- a/src/test/compile-fail/edition-raw-pointer-method-2018.rs +++ b/src/test/compile-fail/edition-raw-pointer-method-2018.rs @@ -18,5 +18,5 @@ fn main() { let x = 0; let y = &x as *const _; let _ = y.is_null(); - //~^ error: the type of this value must be known to call a method on a raw pointer on it [E0908] + //~^ error: the type of this value must be known to call a method on a raw pointer on it [E0699] } diff --git a/src/test/compile-fail/rfc-2008-non-exhaustive/invalid-attribute.rs b/src/test/compile-fail/rfc-2008-non-exhaustive/invalid-attribute.rs index e48d989c01d..df4fe1e77e9 100644 --- a/src/test/compile-fail/rfc-2008-non-exhaustive/invalid-attribute.rs +++ b/src/test/compile-fail/rfc-2008-non-exhaustive/invalid-attribute.rs @@ -11,15 +11,15 @@ #![feature(non_exhaustive)] #[non_exhaustive(anything)] -//~^ ERROR attribute should be empty [E0911] +//~^ ERROR attribute should be empty [E0702] struct Foo; #[non_exhaustive] -//~^ ERROR attribute can only be applied to a struct or enum [E0910] +//~^ ERROR attribute can only be applied to a struct or enum [E0701] trait Bar { } #[non_exhaustive] -//~^ ERROR attribute can only be applied to a struct or enum [E0910] +//~^ ERROR attribute can only be applied to a struct or enum [E0701] union Baz { f1: u16, f2: u16 diff --git a/src/test/ui/impl-trait/region-escape-via-bound.rs b/src/test/ui/impl-trait/region-escape-via-bound.rs index e73f15606dc..c40c5f4cc31 100644 --- a/src/test/ui/impl-trait/region-escape-via-bound.rs +++ b/src/test/ui/impl-trait/region-escape-via-bound.rs @@ -24,7 +24,7 @@ trait Trait<'a> { } impl Trait<'b> for Cell<&'a u32> { } fn foo(x: Cell<&'x u32>) -> impl Trait<'y> - //~^ ERROR hidden type for `impl Trait` captures lifetime that does not appear in bounds [E0909] + //~^ ERROR hidden type for `impl Trait` captures lifetime that does not appear in bounds [E0700] where 'x: 'y { x diff --git a/src/test/ui/impl-trait/region-escape-via-bound.stderr b/src/test/ui/impl-trait/region-escape-via-bound.stderr index 4281a4c10ad..b673111d219 100644 --- a/src/test/ui/impl-trait/region-escape-via-bound.stderr +++ b/src/test/ui/impl-trait/region-escape-via-bound.stderr @@ -1,4 +1,4 @@ -error[E0909]: hidden type for `impl Trait` captures lifetime that does not appear in bounds +error[E0700]: hidden type for `impl Trait` captures lifetime that does not appear in bounds --> $DIR/region-escape-via-bound.rs:26:29 | LL | fn foo(x: Cell<&'x u32>) -> impl Trait<'y> @@ -8,7 +8,7 @@ note: hidden type `std::cell::Cell<&'x u32>` captures the lifetime 'x as defined --> $DIR/region-escape-via-bound.rs:26:1 | LL | / fn foo(x: Cell<&'x u32>) -> impl Trait<'y> -LL | | //~^ ERROR hidden type for `impl Trait` captures lifetime that does not appear in bounds [E0909] +LL | | //~^ ERROR hidden type for `impl Trait` captures lifetime that does not appear in bounds [E0700] LL | | where 'x: 'y LL | | { LL | | x @@ -17,4 +17,4 @@ LL | | } error: aborting due to previous error -For more information about this error, try `rustc --explain E0909`. +For more information about this error, try `rustc --explain E0700`. |