From 218caa410aa38c29984be31a5229b9fa717560ee Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Wed, 17 Apr 2024 14:19:13 +0200
Subject: Merging upstream version 1.68.2+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 src/test/ui/consts/issue-54954.rs | 19 -------------------
 1 file changed, 19 deletions(-)
 delete mode 100644 src/test/ui/consts/issue-54954.rs

(limited to 'src/test/ui/consts/issue-54954.rs')

diff --git a/src/test/ui/consts/issue-54954.rs b/src/test/ui/consts/issue-54954.rs
deleted file mode 100644
index 520bf508f..000000000
--- a/src/test/ui/consts/issue-54954.rs
+++ /dev/null
@@ -1,19 +0,0 @@
-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]);
-}
-- 
cgit v1.2.3