Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 62 deletions

diff --git a/src/test/ui/fn/expr-fn.rs b/src/test/ui/fn/expr-fn.rs
deleted file mode 100644
index 253cbfd5d..000000000
--- a/src/test/ui/fn/expr-fn.rs
+++ /dev/null
@@ -1,62 +0,0 @@
-// run-pass
-#![allow(unused_braces)]
-
-fn test_int() {
-    fn f() -> isize { 10 }
-    assert_eq!(f(), 10);
-}
-
-fn test_vec() {
-    fn f() -> Vec<isize> { vec![10, 11] }
-    let vect = f();
-    assert_eq!(vect[1], 11);
-}
-
-fn test_generic() {
-    fn f<T>(t: T) -> T { t }
-    assert_eq!(f(10), 10);
-}
-
-fn test_alt() {
-    fn f() -> isize { match true { false => { 10 } true => { 20 } } }
-    assert_eq!(f(), 20);
-}
-
-fn test_if() {
-    fn f() -> isize { if true { 10 } else { 20 } }
-    assert_eq!(f(), 10);
-}
-
-fn test_block() {
-    fn f() -> isize { { 10 } }
-    assert_eq!(f(), 10);
-}
-
-fn test_ret() {
-    fn f() -> isize {
-        return 10 // no semi
-
-    }
-    assert_eq!(f(), 10);
-}
-
-
-// From issue #372
-fn test_372() {
-    fn f() -> isize { let x = { 3 }; x }
-    assert_eq!(f(), 3);
-}
-
-fn test_nil() { () }
-
-pub fn main() {
-    test_int();
-    test_vec();
-    test_generic();
-    test_alt();
-    test_if();
-    test_block();
-    test_ret();
-    test_372();
-    test_nil();
-}