Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 21 deletions

diff --git a/src/test/ui/const-generics/const-generic-function.rs b/src/test/ui/const-generics/const-generic-function.rs
deleted file mode 100644
index c8d2683e5..000000000
--- a/src/test/ui/const-generics/const-generic-function.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-fn foo<const N: i32>() -> i32 {
-    N
-}
-
-const fn bar(n: i32, m: i32) -> i32 {
-    n
-}
-
-const fn baz() -> i32 {
-    1
-}
-
-const FOO: i32 = 3;
-
-fn main() {
-    foo::<baz()>(); //~ ERROR expected type, found function `baz`
-    //~| ERROR unresolved item provided when a constant was expected
-    foo::<bar(bar(1, 1), bar(1, 1))>(); //~ ERROR expected type, found `1`
-    foo::<bar(1, 1)>(); //~ ERROR expected type, found `1`
-    foo::<bar(FOO, 2)>(); //~ ERROR expected type, found `2`
-}