wip: remove accidental constraining pattern

camelid · camelid · commit ef9b72b4bdf7 · 2024-10-21T13:32:03.000-04:00
diff --git a/compiler/rustc_ast_lowering/src/lib.rs b/compiler/rustc_ast_lowering/src/lib.rs
@@ -2381,10 +2381,11 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
         // FIXME(min_generic_const_args): for now we only lower params to ConstArgKind::Path
         if let Some(res) = maybe_res
             && let ExprKind::Path(qself, path) = &expr.kind
-            && let Res::Def(DefKind::ConstParam, _) = res
             // FIXME(min_generic_const_args): only allow one-segment const paths for now
             && let Res::Def(
-                DefKind::ConstParam | DefKind::Const | DefKind::Ctor(_, CtorKind::Const),
+                DefKind::ConstParam
+                | DefKind::Const
+                | DefKind::Ctor(_, CtorKind::Const),
                 _,
             ) = res
             && path.is_potential_trivial_const_arg()
diff --git a/compiler/rustc_const_eval/src/const_eval/eval_queries.rs b/compiler/rustc_const_eval/src/const_eval/eval_queries.rs
@@ -1,7 +1,7 @@
 use std::sync::atomic::Ordering::Relaxed;
 
 use either::{Left, Right};
-use rustc_hir::def::DefKind;
+use rustc_hir::def::{CtorKind, DefKind};
 use rustc_middle::bug;
 use rustc_middle::mir::interpret::{AllocId, ErrorHandled, InterpErrorInfo};
 use rustc_middle::mir::{self, ConstAlloc, ConstValue};
@@ -43,6 +43,7 @@ fn eval_body_using_ecx<'tcx, R: InterpretationResult<'tcx>>(
                     | DefKind::AnonConst
                     | DefKind::InlineConst
                     | DefKind::AssocConst
+                    | DefKind::Ctor(_, CtorKind::Const)
             ),
         "Unexpected DefKind: {:?}",
         ecx.tcx.def_kind(cid.instance.def_id())
diff --git a/tests/ui/const-generics/bad-generic-in-copy-impl.stderr b/tests/ui/const-generics/bad-generic-in-copy-impl.stderr
@@ -1,17 +1,36 @@
-error[E0308]: mismatched types
-  --> $DIR/bad-generic-in-copy-impl.rs:3:13
+error: the constant `1` is not of type `usize`
+  --> $DIR/bad-generic-in-copy-impl.rs:3:8
    |
 LL |     x: [u8; SIZE],
-   |             ^^^^ expected `usize`, found `u32`
+   |        ^^^^^^^^^^ expected `usize`, found `u32`
 
-error[E0308]: mismatched types
-  --> $DIR/bad-generic-in-copy-impl.rs:3:13
+error[E0204]: the trait `Copy` cannot be implemented for this type
+  --> $DIR/bad-generic-in-copy-impl.rs:1:10
    |
+LL | #[derive(Copy, Clone)]
+   |          ^^^^
+LL | pub struct Foo {
 LL |     x: [u8; SIZE],
-   |             ^^^^ expected `usize`, found `u32`
+   |     ------------- this field does not implement `Copy`
    |
-   = note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
+note: the `Copy` impl for `[u8; 1]` requires that `the constant `1` has type `usize``
+  --> $DIR/bad-generic-in-copy-impl.rs:3:8
+   |
+LL |     x: [u8; SIZE],
+   |        ^^^^^^^^^^
+   = note: this error originates in the derive macro `Copy` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error: the constant `1` is not of type `usize`
+  --> $DIR/bad-generic-in-copy-impl.rs:3:5
+   |
+LL | #[derive(Copy, Clone)]
+   |                ----- in this derive macro expansion
+LL | pub struct Foo {
+LL |     x: [u8; SIZE],
+   |     ^^^^^^^^^^^^^ expected `usize`, found `u32`
+   |
+   = note: this error originates in the derive macro `Clone` (in Nightly builds, run with -Z macro-backtrace for more info)
 
-error: aborting due to 2 previous errors
+error: aborting due to 3 previous errors
 
-For more information about this error, try `rustc --explain E0308`.
+For more information about this error, try `rustc --explain E0204`.
diff --git a/tests/ui/const-generics/generic_const_exprs/adt_wf_hang.stderr b/tests/ui/const-generics/generic_const_exprs/adt_wf_hang.stderr
@@ -1,18 +1,15 @@
-error[E0275]: overflow evaluating the requirement `S<{ U }> well-formed`
-  --> $DIR/adt_wf_hang.rs:11:5
+error[E0741]: `U` must implement `ConstParamTy` to be used as the type of a const generic parameter
+  --> $DIR/adt_wf_hang.rs:9:19
    |
-LL |     S<{ U }>:;
-   |     ^^^^^^^^
+LL | struct S<const N: U>()
+   |                   ^
    |
-note: required by a bound in `S`
-  --> $DIR/adt_wf_hang.rs:11:5
+help: add `#[derive(ConstParamTy)]` to the struct
+   |
+LL + #[derive(ConstParamTy)]
+LL | struct U;
    |
-LL | struct S<const N: U>()
-   |        - required by a bound in this struct
-LL | where
-LL |     S<{ U }>:;
-   |     ^^^^^^^^ required by this bound in `S`
 
 error: aborting due to 1 previous error
 
-For more information about this error, try `rustc --explain E0275`.
+For more information about this error, try `rustc --explain E0741`.
diff --git a/tests/ui/const-generics/generic_const_exprs/type-alias-bounds.neg.stderr b/tests/ui/const-generics/generic_const_exprs/type-alias-bounds.neg.stderr
@@ -1,15 +1,3 @@
-error[E0277]: the trait bound `String: Copy` is not satisfied
-  --> $DIR/type-alias-bounds.rs:23:12
-   |
-LL |     let _: AliasConstUnused<String>;
-   |            ^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Copy` is not implemented for `String`
-   |
-note: required by a bound in `ct_unused_0::AliasConstUnused`
-  --> $DIR/type-alias-bounds.rs:20:30
-   |
-LL |     type AliasConstUnused<T: Copy> = (T, I32<{ DATA }>);
-   |                              ^^^^ required by this bound in `AliasConstUnused`
-
 error[E0277]: the trait bound `String: Copy` is not satisfied
   --> $DIR/type-alias-bounds.rs:31:12
    |
@@ -58,6 +46,6 @@ note: required by a bound in `AliasFnUsed`
 LL |     type AliasFnUsed<T: Trait + Copy> = I32<{ code::<T>() }>;
    |                                 ^^^^ required by this bound in `AliasFnUsed`
 
-error: aborting due to 5 previous errors
+error: aborting due to 4 previous errors
 
 For more information about this error, try `rustc --explain E0277`.
diff --git a/tests/ui/consts/const-len-underflow-separate-spans.next.stderr b/tests/ui/consts/const-len-underflow-separate-spans.next.stderr
@@ -4,12 +4,6 @@ error[E0080]: evaluation of constant value failed
 LL | const LEN: usize = ONE - TWO;
    |                    ^^^^^^^^^ attempt to compute `1_usize - 2_usize`, which would overflow
 
-note: erroneous constant encountered
-  --> $DIR/const-len-underflow-separate-spans.rs:14:17
-   |
-LL |     let a: [i8; LEN] = unimplemented!();
-   |                 ^^^
-
 error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0080`.
diff --git a/tests/ui/consts/const-len-underflow-separate-spans.old.stderr b/tests/ui/consts/const-len-underflow-separate-spans.old.stderr
@@ -4,12 +4,6 @@ error[E0080]: evaluation of constant value failed
 LL | const LEN: usize = ONE - TWO;
    |                    ^^^^^^^^^ attempt to compute `1_usize - 2_usize`, which would overflow
 
-note: erroneous constant encountered
-  --> $DIR/const-len-underflow-separate-spans.rs:14:17
-   |
-LL |     let a: [i8; LEN] = unimplemented!();
-   |                 ^^^
-
 error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0080`.
diff --git a/tests/ui/consts/issue-39974.stderr b/tests/ui/consts/issue-39974.stderr
@@ -9,12 +9,6 @@ help: use a float literal
 LL | const LENGTH: f64 = 2.0;
    |                      ++
 
-error[E0308]: mismatched types
-  --> $DIR/issue-39974.rs:5:19
-   |
-LL |     f: [[f64; 2]; LENGTH],
-   |                   ^^^^^^ expected `usize`, found `f64`
-
-error: aborting due to 2 previous errors
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0308`.
diff --git a/tests/ui/issues/issue-27008.stderr b/tests/ui/issues/issue-27008.stderr
@@ -1,9 +1,8 @@
-error[E0308]: mismatched types
-  --> $DIR/issue-27008.rs:4:17
+error: the constant `S` is not of type `usize`
+  --> $DIR/issue-27008.rs:4:13
    |
 LL |     let b = [0; S];
-   |                 ^ expected `usize`, found `S`
+   |             ^^^^^^ expected `usize`, found `S`
 
 error: aborting due to 1 previous error
 
-For more information about this error, try `rustc --explain E0308`.
