diff options
Diffstat (limited to 'src')
6 files changed, 10 insertions, 10 deletions
diff --git a/src/librustc_resolve/error_codes.rs b/src/librustc_resolve/error_codes.rs index 49f8e82a2d1..df22085c38c 100644 --- a/src/librustc_resolve/error_codes.rs +++ b/src/librustc_resolve/error_codes.rs @@ -1884,7 +1884,7 @@ E0671: r##" Const parameters cannot depend on type parameters. The following is therefore invalid: -```compile_fail,E0740 +```compile_fail,E0741 #![feature(const_generics)] fn const_id<T, const N: T>() -> T { // error diff --git a/src/librustc_typeck/collect.rs b/src/librustc_typeck/collect.rs index 08fb5ae1676..f40667652ca 100644 --- a/src/librustc_typeck/collect.rs +++ b/src/librustc_typeck/collect.rs @@ -1536,7 +1536,7 @@ pub fn checked_type_of(tcx: TyCtxt<'_>, def_id: DefId, fail: bool) -> Option<Ty< struct_span_err!( tcx.sess, hir_ty.span, - E0740, + E0741, "the types of const generic parameters must derive `PartialEq` and `Eq`", ).span_label( hir_ty.span, diff --git a/src/librustc_typeck/error_codes.rs b/src/librustc_typeck/error_codes.rs index 2cf6951c375..8a9a89c3826 100644 --- a/src/librustc_typeck/error_codes.rs +++ b/src/librustc_typeck/error_codes.rs @@ -4978,11 +4978,11 @@ the future, [RFC 2091] prohibits their implementation without a follow-up RFC. [RFC 2091]: https://github.com/rust-lang/rfcs/blob/master/text/2091-inline-semantic.md "##, -E0740: r##" +E0741: r##" Only `structural_match` types (that is, types that derive `PartialEq` and `Eq`) may be used as the types of const generic parameters. -```compile_fail,E0740 +```compile_fail,E0741 #![feature(const_generics)] struct A; diff --git a/src/test/ui/const-generics/const-param-type-depends-on-type-param-ungated.stderr b/src/test/ui/const-generics/const-param-type-depends-on-type-param-ungated.stderr index ba6f53e5684..a2872ab982d 100644 --- a/src/test/ui/const-generics/const-param-type-depends-on-type-param-ungated.stderr +++ b/src/test/ui/const-generics/const-param-type-depends-on-type-param-ungated.stderr @@ -7,7 +7,7 @@ LL | struct B<T, const N: T>(PhantomData<[T; N]>); = note: for more information, see https://github.com/rust-lang/rust/issues/44580 = help: add `#![feature(const_generics)]` to the crate attributes to enable -error[E0740]: the types of const generic parameters must derive `PartialEq` and `Eq` +error[E0741]: the types of const generic parameters must derive `PartialEq` and `Eq` --> $DIR/const-param-type-depends-on-type-param-ungated.rs:3:22 | LL | struct B<T, const N: T>(PhantomData<[T; N]>); @@ -15,5 +15,5 @@ LL | struct B<T, const N: T>(PhantomData<[T; N]>); error: aborting due to 2 previous errors -Some errors have detailed explanations: E0658, E0740. +Some errors have detailed explanations: E0658, E0741. For more information about an error, try `rustc --explain E0658`. diff --git a/src/test/ui/const-generics/const-param-type-depends-on-type-param.stderr b/src/test/ui/const-generics/const-param-type-depends-on-type-param.stderr index c86a09bef0b..c9d6db7e2c2 100644 --- a/src/test/ui/const-generics/const-param-type-depends-on-type-param.stderr +++ b/src/test/ui/const-generics/const-param-type-depends-on-type-param.stderr @@ -6,7 +6,7 @@ LL | #![feature(const_generics)] | = note: `#[warn(incomplete_features)]` on by default -error[E0740]: the types of const generic parameters must derive `PartialEq` and `Eq` +error[E0741]: the types of const generic parameters must derive `PartialEq` and `Eq` --> $DIR/const-param-type-depends-on-type-param.rs:9:34 | LL | pub struct Dependent<T, const X: T>([(); X]); @@ -14,4 +14,4 @@ LL | pub struct Dependent<T, const X: T>([(); X]); error: aborting due to previous error -For more information about this error, try `rustc --explain E0740`. +For more information about this error, try `rustc --explain E0741`. diff --git a/src/test/ui/const-generics/forbid-non-structural_match-types.stderr b/src/test/ui/const-generics/forbid-non-structural_match-types.stderr index c870d9b1db4..0fd9e0599e8 100644 --- a/src/test/ui/const-generics/forbid-non-structural_match-types.stderr +++ b/src/test/ui/const-generics/forbid-non-structural_match-types.stderr @@ -6,7 +6,7 @@ LL | #![feature(const_generics)] | = note: `#[warn(incomplete_features)]` on by default -error[E0740]: the types of const generic parameters must derive `PartialEq` and `Eq` +error[E0741]: the types of const generic parameters must derive `PartialEq` and `Eq` --> $DIR/forbid-non-structural_match-types.rs:11:19 | LL | struct D<const X: C>; @@ -14,4 +14,4 @@ LL | struct D<const X: C>; error: aborting due to previous error -For more information about this error, try `rustc --explain E0740`. +For more information about this error, try `rustc --explain E0741`. |