Adding upstream version 1.68.2+dfsg1.upstream/1.68.2+dfsg1

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

165 files changed, 116 insertions, 19 deletions

diff --git a/src/test/ui/const-generics/issues/auxiliary/const_generic_issues_lib.rs b/tests/ui/const-generics/issues/auxiliary/const_generic_issues_lib.rs
index 6a10ee267..6a10ee267 100644
--- a/src/test/ui/const-generics/issues/auxiliary/const_generic_issues_lib.rs
+++ b/tests/ui/const-generics/issues/auxiliary/const_generic_issues_lib.rs
diff --git a/src/test/ui/const-generics/issues/auxiliary/impl-const.rs b/tests/ui/const-generics/issues/auxiliary/impl-const.rs
index de3a40860..de3a40860 100644
--- a/src/test/ui/const-generics/issues/auxiliary/impl-const.rs
+++ b/tests/ui/const-generics/issues/auxiliary/impl-const.rs
diff --git a/src/test/ui/const-generics/issues/issue-100313.rs b/tests/ui/const-generics/issues/issue-100313.rs
index 4e9d3626a..4e9d3626a 100644
--- a/src/test/ui/const-generics/issues/issue-100313.rs
+++ b/tests/ui/const-generics/issues/issue-100313.rs
diff --git a/src/test/ui/const-generics/issues/issue-100313.stderr b/tests/ui/const-generics/issues/issue-100313.stderr
index d4b486376..d4b486376 100644
--- a/src/test/ui/const-generics/issues/issue-100313.stderr
+++ b/tests/ui/const-generics/issues/issue-100313.stderr
diff --git a/tests/ui/const-generics/issues/issue-105037.rs b/tests/ui/const-generics/issues/issue-105037.rs
new file mode 100644
index 000000000..f7d239499
--- /dev/null
+++ b/tests/ui/const-generics/issues/issue-105037.rs
@@ -0,0 +1,35 @@
+// run-pass
+#![feature(generic_const_exprs)]
+#![allow(incomplete_features)]
+#![allow(dead_code)]
+
+trait Table<const D: usize>: Sync {
+    const COLUMNS: usize;
+}
+
+struct Table1<const D: usize>;
+impl<const D: usize> Table<D> for Table1<D> {
+    const COLUMNS: usize = 123;
+}
+
+struct Table2<const D: usize>;
+impl<const D: usize> Table<D> for Table2<D> {
+    const COLUMNS: usize = 456;
+}
+
+fn process_table<T: Table<D>, const D: usize>(_table: T)
+where
+    [(); T::COLUMNS]:,
+{
+}
+
+fn process_all_tables<const D: usize>()
+where
+    [(); Table2::<D>::COLUMNS]:,
+    [(); Table1::<D>::COLUMNS]:,
+{
+    process_table(Table1::<D>);
+    process_table(Table2::<D>);
+}
+
+fn main() {}
diff --git a/src/test/ui/const-generics/issues/issue-56445-1.full.stderr b/tests/ui/const-generics/issues/issue-56445-1.full.stderr
index 179643a75..179643a75 100644
--- a/src/test/ui/const-generics/issues/issue-56445-1.full.stderr
+++ b/tests/ui/const-generics/issues/issue-56445-1.full.stderr
diff --git a/src/test/ui/const-generics/issues/issue-56445-1.min.stderr b/tests/ui/const-generics/issues/issue-56445-1.min.stderr
index 43a5df117..43a5df117 100644
--- a/src/test/ui/const-generics/issues/issue-56445-1.min.stderr
+++ b/tests/ui/const-generics/issues/issue-56445-1.min.stderr
diff --git a/src/test/ui/const-generics/issues/issue-56445-1.rs b/tests/ui/const-generics/issues/issue-56445-1.rs
index 13eb2ea9f..13eb2ea9f 100644
--- a/src/test/ui/const-generics/issues/issue-56445-1.rs
+++ b/tests/ui/const-generics/issues/issue-56445-1.rs
diff --git a/src/test/ui/const-generics/issues/issue-56445-2.rs b/tests/ui/const-generics/issues/issue-56445-2.rs
index e078c8487..e078c8487 100644
--- a/src/test/ui/const-generics/issues/issue-56445-2.rs
+++ b/tests/ui/const-generics/issues/issue-56445-2.rs
diff --git a/src/test/ui/const-generics/issues/issue-56445-2.stderr b/tests/ui/const-generics/issues/issue-56445-2.stderr
index 770c80cbb..770c80cbb 100644
--- a/src/test/ui/const-generics/issues/issue-56445-2.stderr
+++ b/tests/ui/const-generics/issues/issue-56445-2.stderr
diff --git a/src/test/ui/const-generics/issues/issue-56445-3.rs b/tests/ui/const-generics/issues/issue-56445-3.rs
index c29df1458..c29df1458 100644
--- a/src/test/ui/const-generics/issues/issue-56445-3.rs
+++ b/tests/ui/const-generics/issues/issue-56445-3.rs
diff --git a/src/test/ui/const-generics/issues/issue-56445-3.stderr b/tests/ui/const-generics/issues/issue-56445-3.stderr
index f1c49eecf..f1c49eecf 100644
--- a/src/test/ui/const-generics/issues/issue-56445-3.stderr
+++ b/tests/ui/const-generics/issues/issue-56445-3.stderr
diff --git a/src/test/ui/const-generics/issues/issue-60818-struct-constructors.rs b/tests/ui/const-generics/issues/issue-60818-struct-constructors.rs
index 0066490df..0066490df 100644
--- a/src/test/ui/const-generics/issues/issue-60818-struct-constructors.rs
+++ b/tests/ui/const-generics/issues/issue-60818-struct-constructors.rs
diff --git a/src/test/ui/const-generics/issues/issue-61336-1.rs b/tests/ui/const-generics/issues/issue-61336-1.rs
index beb37e63b..beb37e63b 100644
--- a/src/test/ui/const-generics/issues/issue-61336-1.rs
+++ b/tests/ui/const-generics/issues/issue-61336-1.rs
diff --git a/src/test/ui/const-generics/issues/issue-61336-2.rs b/tests/ui/const-generics/issues/issue-61336-2.rs
index b7cd29f89..b7cd29f89 100644
--- a/src/test/ui/const-generics/issues/issue-61336-2.rs
+++ b/tests/ui/const-generics/issues/issue-61336-2.rs
diff --git a/src/test/ui/const-generics/issues/issue-61336-2.stderr b/tests/ui/const-generics/issues/issue-61336-2.stderr
index 5bb356696..5bb356696 100644
--- a/src/test/ui/const-generics/issues/issue-61336-2.stderr
+++ b/tests/ui/const-generics/issues/issue-61336-2.stderr
diff --git a/src/test/ui/const-generics/issues/issue-61336.rs b/tests/ui/const-generics/issues/issue-61336.rs
index 80be1d8e5..80be1d8e5 100644
--- a/src/test/ui/const-generics/issues/issue-61336.rs
+++ b/tests/ui/const-generics/issues/issue-61336.rs
diff --git a/src/test/ui/const-generics/issues/issue-61336.stderr b/tests/ui/const-generics/issues/issue-61336.stderr
index 8d9e545b4..8d9e545b4 100644
--- a/src/test/ui/const-generics/issues/issue-61336.stderr
+++ b/tests/ui/const-generics/issues/issue-61336.stderr
diff --git a/src/test/ui/const-generics/issues/issue-61422.rs b/tests/ui/const-generics/issues/issue-61422.rs
index 0b9cf40d8..0b9cf40d8 100644
--- a/src/test/ui/const-generics/issues/issue-61422.rs
+++ b/tests/ui/const-generics/issues/issue-61422.rs
diff --git a/src/test/ui/const-generics/issues/issue-61432.rs b/tests/ui/const-generics/issues/issue-61432.rs
index 6192af82a..6192af82a 100644
--- a/src/test/ui/const-generics/issues/issue-61432.rs
+++ b/tests/ui/const-generics/issues/issue-61432.rs
diff --git a/src/test/ui/const-generics/issues/issue-62187-encountered-polymorphic-const.rs b/tests/ui/const-generics/issues/issue-62187-encountered-polymorphic-const.rs
index fa76aeae9..fa76aeae9 100644
--- a/src/test/ui/const-generics/issues/issue-62187-encountered-polymorphic-const.rs
+++ b/tests/ui/const-generics/issues/issue-62187-encountered-polymorphic-const.rs
diff --git a/src/test/ui/const-generics/issues/issue-62878.full.stderr b/tests/ui/const-generics/issues/issue-62878.full.stderr
index 3a2b291d7..3a2b291d7 100644
--- a/src/test/ui/const-generics/issues/issue-62878.full.stderr
+++ b/tests/ui/const-generics/issues/issue-62878.full.stderr
diff --git a/src/test/ui/const-generics/issues/issue-62878.min.stderr b/tests/ui/const-generics/issues/issue-62878.min.stderr
index af029a651..5a721720d 100644
--- a/src/test/ui/const-generics/issues/issue-62878.min.stderr
+++ b/tests/ui/const-generics/issues/issue-62878.min.stderr
@@ -4,7 +4,7 @@ error[E0770]: the type of const parameters must not depend on other generic para
 LL | fn foo<const N: usize, const A: [u8; N]>() {}
    |                                      ^ the type must not depend on the parameter `N`
 
-error: `[u8; _]` is forbidden as the type of a const generic parameter
+error: `[u8; N]` is forbidden as the type of a const generic parameter
   --> $DIR/issue-62878.rs:5:33
    |
 LL | fn foo<const N: usize, const A: [u8; N]>() {}
diff --git a/src/test/ui/const-generics/issues/issue-62878.rs b/tests/ui/const-generics/issues/issue-62878.rs
index 578ce765b..4c08a484e 100644
--- a/src/test/ui/const-generics/issues/issue-62878.rs
+++ b/tests/ui/const-generics/issues/issue-62878.rs
@@ -4,7 +4,7 @@
 
 fn foo<const N: usize, const A: [u8; N]>() {}
 //~^ ERROR the type of const parameters must not
-//[min]~| ERROR `[u8; _]` is forbidden as the type of a const generic parameter
+//[min]~| ERROR `[u8; N]` is forbidden as the type of a const generic parameter
 
 fn main() {
     foo::<_, { [1] }>();
diff --git a/src/test/ui/const-generics/issues/issue-63322-forbid-dyn.full.stderr b/tests/ui/const-generics/issues/issue-63322-forbid-dyn.full.stderr
index 16fabd1e8..16fabd1e8 100644
--- a/src/test/ui/const-generics/issues/issue-63322-forbid-dyn.full.stderr
+++ b/tests/ui/const-generics/issues/issue-63322-forbid-dyn.full.stderr
diff --git a/src/test/ui/const-generics/issues/issue-63322-forbid-dyn.min.stderr b/tests/ui/const-generics/issues/issue-63322-forbid-dyn.min.stderr
index 9f6c7ccf3..9f6c7ccf3 100644
--- a/src/test/ui/const-generics/issues/issue-63322-forbid-dyn.min.stderr
+++ b/tests/ui/const-generics/issues/issue-63322-forbid-dyn.min.stderr
diff --git a/src/test/ui/const-generics/issues/issue-63322-forbid-dyn.rs b/tests/ui/const-generics/issues/issue-63322-forbid-dyn.rs
index 116c3fcfb..116c3fcfb 100644
--- a/src/test/ui/const-generics/issues/issue-63322-forbid-dyn.rs
+++ b/tests/ui/const-generics/issues/issue-63322-forbid-dyn.rs
diff --git a/src/test/ui/const-generics/issues/issue-64519.rs b/tests/ui/const-generics/issues/issue-64519.rs
index 969289b26..969289b26 100644
--- a/src/test/ui/const-generics/issues/issue-64519.rs
+++ b/tests/ui/const-generics/issues/issue-64519.rs
diff --git a/src/test/ui/const-generics/issues/issue-66596-impl-trait-for-str-const-arg.rs b/tests/ui/const-generics/issues/issue-66596-impl-trait-for-str-const-arg.rs
index 091419f0c..091419f0c 100644
--- a/src/test/ui/const-generics/issues/issue-66596-impl-trait-for-str-const-arg.rs
+++ b/tests/ui/const-generics/issues/issue-66596-impl-trait-for-str-const-arg.rs
diff --git a/src/test/ui/const-generics/issues/issue-66906.rs b/tests/ui/const-generics/issues/issue-66906.rs
index a0b3f9122..a0b3f9122 100644
--- a/src/test/ui/const-generics/issues/issue-66906.rs
+++ b/tests/ui/const-generics/issues/issue-66906.rs
diff --git a/src/test/ui/const-generics/issues/issue-67185-1.rs b/tests/ui/const-generics/issues/issue-67185-1.rs
index 69425b25e..69425b25e 100644
--- a/src/test/ui/const-generics/issues/issue-67185-1.rs
+++ b/tests/ui/const-generics/issues/issue-67185-1.rs
diff --git a/src/test/ui/const-generics/issues/issue-67185-2.rs b/tests/ui/const-generics/issues/issue-67185-2.rs
index 18bb6f6bc..18bb6f6bc 100644
--- a/src/test/ui/const-generics/issues/issue-67185-2.rs
+++ b/tests/ui/const-generics/issues/issue-67185-2.rs
diff --git a/src/test/ui/const-generics/issues/issue-67185-2.stderr b/tests/ui/const-generics/issues/issue-67185-2.stderr
index c7be8e14a..c7be8e14a 100644
--- a/src/test/ui/const-generics/issues/issue-67185-2.stderr
+++ b/tests/ui/const-generics/issues/issue-67185-2.stderr
diff --git a/src/test/ui/const-generics/issues/issue-67375.full.stderr b/tests/ui/const-generics/issues/issue-67375.full.stderr
index 0cf69879a..0cf69879a 100644
--- a/src/test/ui/const-generics/issues/issue-67375.full.stderr
+++ b/tests/ui/const-generics/issues/issue-67375.full.stderr
diff --git a/src/test/ui/const-generics/issues/issue-67375.min.stderr b/tests/ui/const-generics/issues/issue-67375.min.stderr
index 5256d96c8..5256d96c8 100644
--- a/src/test/ui/const-generics/issues/issue-67375.min.stderr
+++ b/tests/ui/const-generics/issues/issue-67375.min.stderr
diff --git a/src/test/ui/const-generics/issues/issue-67375.rs b/tests/ui/const-generics/issues/issue-67375.rs
index 8b4b276ba..8b4b276ba 100644
--- a/src/test/ui/const-generics/issues/issue-67375.rs
+++ b/tests/ui/const-generics/issues/issue-67375.rs
diff --git a/src/test/ui/const-generics/issues/issue-67739.full.stderr b/tests/ui/const-generics/issues/issue-67739.full.stderr
index f1a426c3c..f1a426c3c 100644
--- a/src/test/ui/const-generics/issues/issue-67739.full.stderr
+++ b/tests/ui/const-generics/issues/issue-67739.full.stderr
diff --git a/src/test/ui/const-generics/issues/issue-67739.min.stderr b/tests/ui/const-generics/issues/issue-67739.min.stderr
index dcbe5b94a..dcbe5b94a 100644
--- a/src/test/ui/const-generics/issues/issue-67739.min.stderr
+++ b/tests/ui/const-generics/issues/issue-67739.min.stderr
diff --git a/src/test/ui/const-generics/issues/issue-67739.rs b/tests/ui/const-generics/issues/issue-67739.rs
index de0eb7f50..de0eb7f50 100644
--- a/src/test/ui/const-generics/issues/issue-67739.rs
+++ b/tests/ui/const-generics/issues/issue-67739.rs
diff --git a/src/test/ui/const-generics/issues/issue-67945-1.full.stderr b/tests/ui/const-generics/issues/issue-67945-1.full.stderr
index 8e18fcdff..8e18fcdff 100644
--- a/src/test/ui/const-generics/issues/issue-67945-1.full.stderr
+++ b/tests/ui/const-generics/issues/issue-67945-1.full.stderr
diff --git a/src/test/ui/const-generics/issues/issue-67945-1.min.stderr b/tests/ui/const-generics/issues/issue-67945-1.min.stderr
index eee04eb75..eee04eb75 100644
--- a/src/test/ui/const-generics/issues/issue-67945-1.min.stderr
+++ b/tests/ui/const-generics/issues/issue-67945-1.min.stderr
diff --git a/src/test/ui/const-generics/issues/issue-67945-1.rs b/tests/ui/const-generics/issues/issue-67945-1.rs
index 99f88bc8e..99f88bc8e 100644
--- a/src/test/ui/const-generics/issues/issue-67945-1.rs
+++ b/tests/ui/const-generics/issues/issue-67945-1.rs
diff --git a/src/test/ui/const-generics/issues/issue-67945-2.full.stderr b/tests/ui/const-generics/issues/issue-67945-2.full.stderr
index cce85772a..47429b761 100644
--- a/src/test/ui/const-generics/issues/issue-67945-2.full.stderr
+++ b/tests/ui/const-generics/issues/issue-67945-2.full.stderr
@@ -8,7 +8,7 @@ LL | |         let x: Option<Box<Self>> = None;
 LL | |
 LL | |         0
 LL | |     }],
-   | |_____^ blocks are not supported in generic constant
+   | |_____^ blocks are not supported in generic constants
    |
    = help: consider moving this anonymous constant into a `const` function
    = note: this operation may be supported in the future
diff --git a/src/test/ui/const-generics/issues/issue-67945-2.min.stderr b/tests/ui/const-generics/issues/issue-67945-2.min.stderr
index 6e07af1e6..6e07af1e6 100644
--- a/src/test/ui/const-generics/issues/issue-67945-2.min.stderr
+++ b/tests/ui/const-generics/issues/issue-67945-2.min.stderr
diff --git a/src/test/ui/const-generics/issues/issue-67945-2.rs b/tests/ui/const-generics/issues/issue-67945-2.rs
index cbb4e14ec..cbb4e14ec 100644
--- a/src/test/ui/const-generics/issues/issue-67945-2.rs
+++ b/tests/ui/const-generics/issues/issue-67945-2.rs
diff --git a/src/test/ui/const-generics/issues/issue-67945-3.full.stderr b/tests/ui/const-generics/issues/issue-67945-3.full.stderr
index d3d9452d3..98f9f8397 100644
--- a/src/test/ui/const-generics/issues/issue-67945-3.full.stderr
+++ b/tests/ui/const-generics/issues/issue-67945-3.full.stderr
@@ -7,7 +7,7 @@ LL | |         let x: Option<S> = None;
 LL | |
 LL | |         0
 LL | |     }],
-   | |_____^ blocks are not supported in generic constant
+   | |_____^ blocks are not supported in generic constants
    |
    = help: consider moving this anonymous constant into a `const` function
    = note: this operation may be supported in the future
diff --git a/src/test/ui/const-generics/issues/issue-67945-3.min.stderr b/tests/ui/const-generics/issues/issue-67945-3.min.stderr
index 8e6b4b204..8e6b4b204 100644
--- a/src/test/ui/const-generics/issues/issue-67945-3.min.stderr
+++ b/tests/ui/const-generics/issues/issue-67945-3.min.stderr
diff --git a/src/test/ui/const-generics/issues/issue-67945-3.rs b/tests/ui/const-generics/issues/issue-67945-3.rs
index fd8a393ef..fd8a393ef 100644
--- a/src/test/ui/const-generics/issues/issue-67945-3.rs
+++ b/tests/ui/const-generics/issues/issue-67945-3.rs
diff --git a/src/test/ui/const-generics/issues/issue-67945-4.full.stderr b/tests/ui/const-generics/issues/issue-67945-4.full.stderr
index 9604eb35d..c03d40a7b 100644
--- a/src/test/ui/const-generics/issues/issue-67945-4.full.stderr
+++ b/tests/ui/const-generics/issues/issue-67945-4.full.stderr
@@ -7,7 +7,7 @@ LL | |         let x: Option<Box<S>> = None;
 LL | |
 LL | |         0
 LL | |     }],
-   | |_____^ blocks are not supported in generic constant
+   | |_____^ blocks are not supported in generic constants
    |
    = help: consider moving this anonymous constant into a `const` function
    = note: this operation may be supported in the future
diff --git a/src/test/ui/const-generics/issues/issue-67945-4.min.stderr b/tests/ui/const-generics/issues/issue-67945-4.min.stderr
index f9520872d..f9520872d 100644
--- a/src/test/ui/const-generics/issues/issue-67945-4.min.stderr
+++ b/tests/ui/const-generics/issues/issue-67945-4.min.stderr
diff --git a/src/test/ui/const-generics/issues/issue-67945-4.rs b/tests/ui/const-generics/issues/issue-67945-4.rs
index 9a27bf09f..9a27bf09f 100644
--- a/src/test/ui/const-generics/issues/issue-67945-4.rs
+++ b/tests/ui/const-generics/issues/issue-67945-4.rs
diff --git a/src/test/ui/const-generics/issues/issue-68104-print-stack-overflow.rs b/tests/ui/const-generics/issues/issue-68104-print-stack-overflow.rs
index ad5710baa..ad5710baa 100644
--- a/src/test/ui/const-generics/issues/issue-68104-print-stack-overflow.rs
+++ b/tests/ui/const-generics/issues/issue-68104-print-stack-overflow.rs
diff --git a/src/test/ui/const-generics/issues/issue-68366.full.stderr b/tests/ui/const-generics/issues/issue-68366.full.stderr
index ca9eb801d..ca9eb801d 100644
--- a/src/test/ui/const-generics/issues/issue-68366.full.stderr
+++ b/tests/ui/const-generics/issues/issue-68366.full.stderr
diff --git a/src/test/ui/const-generics/issues/issue-68366.min.stderr b/tests/ui/const-generics/issues/issue-68366.min.stderr
index 3740ced90..3740ced90 100644
--- a/src/test/ui/const-generics/issues/issue-68366.min.stderr
+++ b/tests/ui/const-generics/issues/issue-68366.min.stderr
diff --git a/src/test/ui/const-generics/issues/issue-68366.rs b/tests/ui/const-generics/issues/issue-68366.rs
index 4c2741ab4..4c2741ab4 100644
--- a/src/test/ui/const-generics/issues/issue-68366.rs
+++ b/tests/ui/const-generics/issues/issue-68366.rs
diff --git a/src/test/ui/const-generics/issues/issue-68596.rs b/tests/ui/const-generics/issues/issue-68596.rs
index c3c9141e4..c3c9141e4 100644
--- a/src/test/ui/const-generics/issues/issue-68596.rs
+++ b/tests/ui/const-generics/issues/issue-68596.rs
diff --git a/src/test/ui/const-generics/issues/issue-68615-adt.min.stderr b/tests/ui/const-generics/issues/issue-68615-adt.min.stderr
index df04c4896..df04c4896 100644
--- a/src/test/ui/const-generics/issues/issue-68615-adt.min.stderr
+++ b/tests/ui/const-generics/issues/issue-68615-adt.min.stderr
diff --git a/src/test/ui/const-generics/issues/issue-68615-adt.rs b/tests/ui/const-generics/issues/issue-68615-adt.rs
index 3ef1ad45e..3ef1ad45e 100644
--- a/src/test/ui/const-generics/issues/issue-68615-adt.rs
+++ b/tests/ui/const-generics/issues/issue-68615-adt.rs
diff --git a/src/test/ui/const-generics/issues/issue-68615-array.min.stderr b/tests/ui/const-generics/issues/issue-68615-array.min.stderr
index 1b4517087..1b4517087 100644
--- a/src/test/ui/const-generics/issues/issue-68615-array.min.stderr
+++ b/tests/ui/const-generics/issues/issue-68615-array.min.stderr
diff --git a/src/test/ui/const-generics/issues/issue-68615-array.rs b/tests/ui/const-generics/issues/issue-68615-array.rs
index 93477be41..93477be41 100644
--- a/src/test/ui/const-generics/issues/issue-68615-array.rs
+++ b/tests/ui/const-generics/issues/issue-68615-array.rs
diff --git a/src/test/ui/const-generics/issues/issue-69654-run-pass.rs b/tests/ui/const-generics/issues/issue-69654-run-pass.rs
index 63d7fde78..63d7fde78 100644
--- a/src/test/ui/const-generics/issues/issue-69654-run-pass.rs
+++ b/tests/ui/const-generics/issues/issue-69654-run-pass.rs
diff --git a/src/test/ui/const-generics/issues/issue-70125-1.rs b/tests/ui/const-generics/issues/issue-70125-1.rs
index 0027cd46a..0027cd46a 100644
--- a/src/test/ui/const-generics/issues/issue-70125-1.rs
+++ b/tests/ui/const-generics/issues/issue-70125-1.rs
diff --git a/src/test/ui/const-generics/issues/issue-70125-2.rs b/tests/ui/const-generics/issues/issue-70125-2.rs
index cfd5e784e..cfd5e784e 100644
--- a/src/test/ui/const-generics/issues/issue-70125-2.rs
+++ b/tests/ui/const-generics/issues/issue-70125-2.rs
diff --git a/src/test/ui/const-generics/issues/issue-70167.rs b/tests/ui/const-generics/issues/issue-70167.rs
index 3961941f8..3961941f8 100644
--- a/src/test/ui/const-generics/issues/issue-70167.rs
+++ b/tests/ui/const-generics/issues/issue-70167.rs
diff --git a/src/test/ui/const-generics/issues/issue-70180-1-stalled_on.rs b/tests/ui/const-generics/issues/issue-70180-1-stalled_on.rs
index 2ec37cc3a..2ec37cc3a 100644
--- a/src/test/ui/const-generics/issues/issue-70180-1-stalled_on.rs
+++ b/tests/ui/const-generics/issues/issue-70180-1-stalled_on.rs
diff --git a/src/test/ui/const-generics/issues/issue-70180-2-stalled_on.rs b/tests/ui/const-generics/issues/issue-70180-2-stalled_on.rs
index 95e548428..95e548428 100644
--- a/src/test/ui/const-generics/issues/issue-70180-2-stalled_on.rs
+++ b/tests/ui/const-generics/issues/issue-70180-2-stalled_on.rs
diff --git a/src/test/ui/const-generics/issues/issue-70225.rs b/tests/ui/const-generics/issues/issue-70225.rs
index d458d7b2e..d458d7b2e 100644
--- a/src/test/ui/const-generics/issues/issue-70225.rs
+++ b/tests/ui/const-generics/issues/issue-70225.rs
diff --git a/src/test/ui/const-generics/issues/issue-70273-assoc-fn.rs b/tests/ui/const-generics/issues/issue-70273-assoc-fn.rs
index a76488249..a76488249 100644
--- a/src/test/ui/const-generics/issues/issue-70273-assoc-fn.rs
+++ b/tests/ui/const-generics/issues/issue-70273-assoc-fn.rs
diff --git a/src/test/ui/const-generics/issues/issue-71169.full.stderr b/tests/ui/const-generics/issues/issue-71169.full.stderr
index 1f5880f36..1f5880f36 100644
--- a/src/test/ui/const-generics/issues/issue-71169.full.stderr
+++ b/tests/ui/const-generics/issues/issue-71169.full.stderr
diff --git a/src/test/ui/const-generics/issues/issue-71169.min.stderr b/tests/ui/const-generics/issues/issue-71169.min.stderr
index 87ed2d4f8..998b16a79 100644
--- a/src/test/ui/const-generics/issues/issue-71169.min.stderr
+++ b/tests/ui/const-generics/issues/issue-71169.min.stderr
@@ -4,7 +4,7 @@ error[E0770]: the type of const parameters must not depend on other generic para
 LL | fn foo<const LEN: usize, const DATA: [u8; LEN]>() {}
    |                                           ^^^ the type must not depend on the parameter `LEN`
 
-error: `[u8; _]` is forbidden as the type of a const generic parameter
+error: `[u8; LEN]` is forbidden as the type of a const generic parameter
   --> $DIR/issue-71169.rs:5:38
    |
 LL | fn foo<const LEN: usize, const DATA: [u8; LEN]>() {}
diff --git a/src/test/ui/const-generics/issues/issue-71169.rs b/tests/ui/const-generics/issues/issue-71169.rs
index 617149a84..e4ec6b073 100644
--- a/src/test/ui/const-generics/issues/issue-71169.rs
+++ b/tests/ui/const-generics/issues/issue-71169.rs
@@ -4,7 +4,7 @@
 
 fn foo<const LEN: usize, const DATA: [u8; LEN]>() {}
 //~^ ERROR the type of const parameters must not
-//[min]~^^ ERROR `[u8; _]` is forbidden as the type of a const generic parameter
+//[min]~^^ ERROR `[u8; LEN]` is forbidden as the type of a const generic parameter
 fn main() {
     const DATA: [u8; 4] = *b"ABCD";
     foo::<4, DATA>();
diff --git a/src/test/ui/const-generics/issues/issue-71202.rs b/tests/ui/const-generics/issues/issue-71202.rs
index 57fd72b12..57fd72b12 100644
--- a/src/test/ui/const-generics/issues/issue-71202.rs
+++ b/tests/ui/const-generics/issues/issue-71202.rs
diff --git a/src/test/ui/const-generics/issues/issue-71202.stderr b/tests/ui/const-generics/issues/issue-71202.stderr
index 277540610..277540610 100644
--- a/src/test/ui/const-generics/issues/issue-71202.stderr
+++ b/tests/ui/const-generics/issues/issue-71202.stderr
diff --git a/src/test/ui/const-generics/issues/issue-71381.full.stderr b/tests/ui/const-generics/issues/issue-71381.full.stderr
index e17cf96aa..e17cf96aa 100644
--- a/src/test/ui/const-generics/issues/issue-71381.full.stderr
+++ b/tests/ui/const-generics/issues/issue-71381.full.stderr
diff --git a/src/test/ui/const-generics/issues/issue-71381.min.stderr b/tests/ui/const-generics/issues/issue-71381.min.stderr
index 3950317b3..3950317b3 100644
--- a/src/test/ui/const-generics/issues/issue-71381.min.stderr
+++ b/tests/ui/const-generics/issues/issue-71381.min.stderr
diff --git a/src/test/ui/const-generics/issues/issue-71381.rs b/tests/ui/const-generics/issues/issue-71381.rs
index 66f819dbe..66f819dbe 100644
--- a/src/test/ui/const-generics/issues/issue-71381.rs
+++ b/tests/ui/const-generics/issues/issue-71381.rs
diff --git a/src/test/ui/const-generics/issues/issue-71382.full.stderr b/tests/ui/const-generics/issues/issue-71382.full.stderr
index ab2a4e64a..ab2a4e64a 100644
--- a/src/test/ui/const-generics/issues/issue-71382.full.stderr
+++ b/tests/ui/const-generics/issues/issue-71382.full.stderr
diff --git a/src/test/ui/const-generics/issues/issue-71382.min.stderr b/tests/ui/const-generics/issues/issue-71382.min.stderr
index 715037bd5..715037bd5 100644
--- a/src/test/ui/const-generics/issues/issue-71382.min.stderr
+++ b/tests/ui/const-generics/issues/issue-71382.min.stderr
diff --git a/src/test/ui/const-generics/issues/issue-71382.rs b/tests/ui/const-generics/issues/issue-71382.rs
index 4392d72e5..4392d72e5 100644
--- a/src/test/ui/const-generics/issues/issue-71382.rs
+++ b/tests/ui/const-generics/issues/issue-71382.rs
diff --git a/src/test/ui/const-generics/issues/issue-71547.rs b/tests/ui/const-generics/issues/issue-71547.rs
index 60776a1a9..60776a1a9 100644
--- a/src/test/ui/const-generics/issues/issue-71547.rs
+++ b/tests/ui/const-generics/issues/issue-71547.rs
diff --git a/src/test/ui/const-generics/issues/issue-71611.full.stderr b/tests/ui/const-generics/issues/issue-71611.full.stderr
index 656aa29e1..656aa29e1 100644
--- a/src/test/ui/const-generics/issues/issue-71611.full.stderr
+++ b/tests/ui/const-generics/issues/issue-71611.full.stderr
diff --git a/src/test/ui/const-generics/issues/issue-71611.min.stderr b/tests/ui/const-generics/issues/issue-71611.min.stderr
index 01a85b745..01a85b745 100644
--- a/src/test/ui/const-generics/issues/issue-71611.min.stderr
+++ b/tests/ui/const-generics/issues/issue-71611.min.stderr
diff --git a/src/test/ui/const-generics/issues/issue-71611.rs b/tests/ui/const-generics/issues/issue-71611.rs
index fbb91ca18..fbb91ca18 100644
--- a/src/test/ui/const-generics/issues/issue-71611.rs
+++ b/tests/ui/const-generics/issues/issue-71611.rs
diff --git a/src/test/ui/const-generics/issues/issue-71986.rs b/tests/ui/const-generics/issues/issue-71986.rs
index 6f0a98ead..6f0a98ead 100644
--- a/src/test/ui/const-generics/issues/issue-71986.rs
+++ b/tests/ui/const-generics/issues/issue-71986.rs
diff --git a/src/test/ui/const-generics/issues/issue-72352.full.stderr b/tests/ui/const-generics/issues/issue-72352.full.stderr
index 92580b336..92580b336 100644
--- a/src/test/ui/const-generics/issues/issue-72352.full.stderr
+++ b/tests/ui/const-generics/issues/issue-72352.full.stderr
diff --git a/src/test/ui/const-generics/issues/issue-72352.min.stderr b/tests/ui/const-generics/issues/issue-72352.min.stderr
index eedd73c4d..eedd73c4d 100644
--- a/src/test/ui/const-generics/issues/issue-72352.min.stderr
+++ b/tests/ui/const-generics/issues/issue-72352.min.stderr
diff --git a/src/test/ui/const-generics/issues/issue-72352.rs b/tests/ui/const-generics/issues/issue-72352.rs
index 2fa1d7a53..2fa1d7a53 100644
--- a/src/test/ui/const-generics/issues/issue-72352.rs
+++ b/tests/ui/const-generics/issues/issue-72352.rs
diff --git a/src/test/ui/const-generics/issues/issue-72845.rs b/tests/ui/const-generics/issues/issue-72845.rs
index bea5dc8ba..bea5dc8ba 100644
--- a/src/test/ui/const-generics/issues/issue-72845.rs
+++ b/tests/ui/const-generics/issues/issue-72845.rs
diff --git a/src/test/ui/const-generics/issues/issue-72845.stderr b/tests/ui/const-generics/issues/issue-72845.stderr
index 631c8605f..631c8605f 100644
--- a/src/test/ui/const-generics/issues/issue-72845.stderr
+++ b/tests/ui/const-generics/issues/issue-72845.stderr
diff --git a/src/test/ui/const-generics/issues/issue-73120.rs b/tests/ui/const-generics/issues/issue-73120.rs
index 050dc9bde..050dc9bde 100644
--- a/src/test/ui/const-generics/issues/issue-73120.rs
+++ b/tests/ui/const-generics/issues/issue-73120.rs
diff --git a/src/test/ui/const-generics/issues/issue-73260.rs b/tests/ui/const-generics/issues/issue-73260.rs
index d762f9c8b..d762f9c8b 100644
--- a/src/test/ui/const-generics/issues/issue-73260.rs
+++ b/tests/ui/const-generics/issues/issue-73260.rs
diff --git a/src/test/ui/const-generics/issues/issue-73260.stderr b/tests/ui/const-generics/issues/issue-73260.stderr
index 7670032e5..7670032e5 100644
--- a/src/test/ui/const-generics/issues/issue-73260.stderr
+++ b/tests/ui/const-generics/issues/issue-73260.stderr
diff --git a/src/test/ui/const-generics/issues/issue-73491.min.stderr b/tests/ui/const-generics/issues/issue-73491.min.stderr
index f2b58e59f..f03354fc4 100644
--- a/src/test/ui/const-generics/issues/issue-73491.min.stderr
+++ b/tests/ui/const-generics/issues/issue-73491.min.stderr
@@ -1,4 +1,4 @@
-error: `[u32; _]` is forbidden as the type of a const generic parameter
+error: `[u32; LEN]` is forbidden as the type of a const generic parameter
   --> $DIR/issue-73491.rs:8:19
    |
 LL | fn hoge<const IN: [u32; LEN]>() {}
diff --git a/tests/ui/const-generics/issues/issue-73491.rs b/tests/ui/const-generics/issues/issue-73491.rs
new file mode 100644
index 000000000..482dbb04d
--- /dev/null
+++ b/tests/ui/const-generics/issues/issue-73491.rs
@@ -0,0 +1,11 @@
+// [full] check-pass
+// revisions: full min
+#![cfg_attr(full, feature(adt_const_params))]
+#![cfg_attr(full, allow(incomplete_features))]
+
+const LEN: usize = 1024;
+
+fn hoge<const IN: [u32; LEN]>() {}
+//[min]~^ ERROR `[u32; LEN]` is forbidden as the type of a const generic parameter
+
+fn main() {}
diff --git a/src/test/ui/const-generics/issues/issue-73727-static-reference-array-const-param.min.stderr b/tests/ui/const-generics/issues/issue-73727-static-reference-array-const-param.min.stderr
index 0a7db6247..0a7db6247 100644
--- a/src/test/ui/const-generics/issues/issue-73727-static-reference-array-const-param.min.stderr
+++ b/tests/ui/const-generics/issues/issue-73727-static-reference-array-const-param.min.stderr
diff --git a/src/test/ui/const-generics/issues/issue-73727-static-reference-array-const-param.rs b/tests/ui/const-generics/issues/issue-73727-static-reference-array-const-param.rs
index f0d604835..f0d604835 100644
--- a/src/test/ui/const-generics/issues/issue-73727-static-reference-array-const-param.rs
+++ b/tests/ui/const-generics/issues/issue-73727-static-reference-array-const-param.rs
diff --git a/src/test/ui/const-generics/issues/issue-74101.min.stderr b/tests/ui/const-generics/issues/issue-74101.min.stderr
index 82ffb2332..134c24834 100644
--- a/src/test/ui/const-generics/issues/issue-74101.min.stderr
+++ b/tests/ui/const-generics/issues/issue-74101.min.stderr
@@ -1,4 +1,4 @@
-error: `[u8; _]` is forbidden as the type of a const generic parameter
+error: `[u8; 1 + 2]` is forbidden as the type of a const generic parameter
   --> $DIR/issue-74101.rs:6:18
    |
 LL | fn test<const N: [u8; 1 + 2]>() {}
@@ -7,7 +7,7 @@ LL | fn test<const N: [u8; 1 + 2]>() {}
    = note: the only supported types are integers, `bool` and `char`
    = help: more complex types are supported with `#![feature(adt_const_params)]`
 
-error: `[u8; _]` is forbidden as the type of a const generic parameter
+error: `[u8; 1 + 2]` is forbidden as the type of a const generic parameter
   --> $DIR/issue-74101.rs:9:21
    |
 LL | struct Foo<const N: [u8; 1 + 2]>;
diff --git a/tests/ui/const-generics/issues/issue-74101.rs b/tests/ui/const-generics/issues/issue-74101.rs
new file mode 100644
index 000000000..4c9b2d3c6
--- /dev/null
+++ b/tests/ui/const-generics/issues/issue-74101.rs
@@ -0,0 +1,12 @@
+// [full] check-pass
+// revisions: full min
+#![cfg_attr(full, feature(adt_const_params))]
+#![cfg_attr(full, allow(incomplete_features))]
+
+fn test<const N: [u8; 1 + 2]>() {}
+//[min]~^ ERROR `[u8; 1 + 2]` is forbidden as the type of a const generic parameter
+
+struct Foo<const N: [u8; 1 + 2]>;
+//[min]~^ ERROR `[u8; 1 + 2]` is forbidden as the type of a const generic parameter
+
+fn main() {}
diff --git a/src/test/ui/const-generics/issues/issue-74255.min.stderr b/tests/ui/const-generics/issues/issue-74255.min.stderr
index b462d8448..b462d8448 100644
--- a/src/test/ui/const-generics/issues/issue-74255.min.stderr
+++ b/tests/ui/const-generics/issues/issue-74255.min.stderr
diff --git a/src/test/ui/const-generics/issues/issue-74255.rs b/tests/ui/const-generics/issues/issue-74255.rs
index 0e523926f..0e523926f 100644
--- a/src/test/ui/const-generics/issues/issue-74255.rs
+++ b/tests/ui/const-generics/issues/issue-74255.rs
diff --git a/src/test/ui/const-generics/issues/issue-74906.rs b/tests/ui/const-generics/issues/issue-74906.rs
index cc1f2853f..cc1f2853f 100644
--- a/src/test/ui/const-generics/issues/issue-74906.rs
+++ b/tests/ui/const-generics/issues/issue-74906.rs
diff --git a/src/test/ui/const-generics/issues/issue-74950.min.stderr b/tests/ui/const-generics/issues/issue-74950.min.stderr
index 729ecc202..729ecc202 100644
--- a/src/test/ui/const-generics/issues/issue-74950.min.stderr
+++ b/tests/ui/const-generics/issues/issue-74950.min.stderr
diff --git a/src/test/ui/const-generics/issues/issue-74950.rs b/tests/ui/const-generics/issues/issue-74950.rs
index 3e1ca4735..3e1ca4735 100644
--- a/src/test/ui/const-generics/issues/issue-74950.rs
+++ b/tests/ui/const-generics/issues/issue-74950.rs
diff --git a/src/test/ui/const-generics/issues/issue-75047.min.stderr b/tests/ui/const-generics/issues/issue-75047.min.stderr
index 7798ae796..46af19ef3 100644
--- a/src/test/ui/const-generics/issues/issue-75047.min.stderr
+++ b/tests/ui/const-generics/issues/issue-75047.min.stderr
@@ -1,4 +1,4 @@
-error: `[u8; _]` is forbidden as the type of a const generic parameter
+error: `[u8; Bar::<u32>::value()]` is forbidden as the type of a const generic parameter
   --> $DIR/issue-75047.rs:14:21
    |
 LL | struct Foo<const N: [u8; Bar::<u32>::value()]>;
diff --git a/tests/ui/const-generics/issues/issue-75047.rs b/tests/ui/const-generics/issues/issue-75047.rs
new file mode 100644
index 000000000..7b6fb92bc
--- /dev/null
+++ b/tests/ui/const-generics/issues/issue-75047.rs
@@ -0,0 +1,17 @@
+// [full] check-pass
+// revisions: full min
+#![cfg_attr(full, feature(adt_const_params))]
+#![cfg_attr(full, allow(incomplete_features))]
+
+struct Bar<T>(T);
+
+impl<T> Bar<T> {
+    const fn value() -> usize {
+        42
+    }
+}
+
+struct Foo<const N: [u8; Bar::<u32>::value()]>;
+//[min]~^ ERROR `[u8; Bar::<u32>::value()]` is forbidden as the type of a const generic parameter
+
+fn main() {}
diff --git a/src/test/ui/const-generics/issues/issue-75299.rs b/tests/ui/const-generics/issues/issue-75299.rs
index 83ef09af8..83ef09af8 100644
--- a/src/test/ui/const-generics/issues/issue-75299.rs
+++ b/tests/ui/const-generics/issues/issue-75299.rs
diff --git a/src/test/ui/const-generics/issues/issue-76701-ty-param-in-const.rs b/tests/ui/const-generics/issues/issue-76701-ty-param-in-const.rs
index 2e6b02236..2e6b02236 100644
--- a/src/test/ui/const-generics/issues/issue-76701-ty-param-in-const.rs
+++ b/tests/ui/const-generics/issues/issue-76701-ty-param-in-const.rs
diff --git a/src/test/ui/const-generics/issues/issue-76701-ty-param-in-const.stderr b/tests/ui/const-generics/issues/issue-76701-ty-param-in-const.stderr
index 3b53e18e6..3b53e18e6 100644
--- a/src/test/ui/const-generics/issues/issue-76701-ty-param-in-const.stderr
+++ b/tests/ui/const-generics/issues/issue-76701-ty-param-in-const.stderr
diff --git a/src/test/ui/const-generics/issues/issue-77357.rs b/tests/ui/const-generics/issues/issue-77357.rs
index 3cb8d3846..3cb8d3846 100644
--- a/src/test/ui/const-generics/issues/issue-77357.rs
+++ b/tests/ui/const-generics/issues/issue-77357.rs
diff --git a/src/test/ui/const-generics/issues/issue-77357.stderr b/tests/ui/const-generics/issues/issue-77357.stderr
index 804c0ae51..68b35a38b 100644
--- a/src/test/ui/const-generics/issues/issue-77357.stderr
+++ b/tests/ui/const-generics/issues/issue-77357.stderr
@@ -2,7 +2,7 @@ error: overly complex generic constant
   --> $DIR/issue-77357.rs:6:46
    |
 LL | fn bug<'a, T>() -> &'static dyn MyTrait<[(); { |x: &'a u32| { x }; 4 }]> {
-   |                                              ^^^^^^^^^^^^^^^^^^^^^^^^^ blocks are not supported in generic constant
+   |                                              ^^^^^^^^^^^^^^^^^^^^^^^^^ blocks are not supported in generic constants
    |
    = help: consider moving this anonymous constant into a `const` function
    = note: this operation may be supported in the future
diff --git a/src/test/ui/const-generics/issues/issue-79674.rs b/tests/ui/const-generics/issues/issue-79674.rs
index ff141d328..ff141d328 100644
--- a/src/test/ui/const-generics/issues/issue-79674.rs
+++ b/tests/ui/const-generics/issues/issue-79674.rs
diff --git a/src/test/ui/const-generics/issues/issue-79674.stderr b/tests/ui/const-generics/issues/issue-79674.stderr
index 02b48b55f..02b48b55f 100644
--- a/src/test/ui/const-generics/issues/issue-79674.stderr
+++ b/tests/ui/const-generics/issues/issue-79674.stderr
diff --git a/src/test/ui/const-generics/issues/issue-80062.rs b/tests/ui/const-generics/issues/issue-80062.rs
index 56dc53298..56dc53298 100644
--- a/src/test/ui/const-generics/issues/issue-80062.rs
+++ b/tests/ui/const-generics/issues/issue-80062.rs
diff --git a/src/test/ui/const-generics/issues/issue-80062.stderr b/tests/ui/const-generics/issues/issue-80062.stderr
index 754f18d5c..754f18d5c 100644
--- a/src/test/ui/const-generics/issues/issue-80062.stderr
+++ b/tests/ui/const-generics/issues/issue-80062.stderr
diff --git a/src/test/ui/const-generics/issues/issue-80375.rs b/tests/ui/const-generics/issues/issue-80375.rs
index c906bb2c4..c906bb2c4 100644
--- a/src/test/ui/const-generics/issues/issue-80375.rs
+++ b/tests/ui/const-generics/issues/issue-80375.rs
diff --git a/src/test/ui/const-generics/issues/issue-80375.stderr b/tests/ui/const-generics/issues/issue-80375.stderr
index 5409002a9..5409002a9 100644
--- a/src/test/ui/const-generics/issues/issue-80375.stderr
+++ b/tests/ui/const-generics/issues/issue-80375.stderr
diff --git a/src/test/ui/const-generics/issues/issue-82956.rs b/tests/ui/const-generics/issues/issue-82956.rs
index 3539e9b96..3539e9b96 100644
--- a/src/test/ui/const-generics/issues/issue-82956.rs
+++ b/tests/ui/const-generics/issues/issue-82956.rs
diff --git a/src/test/ui/const-generics/issues/issue-82956.stderr b/tests/ui/const-generics/issues/issue-82956.stderr
index d2320293e..d2320293e 100644
--- a/src/test/ui/const-generics/issues/issue-82956.stderr
+++ b/tests/ui/const-generics/issues/issue-82956.stderr
diff --git a/src/test/ui/const-generics/issues/issue-83249.rs b/tests/ui/const-generics/issues/issue-83249.rs
index 65148c55e..65148c55e 100644
--- a/src/test/ui/const-generics/issues/issue-83249.rs
+++ b/tests/ui/const-generics/issues/issue-83249.rs
diff --git a/src/test/ui/const-generics/issues/issue-83249.stderr b/tests/ui/const-generics/issues/issue-83249.stderr
index 362b8554b..7491fdc8a 100644
--- a/src/test/ui/const-generics/issues/issue-83249.stderr
+++ b/tests/ui/const-generics/issues/issue-83249.stderr
@@ -6,8 +6,8 @@ LL |     let _ = foo([0; 1]);
    |
 help: consider giving this pattern a type
    |
-LL |     let _: _ = foo([0; 1]);
-   |          +++
+LL |     let _: /* Type */ = foo([0; 1]);
+   |          ++++++++++++
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/const-generics/issues/issue-83288.rs b/tests/ui/const-generics/issues/issue-83288.rs
index a24596d24..a24596d24 100644
--- a/src/test/ui/const-generics/issues/issue-83288.rs
+++ b/tests/ui/const-generics/issues/issue-83288.rs
diff --git a/src/test/ui/const-generics/issues/issue-83466.rs b/tests/ui/const-generics/issues/issue-83466.rs
index 73c930101..73c930101 100644
--- a/src/test/ui/const-generics/issues/issue-83466.rs
+++ b/tests/ui/const-generics/issues/issue-83466.rs
diff --git a/src/test/ui/const-generics/issues/issue-83466.stderr b/tests/ui/const-generics/issues/issue-83466.stderr
index bcfd70639..bcfd70639 100644
--- a/src/test/ui/const-generics/issues/issue-83466.stderr
+++ b/tests/ui/const-generics/issues/issue-83466.stderr
diff --git a/src/test/ui/const-generics/issues/issue-83765.rs b/tests/ui/const-generics/issues/issue-83765.rs
index 71c164ab0..71c164ab0 100644
--- a/src/test/ui/const-generics/issues/issue-83765.rs
+++ b/tests/ui/const-generics/issues/issue-83765.rs
diff --git a/src/test/ui/const-generics/issues/issue-83765.stderr b/tests/ui/const-generics/issues/issue-83765.stderr
index d7b2b006c..d7b2b006c 100644
--- a/src/test/ui/const-generics/issues/issue-83765.stderr
+++ b/tests/ui/const-generics/issues/issue-83765.stderr
diff --git a/src/test/ui/const-generics/issues/issue-83993.rs b/tests/ui/const-generics/issues/issue-83993.rs
index f2f05d952..f2f05d952 100644
--- a/src/test/ui/const-generics/issues/issue-83993.rs
+++ b/tests/ui/const-generics/issues/issue-83993.rs
diff --git a/src/test/ui/const-generics/issues/issue-84659.rs b/tests/ui/const-generics/issues/issue-84659.rs
index 440ca740a..440ca740a 100644
--- a/src/test/ui/const-generics/issues/issue-84659.rs
+++ b/tests/ui/const-generics/issues/issue-84659.rs
diff --git a/src/test/ui/const-generics/issues/issue-84659.stderr b/tests/ui/const-generics/issues/issue-84659.stderr
index 2dfc48a34..2dfc48a34 100644
--- a/src/test/ui/const-generics/issues/issue-84659.stderr
+++ b/tests/ui/const-generics/issues/issue-84659.stderr
diff --git a/src/test/ui/const-generics/issues/issue-85031-2.rs b/tests/ui/const-generics/issues/issue-85031-2.rs
index 4908fb296..50dd66da6 100644
--- a/src/test/ui/const-generics/issues/issue-85031-2.rs
+++ b/tests/ui/const-generics/issues/issue-85031-2.rs
@@ -1,5 +1,5 @@
 // check-pass
-// known-bug
+// known-bug: unknown
 
 // This should not compile, as the compiler should not know
 // `A - 0` is satisfied `?x - 0` if `?x` is inferred to `A`.
@@ -10,7 +10,6 @@ pub struct Ref<'a>(&'a i32);
 
 impl<'a> Ref<'a> {
     pub fn foo<const A: usize>() -> [(); A - 0] {
-        //~^ WARN function cannot
         Self::foo()
     }
 }
diff --git a/src/test/ui/const-generics/issues/issue-85031-2.stderr b/tests/ui/const-generics/issues/issue-85031-2.stderr
index fc6905768..896e1c7ea 100644
--- a/src/test/ui/const-generics/issues/issue-85031-2.stderr
+++ b/tests/ui/const-generics/issues/issue-85031-2.stderr
@@ -3,7 +3,6 @@ warning: function cannot return without recursing
    |
 LL |     pub fn foo<const A: usize>() -> [(); A - 0] {
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ cannot return without recursing
-LL |
 LL |         Self::foo()
    |         ----------- recursive call site
    |
diff --git a/src/test/ui/const-generics/issues/issue-86033.rs b/tests/ui/const-generics/issues/issue-86033.rs
index cf08f722f..cf08f722f 100644
--- a/src/test/ui/const-generics/issues/issue-86033.rs
+++ b/tests/ui/const-generics/issues/issue-86033.rs
diff --git a/src/test/ui/const-generics/issues/issue-86530.rs b/tests/ui/const-generics/issues/issue-86530.rs
index b024decd4..b024decd4 100644
--- a/src/test/ui/const-generics/issues/issue-86530.rs
+++ b/tests/ui/const-generics/issues/issue-86530.rs
diff --git a/src/test/ui/const-generics/issues/issue-86530.stderr b/tests/ui/const-generics/issues/issue-86530.stderr
index c63857b23..c63857b23 100644
--- a/src/test/ui/const-generics/issues/issue-86530.stderr
+++ b/tests/ui/const-generics/issues/issue-86530.stderr
diff --git a/src/test/ui/const-generics/issues/issue-86535-2.rs b/tests/ui/const-generics/issues/issue-86535-2.rs
index 0b535fd66..0b535fd66 100644
--- a/src/test/ui/const-generics/issues/issue-86535-2.rs
+++ b/tests/ui/const-generics/issues/issue-86535-2.rs
diff --git a/src/test/ui/const-generics/issues/issue-86535.rs b/tests/ui/const-generics/issues/issue-86535.rs
index 5289c4e99..5289c4e99 100644
--- a/src/test/ui/const-generics/issues/issue-86535.rs
+++ b/tests/ui/const-generics/issues/issue-86535.rs
diff --git a/src/test/ui/const-generics/issues/issue-86820.rs b/tests/ui/const-generics/issues/issue-86820.rs
index ae4bd943f..ae4bd943f 100644
--- a/src/test/ui/const-generics/issues/issue-86820.rs
+++ b/tests/ui/const-generics/issues/issue-86820.rs
diff --git a/src/test/ui/const-generics/issues/issue-86820.stderr b/tests/ui/const-generics/issues/issue-86820.stderr
index 3a9cd957f..3a9cd957f 100644
--- a/src/test/ui/const-generics/issues/issue-86820.stderr
+++ b/tests/ui/const-generics/issues/issue-86820.stderr
diff --git a/src/test/ui/const-generics/issues/issue-87076.rs b/tests/ui/const-generics/issues/issue-87076.rs
index 8a567678b..8a567678b 100644
--- a/src/test/ui/const-generics/issues/issue-87076.rs
+++ b/tests/ui/const-generics/issues/issue-87076.rs
diff --git a/src/test/ui/const-generics/issues/issue-87470.rs b/tests/ui/const-generics/issues/issue-87470.rs
index d60181a41..d60181a41 100644
--- a/src/test/ui/const-generics/issues/issue-87470.rs
+++ b/tests/ui/const-generics/issues/issue-87470.rs
diff --git a/src/test/ui/const-generics/issues/issue-87493.rs b/tests/ui/const-generics/issues/issue-87493.rs
index d8599ab22..d8599ab22 100644
--- a/src/test/ui/const-generics/issues/issue-87493.rs
+++ b/tests/ui/const-generics/issues/issue-87493.rs
diff --git a/src/test/ui/const-generics/issues/issue-87493.stderr b/tests/ui/const-generics/issues/issue-87493.stderr
index 653afae21..653afae21 100644
--- a/src/test/ui/const-generics/issues/issue-87493.stderr
+++ b/tests/ui/const-generics/issues/issue-87493.stderr
diff --git a/src/test/ui/const-generics/issues/issue-87964.rs b/tests/ui/const-generics/issues/issue-87964.rs
index 116686abb..116686abb 100644
--- a/src/test/ui/const-generics/issues/issue-87964.rs
+++ b/tests/ui/const-generics/issues/issue-87964.rs
diff --git a/src/test/ui/const-generics/issues/issue-88119.rs b/tests/ui/const-generics/issues/issue-88119.rs
index 647b0eea8..647b0eea8 100644
--- a/src/test/ui/const-generics/issues/issue-88119.rs
+++ b/tests/ui/const-generics/issues/issue-88119.rs
diff --git a/src/test/ui/const-generics/issues/issue-88468.rs b/tests/ui/const-generics/issues/issue-88468.rs
index 914047236..914047236 100644
--- a/src/test/ui/const-generics/issues/issue-88468.rs
+++ b/tests/ui/const-generics/issues/issue-88468.rs
diff --git a/src/test/ui/const-generics/issues/issue-88997.rs b/tests/ui/const-generics/issues/issue-88997.rs
index 7666a5141..7666a5141 100644
--- a/src/test/ui/const-generics/issues/issue-88997.rs
+++ b/tests/ui/const-generics/issues/issue-88997.rs
diff --git a/src/test/ui/const-generics/issues/issue-88997.stderr b/tests/ui/const-generics/issues/issue-88997.stderr
index 505ba0da2..505ba0da2 100644
--- a/src/test/ui/const-generics/issues/issue-88997.stderr
+++ b/tests/ui/const-generics/issues/issue-88997.stderr
diff --git a/src/test/ui/const-generics/issues/issue-89146.rs b/tests/ui/const-generics/issues/issue-89146.rs
index e3540f46f..e3540f46f 100644
--- a/src/test/ui/const-generics/issues/issue-89146.rs
+++ b/tests/ui/const-generics/issues/issue-89146.rs
diff --git a/src/test/ui/const-generics/issues/issue-89304.rs b/tests/ui/const-generics/issues/issue-89304.rs
index d544d637c..d544d637c 100644
--- a/src/test/ui/const-generics/issues/issue-89304.rs
+++ b/tests/ui/const-generics/issues/issue-89304.rs
diff --git a/src/test/ui/const-generics/issues/issue-89320.rs b/tests/ui/const-generics/issues/issue-89320.rs
index afa5c8fab..afa5c8fab 100644
--- a/src/test/ui/const-generics/issues/issue-89320.rs
+++ b/tests/ui/const-generics/issues/issue-89320.rs
diff --git a/src/test/ui/const-generics/issues/issue-89334.rs b/tests/ui/const-generics/issues/issue-89334.rs
index b15b7428c..b15b7428c 100644
--- a/src/test/ui/const-generics/issues/issue-89334.rs
+++ b/tests/ui/const-generics/issues/issue-89334.rs
diff --git a/src/test/ui/const-generics/issues/issue-90318.rs b/tests/ui/const-generics/issues/issue-90318.rs
index d6c48e63b..909997340 100644
--- a/src/test/ui/const-generics/issues/issue-90318.rs
+++ b/tests/ui/const-generics/issues/issue-90318.rs
@@ -12,14 +12,14 @@ impl True for If<true> {}
 fn consume<T: 'static>(_val: T)
 where
     If<{ TypeId::of::<T>() != TypeId::of::<()>() }>: True,
-    //~^ ERROR: can't compare
+    //~^ overly complex generic constant
 {
 }
 
 fn test<T: 'static>()
 where
     If<{ TypeId::of::<T>() != TypeId::of::<()>() }>: True,
-    //~^ ERROR: can't compare
+    //~^ overly complex generic constant
 {
 }
 
diff --git a/tests/ui/const-generics/issues/issue-90318.stderr b/tests/ui/const-generics/issues/issue-90318.stderr
new file mode 100644
index 000000000..f13fd795d
--- /dev/null
+++ b/tests/ui/const-generics/issues/issue-90318.stderr
@@ -0,0 +1,24 @@
+error: overly complex generic constant
+  --> $DIR/issue-90318.rs:14:8
+   |
+LL |     If<{ TypeId::of::<T>() != TypeId::of::<()>() }>: True,
+   |        ^^-----------------^^^^^^^^^^^^^^^^^^^^^^^^
+   |          |
+   |          borrowing is not supported in generic constants
+   |
+   = help: consider moving this anonymous constant into a `const` function
+   = note: this operation may be supported in the future
+
+error: overly complex generic constant
+  --> $DIR/issue-90318.rs:21:8
+   |
+LL |     If<{ TypeId::of::<T>() != TypeId::of::<()>() }>: True,
+   |        ^^-----------------^^^^^^^^^^^^^^^^^^^^^^^^
+   |          |
+   |          borrowing is not supported in generic constants
+   |
+   = help: consider moving this anonymous constant into a `const` function
+   = note: this operation may be supported in the future
+
+error: aborting due to 2 previous errors
+
diff --git a/src/test/ui/const-generics/issues/issue-90364.rs b/tests/ui/const-generics/issues/issue-90364.rs
index b11b07b50..b11b07b50 100644
--- a/src/test/ui/const-generics/issues/issue-90364.rs
+++ b/tests/ui/const-generics/issues/issue-90364.rs
diff --git a/src/test/ui/const-generics/issues/issue-90364.stderr b/tests/ui/const-generics/issues/issue-90364.stderr
index e85bd136e..e85bd136e 100644
--- a/src/test/ui/const-generics/issues/issue-90364.stderr
+++ b/tests/ui/const-generics/issues/issue-90364.stderr
diff --git a/src/test/ui/const-generics/issues/issue-90455.rs b/tests/ui/const-generics/issues/issue-90455.rs
index a580410cf..a580410cf 100644
--- a/src/test/ui/const-generics/issues/issue-90455.rs
+++ b/tests/ui/const-generics/issues/issue-90455.rs
diff --git a/src/test/ui/const-generics/issues/issue-90455.stderr b/tests/ui/const-generics/issues/issue-90455.stderr
index 724d7f42e..724d7f42e 100644
--- a/src/test/ui/const-generics/issues/issue-90455.stderr
+++ b/tests/ui/const-generics/issues/issue-90455.stderr
diff --git a/src/test/ui/const-generics/issues/issue-92186.rs b/tests/ui/const-generics/issues/issue-92186.rs
index 9ced4667d..9ced4667d 100644
--- a/src/test/ui/const-generics/issues/issue-92186.rs
+++ b/tests/ui/const-generics/issues/issue-92186.rs
diff --git a/src/test/ui/const-generics/issues/issue-96654.rs b/tests/ui/const-generics/issues/issue-96654.rs
index 8cf786dbe..8cf786dbe 100644
--- a/src/test/ui/const-generics/issues/issue-96654.rs
+++ b/tests/ui/const-generics/issues/issue-96654.rs
diff --git a/src/test/ui/const-generics/issues/issue-97278.rs b/tests/ui/const-generics/issues/issue-97278.rs
index da0a9776f..da0a9776f 100644
--- a/src/test/ui/const-generics/issues/issue-97278.rs
+++ b/tests/ui/const-generics/issues/issue-97278.rs
diff --git a/src/test/ui/const-generics/issues/issue-97278.stderr b/tests/ui/const-generics/issues/issue-97278.stderr
index ff13cb505..ff13cb505 100644
--- a/src/test/ui/const-generics/issues/issue-97278.stderr
+++ b/tests/ui/const-generics/issues/issue-97278.stderr
diff --git a/src/test/ui/const-generics/issues/issue-97634.rs b/tests/ui/const-generics/issues/issue-97634.rs
index 422e8de68..422e8de68 100644
--- a/src/test/ui/const-generics/issues/issue-97634.rs
+++ b/tests/ui/const-generics/issues/issue-97634.rs
diff --git a/src/test/ui/const-generics/issues/issue-98629.rs b/tests/ui/const-generics/issues/issue-98629.rs
index 1d2d3012a..1d2d3012a 100644
--- a/src/test/ui/const-generics/issues/issue-98629.rs
+++ b/tests/ui/const-generics/issues/issue-98629.rs
diff --git a/src/test/ui/const-generics/issues/issue-98629.stderr b/tests/ui/const-generics/issues/issue-98629.stderr
index 4a248be76..4a248be76 100644
--- a/src/test/ui/const-generics/issues/issue-98629.stderr
+++ b/tests/ui/const-generics/issues/issue-98629.stderr
diff --git a/src/test/ui/const-generics/issues/issue-99641.rs b/tests/ui/const-generics/issues/issue-99641.rs
index fae6d3fc4..fae6d3fc4 100644
--- a/src/test/ui/const-generics/issues/issue-99641.rs
+++ b/tests/ui/const-generics/issues/issue-99641.rs
diff --git a/src/test/ui/const-generics/issues/issue-99641.stderr b/tests/ui/const-generics/issues/issue-99641.stderr
index 349ebba08..349ebba08 100644
--- a/src/test/ui/const-generics/issues/issue-99641.stderr
+++ b/tests/ui/const-generics/issues/issue-99641.stderr