Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 42 deletions

diff --git a/src/test/ui/consts/const-fn.rs b/src/test/ui/consts/const-fn.rs
deleted file mode 100644
index 59680e6e4..000000000
--- a/src/test/ui/consts/const-fn.rs
+++ /dev/null
@@ -1,42 +0,0 @@
-// run-pass
-#![allow(stable_features)]
-
-// A very basic test of const fn functionality.
-
-#![feature(const_indexing)]
-
-const fn add(x: u32, y: u32) -> u32 {
-    x + y
-}
-
-const fn sub(x: u32, y: u32) -> u32 {
-    x - y
-}
-
-const unsafe fn div(x: u32, y: u32) -> u32 {
-    x / y
-}
-
-const fn generic<T>(t: T) -> T {
-    t
-}
-
-const fn generic_arr<T: Copy>(t: [T; 1]) -> T {
-    t[0]
-}
-
-const SUM: u32 = add(44, 22);
-const DIFF: u32 = sub(44, 22);
-const DIV: u32 = unsafe{div(44, 22)};
-
-fn main() {
-    assert_eq!(SUM, 66);
-    assert!(SUM != 88);
-
-    assert_eq!(DIFF, 22);
-    assert_eq!(DIV, 2);
-
-    let _: [&'static str; sub(100, 99) as usize] = ["hi"];
-    let _: [&'static str; generic(1)] = ["hi"];
-    let _: [&'static str; generic_arr([1])] = ["hi"];
-}