diff options
| author | bors <bors@rust-lang.org> | 2023-06-02 07:57:21 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-06-02 07:57:21 +0000 |
| commit | 8ebf04225d358efe77b822081cebef657f88d35b (patch) | |
| tree | 807d30f8b7320a1278878c0a7358b358d9eeca66 /compiler/rustc_error_codes | |
| parent | 33c3d101280c8eb3cd8af421bfb56a8afcc3881d (diff) | |
| parent | ebb7f642e46f2f95ab9c1c82e5a7640876bf2776 (diff) | |
| download | rust-8ebf04225d358efe77b822081cebef657f88d35b.tar.gz rust-8ebf04225d358efe77b822081cebef657f88d35b.zip | |
Auto merge of #112198 - compiler-errors:rollup-o2xe4of, r=compiler-errors
Rollup of 7 pull requests Successful merges: - #111670 (Require that const param tys implement `ConstParamTy`) - #111914 (CFI: Fix cfi with async: transform_ty: unexpected GeneratorWitness(Bi…) - #112030 (Migrate `item_trait_alias` to Askama) - #112150 (Support 128-bit atomics on all x86_64 Apple targets) - #112174 (Fix broken link) - #112190 (Improve comments on `TyCtxt` and `GlobalCtxt`.) - #112193 (Check tuple elements are `Sized` in `offset_of`) Failed merges: - #112071 (Group rfcs tests) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_error_codes')
| -rw-r--r-- | compiler/rustc_error_codes/src/error_codes/E0741.md | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/compiler/rustc_error_codes/src/error_codes/E0741.md b/compiler/rustc_error_codes/src/error_codes/E0741.md index 70d963cd41f..0c701052665 100644 --- a/compiler/rustc_error_codes/src/error_codes/E0741.md +++ b/compiler/rustc_error_codes/src/error_codes/E0741.md @@ -10,15 +10,19 @@ struct A; struct B<const X: A>; // error! ``` -Only structural-match types (that is, types that derive `PartialEq` and `Eq`) -may be used as the types of const generic parameters. +Only structural-match types, which are types that derive `PartialEq` and `Eq` +and implement `ConstParamTy`, may be used as the types of const generic +parameters. -To fix the previous code example, we derive `PartialEq` and `Eq`: +To fix the previous code example, we derive `PartialEq`, `Eq`, and +`ConstParamTy`: ``` #![feature(adt_const_params)] -#[derive(PartialEq, Eq)] // We derive both traits here. +use std::marker::ConstParamTy; + +#[derive(PartialEq, Eq, ConstParamTy)] // We derive both traits here. struct A; struct B<const X: A>; // ok! |