Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 19 insertions, 0 deletions

diff --git a/tests/ui/consts/issue-54954.rs b/tests/ui/consts/issue-54954.rs
new file mode 100644
index 000000000..520bf508f
--- /dev/null
+++ b/tests/ui/consts/issue-54954.rs
@@ -0,0 +1,19 @@
+const ARR_LEN: usize = Tt::const_val::<[i8; 123]>();
+//~^ ERROR E0790
+
+trait Tt {
+    const fn const_val<T: Sized>() -> usize {
+        //~^ ERROR functions in traits cannot be declared const
+        core::mem::size_of::<T>()
+    }
+}
+
+fn f(z: [f32; ARR_LEN]) -> [f32; ARR_LEN] {
+  //~^ constant
+  //~| constant
+    z
+}
+
+fn main() {
+    let _ = f([1f32; ARR_LEN]);
+}