tests: Move run-pass tests without naming conflicts to ui

44 files changed, 0 insertions, 959 deletions

diff --git a/src/test/run-pass/for-loop-while/auto-loop.rs b/src/test/run-pass/for-loop-while/auto-loop.rs
deleted file mode 100644
index f02ac43c734..00000000000
--- a/src/test/run-pass/for-loop-while/auto-loop.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-// run-pass
-
-pub fn main() {
-    let mut sum = 0;
-    let xs = vec![1, 2, 3, 4, 5];
-    for x in &xs {
-        sum += *x;
-    }
-    assert_eq!(sum, 15);
-}
diff --git a/src/test/run-pass/for-loop-while/break-value.rs b/src/test/run-pass/for-loop-while/break-value.rs
deleted file mode 100644
index 9fc49fa8181..00000000000
--- a/src/test/run-pass/for-loop-while/break-value.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-// run-pass
-#![allow(unreachable_code)]
-// pretty-expanded FIXME #23616
-
-fn int_id(x: isize) -> isize { return x; }
-
-pub fn main() { loop { int_id(break); } }
diff --git a/src/test/run-pass/for-loop-while/break.rs b/src/test/run-pass/for-loop-while/break.rs
deleted file mode 100644
index 427b1b7a063..00000000000
--- a/src/test/run-pass/for-loop-while/break.rs
+++ /dev/null
@@ -1,25 +0,0 @@
-// run-pass
-
-pub fn main() {
-    let mut i = 0;
-    while i < 20 { i += 1; if i == 10 { break; } }
-    assert_eq!(i, 10);
-    loop { i += 1; if i == 20 { break; } }
-    assert_eq!(i, 20);
-    let xs = [1, 2, 3, 4, 5, 6];
-    for x in &xs {
-        if *x == 3 { break; } assert!((*x <= 3));
-    }
-    i = 0;
-    while i < 10 { i += 1; if i % 2 == 0 { continue; } assert!((i % 2 != 0)); }
-    i = 0;
-    loop {
-        i += 1; if i % 2 == 0 { continue; } assert!((i % 2 != 0));
-        if i >= 10 { break; }
-    }
-    let ys = vec![1, 2, 3, 4, 5, 6];
-    for x in &ys {
-        if *x % 2 == 0 { continue; }
-        assert!((*x % 2 != 0));
-    }
-}
diff --git a/src/test/run-pass/for-loop-while/for-destruct.rs b/src/test/run-pass/for-loop-while/for-destruct.rs
deleted file mode 100644
index 7ca8d4ded25..00000000000
--- a/src/test/run-pass/for-loop-while/for-destruct.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-// run-pass
-
-struct Pair { x: isize, y: isize }
-
-pub fn main() {
-    for elt in &(vec![Pair {x: 10, y: 20}, Pair {x: 30, y: 0}]) {
-        assert_eq!(elt.x + elt.y, 30);
-    }
-}
diff --git a/src/test/run-pass/for-loop-while/for-loop-goofiness.rs b/src/test/run-pass/for-loop-while/for-loop-goofiness.rs
deleted file mode 100644
index 872ab168bb2..00000000000
--- a/src/test/run-pass/for-loop-while/for-loop-goofiness.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-// run-pass
-#![allow(dead_code)]
-
-enum BogusOption<T> {
-    None,
-    Some(T),
-}
-
-type Iterator = isize;
-
-pub fn main() {
-    let x = [ 3, 3, 3 ];
-    for i in &x {
-        assert_eq!(*i, 3);
-    }
-}
diff --git a/src/test/run-pass/for-loop-while/for-loop-has-unit-body.rs b/src/test/run-pass/for-loop-while/for-loop-has-unit-body.rs
deleted file mode 100644
index 38c34d2dc2e..00000000000
--- a/src/test/run-pass/for-loop-while/for-loop-has-unit-body.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-// run-pass
-fn main() {
-    // Check that the tail statement in the body unifies with something
-    for _ in 0..3 {
-        #[allow(deprecated)]
-        unsafe { std::mem::uninitialized() }
-    }
-
-    // Check that the tail statement in the body can be unit
-    for _ in 0..3 {
-        ()
-    }
-}
diff --git a/src/test/run-pass/for-loop-while/for-loop-into-iterator.rs b/src/test/run-pass/for-loop-while/for-loop-into-iterator.rs
deleted file mode 100644
index 199d4ddb299..00000000000
--- a/src/test/run-pass/for-loop-while/for-loop-into-iterator.rs
+++ /dev/null
@@ -1,19 +0,0 @@
-// run-pass
-// Test that for loops can do what RFC #235 claims
-
-
-fn main() {
-    let mut v = vec![1];
-
-    for x in &v {
-        assert_eq!(x, &1);
-    }
-
-    for x in &mut v {
-        assert_eq!(x, &mut 1);
-    }
-
-    for x in v {
-        assert_eq!(x, 1);
-    }
-}
diff --git a/src/test/run-pass/for-loop-while/for-loop-lifetime-of-unbound-values.rs b/src/test/run-pass/for-loop-while/for-loop-lifetime-of-unbound-values.rs
deleted file mode 100644
index 6a38764a131..00000000000
--- a/src/test/run-pass/for-loop-while/for-loop-lifetime-of-unbound-values.rs
+++ /dev/null
@@ -1,34 +0,0 @@
-// run-pass
-// Test when destructors run in a for loop. The intention is
-// that the value for each iteration is dropped *after* the loop
-// body has executed. This is true even when the value is assigned
-// to a `_` pattern (and hence ignored).
-
-use std::cell::Cell;
-
-struct Flag<'a>(&'a Cell<bool>);
-
-impl<'a> Drop for Flag<'a> {
-    fn drop(&mut self) {
-        self.0.set(false)
-    }
-}
-
-fn main() {
-    let alive2 = Cell::new(true);
-    for _i in std::iter::once(Flag(&alive2)) {
-        // The Flag value should be alive in the for loop body
-        assert_eq!(alive2.get(), true);
-    }
-    // The Flag value should be dead outside of the loop
-    assert_eq!(alive2.get(), false);
-
-    let alive = Cell::new(true);
-    for _ in std::iter::once(Flag(&alive)) {
-        // The Flag value should be alive in the for loop body even if it wasn't
-        // bound by the for loop
-        assert_eq!(alive.get(), true);
-    }
-    // The Flag value should be dead outside of the loop
-    assert_eq!(alive.get(), false);
-}
diff --git a/src/test/run-pass/for-loop-while/for-loop-macro.rs b/src/test/run-pass/for-loop-while/for-loop-macro.rs
deleted file mode 100644
index 5abccd2a141..00000000000
--- a/src/test/run-pass/for-loop-while/for-loop-macro.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-// run-pass
-macro_rules! var {
-    ( $name:ident ) => ( $name );
-}
-
-pub fn main() {
-    let x = [ 3, 3, 3 ];
-    for var!(i) in &x {
-        assert_eq!(*i, 3);
-    }
-}
diff --git a/src/test/run-pass/for-loop-while/for-loop-mut-ref-element.rs b/src/test/run-pass/for-loop-while/for-loop-mut-ref-element.rs
deleted file mode 100644
index a3d82ace9e2..00000000000
--- a/src/test/run-pass/for-loop-while/for-loop-mut-ref-element.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-// run-pass
-// Tests that for loops can bind elements as mutable references
-
-fn main() {
-    for ref mut _a in std::iter::once(true) {}
-}
diff --git a/src/test/run-pass/for-loop-while/for-loop-no-std.rs b/src/test/run-pass/for-loop-while/for-loop-no-std.rs
deleted file mode 100644
index 65a33c5f16f..00000000000
--- a/src/test/run-pass/for-loop-while/for-loop-no-std.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-// run-pass
-#![allow(unused_imports)]
-#![feature(lang_items, start)]
-#![no_std]
-
-extern crate std as other;
-
-#[macro_use] extern crate alloc;
-
-#[start]
-fn start(_argc: isize, _argv: *const *const u8) -> isize {
-    for _ in [1,2,3].iter() { }
-    0
-}
diff --git a/src/test/run-pass/for-loop-while/for-loop-panic.rs b/src/test/run-pass/for-loop-while/for-loop-panic.rs
deleted file mode 100644
index ac607d6d731..00000000000
--- a/src/test/run-pass/for-loop-while/for-loop-panic.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-// run-pass
-
-
-pub fn main() { let x: Vec<isize> = Vec::new(); for _ in &x { panic!("moop"); } }
diff --git a/src/test/run-pass/for-loop-while/for-loop-unconstrained-element-type-i32-fallback.rs b/src/test/run-pass/for-loop-while/for-loop-unconstrained-element-type-i32-fallback.rs
deleted file mode 100644
index a1e9b1ed87d..00000000000
--- a/src/test/run-pass/for-loop-while/for-loop-unconstrained-element-type-i32-fallback.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-// run-pass
-// Test that the type of `sum` falls back to `i32` here,
-// and that the for loop desugaring doesn't interfere with
-// that.
-
-fn main() {
-    let mut sum = 0;
-    for i in Vec::new() {
-        sum += &i;
-    }
-}
diff --git a/src/test/run-pass/for-loop-while/foreach-external-iterators-break.rs b/src/test/run-pass/for-loop-while/foreach-external-iterators-break.rs
deleted file mode 100644
index 7de6a4f8acb..00000000000
--- a/src/test/run-pass/for-loop-while/foreach-external-iterators-break.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-// run-pass
-
-pub fn main() {
-    let x = [1; 100];
-    let mut y = 0;
-    for i in &x[..] {
-        if y > 10 {
-            break;
-        }
-        y += *i;
-    }
-    assert_eq!(y, 11);
-}
diff --git a/src/test/run-pass/for-loop-while/foreach-external-iterators-hashmap-break-restart.rs b/src/test/run-pass/for-loop-while/foreach-external-iterators-hashmap-break-restart.rs
deleted file mode 100644
index 5d690807e05..00000000000
--- a/src/test/run-pass/for-loop-while/foreach-external-iterators-hashmap-break-restart.rs
+++ /dev/null
@@ -1,33 +0,0 @@
-// run-pass
-
-use std::collections::HashMap;
-
-// This is a fancy one: it uses an external iterator established
-// outside the loop, breaks, then _picks back up_ and continues
-// iterating with it.
-
-pub fn main() {
-    let mut h = HashMap::new();
-    let kvs = [(1, 10), (2, 20), (3, 30)];
-    for &(k,v) in &kvs {
-        h.insert(k,v);
-    }
-    let mut x = 0;
-    let mut y = 0;
-
-    let mut i = h.iter();
-
-    for (&k,&v) in i.by_ref() {
-        x += k;
-        y += v;
-        break;
-    }
-
-    for (&k,&v) in i {
-        x += k;
-        y += v;
-    }
-
-    assert_eq!(x, 6);
-    assert_eq!(y, 60);
-}
diff --git a/src/test/run-pass/for-loop-while/foreach-external-iterators-hashmap.rs b/src/test/run-pass/for-loop-while/foreach-external-iterators-hashmap.rs
deleted file mode 100644
index 9f2ca05cdb6..00000000000
--- a/src/test/run-pass/for-loop-while/foreach-external-iterators-hashmap.rs
+++ /dev/null
@@ -1,19 +0,0 @@
-// run-pass
-
-use std::collections::HashMap;
-
-pub fn main() {
-    let mut h = HashMap::new();
-    let kvs = [(1, 10), (2, 20), (3, 30)];
-    for &(k,v) in &kvs {
-        h.insert(k,v);
-    }
-    let mut x = 0;
-    let mut y = 0;
-    for (&k,&v) in &h {
-        x += k;
-        y += v;
-    }
-    assert_eq!(x, 6);
-    assert_eq!(y, 60);
-}
diff --git a/src/test/run-pass/for-loop-while/foreach-external-iterators-loop.rs b/src/test/run-pass/for-loop-while/foreach-external-iterators-loop.rs
deleted file mode 100644
index 78af195bc20..00000000000
--- a/src/test/run-pass/for-loop-while/foreach-external-iterators-loop.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-// run-pass
-
-pub fn main() {
-    let x = [1; 100];
-    let mut y = 0;
-    for (n,i) in x.iter().enumerate() {
-        if n < 10 {
-            continue;
-        }
-        y += *i;
-    }
-    assert_eq!(y, 90);
-}
diff --git a/src/test/run-pass/for-loop-while/foreach-external-iterators-nested.rs b/src/test/run-pass/for-loop-while/foreach-external-iterators-nested.rs
deleted file mode 100644
index 8a95f160a1a..00000000000
--- a/src/test/run-pass/for-loop-while/foreach-external-iterators-nested.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-// run-pass
-
-pub fn main() {
-    let x = [1; 100];
-    let y = [2; 100];
-    let mut p = 0;
-    let mut q = 0;
-    for i in &x[..] {
-        for j in &y[..] {
-            p += *j;
-        }
-        q += *i + p;
-    }
-    assert_eq!(q, 1010100);
-}
diff --git a/src/test/run-pass/for-loop-while/foreach-external-iterators.rs b/src/test/run-pass/for-loop-while/foreach-external-iterators.rs
deleted file mode 100644
index 24ecfe9b60d..00000000000
--- a/src/test/run-pass/for-loop-while/foreach-external-iterators.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-// run-pass
-
-pub fn main() {
-    let x = [1; 100];
-    let mut y = 0;
-    for i in &x[..] {
-        y += *i
-    }
-    assert_eq!(y, 100);
-}
diff --git a/src/test/run-pass/for-loop-while/foreach-nested.rs b/src/test/run-pass/for-loop-while/foreach-nested.rs
deleted file mode 100644
index bb6edbc0797..00000000000
--- a/src/test/run-pass/for-loop-while/foreach-nested.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-// run-pass
-
-
-fn two<F>(mut it: F) where F: FnMut(isize) { it(0); it(1); }
-
-pub fn main() {
-    let mut a: Vec<isize> = vec![-1, -1, -1, -1];
-    let mut p: isize = 0;
-    two(|i| {
-        two(|j| { a[p as usize] = 10 * i + j; p += 1; })
-    });
-    assert_eq!(a[0], 0);
-    assert_eq!(a[1], 1);
-    assert_eq!(a[2], 10);
-    assert_eq!(a[3], 11);
-}
diff --git a/src/test/run-pass/for-loop-while/foreach-put-structured.rs b/src/test/run-pass/for-loop-while/foreach-put-structured.rs
deleted file mode 100644
index 3a47fcf3415..00000000000
--- a/src/test/run-pass/for-loop-while/foreach-put-structured.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-// run-pass
-
-
-fn pairs<F>(mut it: F) where F: FnMut((isize, isize)) {
-    let mut i: isize = 0;
-    let mut j: isize = 0;
-    while i < 10 { it((i, j)); i += 1; j += i; }
-}
-
-pub fn main() {
-    let mut i: isize = 10;
-    let mut j: isize = 0;
-    pairs(|p| {
-        let (_0, _1) = p;
-        println!("{}", _0);
-        println!("{}", _1);
-        assert_eq!(_0 + 10, i);
-        i += 1;
-        j = _1;
-    });
-    assert_eq!(j, 45);
-}
diff --git a/src/test/run-pass/for-loop-while/foreach-simple-outer-slot.rs b/src/test/run-pass/for-loop-while/foreach-simple-outer-slot.rs
deleted file mode 100644
index a8d42a789ba..00000000000
--- a/src/test/run-pass/for-loop-while/foreach-simple-outer-slot.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-// run-pass
-
-
-
-pub fn main() {
-    let mut sum: isize = 0;
-    first_ten(|i| { println!("main"); println!("{}", i); sum = sum + i; });
-    println!("sum");
-    println!("{}", sum);
-    assert_eq!(sum, 45);
-}
-
-fn first_ten<F>(mut it: F) where F: FnMut(isize) {
-    let mut i: isize = 0;
-    while i < 10 { println!("first_ten"); it(i); i = i + 1; }
-}
diff --git a/src/test/run-pass/for-loop-while/label_break_value.rs b/src/test/run-pass/for-loop-while/label_break_value.rs
deleted file mode 100644
index eb5be7742e0..00000000000
--- a/src/test/run-pass/for-loop-while/label_break_value.rs
+++ /dev/null
@@ -1,116 +0,0 @@
-// run-pass
-#![allow(dead_code)]
-#![allow(unused_assignments)]
-#![feature(label_break_value)]
-
-// Test control flow to follow label_break_value semantics
-fn label_break(a: bool, b: bool) -> u32 {
-    let mut v = 0;
-    'b: {
-        v = 1;
-        if a {
-            break 'b;
-        }
-        v = 2;
-        if b {
-            break 'b;
-        }
-        v = 3;
-    }
-    return v;
-}
-
-// Test that values can be returned
-fn break_value(a: bool, b: bool) -> u32 {
-    let result = 'block: {
-        if a { break 'block 1; }
-        if b { break 'block 2; }
-        3
-    };
-    result
-}
-
-// Test nesting of labeled blocks
-// here we only check that it compiles
-fn label_break_nested() {
-    'b: {
-        println!("hi");
-        if false {
-            break 'b;
-        }
-        'c: {
-            if false {
-                break 'b;
-            }
-            break 'c;
-        }
-        println!("hello");
-        if true {
-            break 'b;
-        }
-    }
-}
-
-// Tests for mixing labeled blocks with loop constructs
-// This function should be the identity function
-fn label_break_mixed(v: u32) -> u32 {
-    let mut r = 0;
-    'b: {
-        // Unlabeled break still works
-        // (only crossing boundaries is an error)
-        loop {
-            break;
-        }
-        if v == 0 {
-            break 'b;
-        }
-        // Labeled breaking an inner loop still works
-        'c: loop {
-            if r == 1 {
-                break 'c;
-            }
-            r += 1;
-        }
-        assert_eq!(r, 1);
-        if v == 1 {
-            break 'b;
-        }
-        // Labeled breaking an outer loop still works
-        'd: loop {
-            'e: {
-                if v == r {
-                    break 'b;
-                }
-                if r == 5 {
-                    break 'd;
-                }
-                r += 1;
-            }
-        }
-        assert_eq!(r, 5);
-        assert!(v > r);
-        // Here we test return from inside a labeled block
-        return v;
-    }
-    r
-}
-
-pub fn main() {
-    assert_eq!(label_break(true, false), 1);
-    assert_eq!(label_break(false, true), 2);
-    assert_eq!(label_break(false, false), 3);
-
-    assert_eq!(break_value(true, false), 1);
-    assert_eq!(break_value(false, true), 2);
-    assert_eq!(break_value(false, false), 3);
-
-    assert_eq!(label_break_mixed(0), 0);
-    assert_eq!(label_break_mixed(1), 1);
-    assert_eq!(label_break_mixed(2), 2);
-    assert_eq!(label_break_mixed(3), 3);
-    assert_eq!(label_break_mixed(4), 4);
-    assert_eq!(label_break_mixed(5), 5);
-    assert_eq!(label_break_mixed(6), 6);
-
-    // FIXME: ensure that labeled blocks work if produced by macros and in match arms
-}
diff --git a/src/test/run-pass/for-loop-while/labeled-break.rs b/src/test/run-pass/for-loop-while/labeled-break.rs
deleted file mode 100644
index 4dacc57574f..00000000000
--- a/src/test/run-pass/for-loop-while/labeled-break.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-// run-pass
-// pretty-expanded FIXME #23616
-
-pub fn main() {
-    'foo: loop {
-        loop {
-            break 'foo;
-        }
-    }
-
-    'bar: for _ in 0..100 {
-        loop {
-            break 'bar;
-        }
-    }
-
-    'foobar: while 1 + 1 == 2 {
-        loop {
-            break 'foobar;
-        }
-    }
-}
diff --git a/src/test/run-pass/for-loop-while/linear-for-loop.rs b/src/test/run-pass/for-loop-while/linear-for-loop.rs
deleted file mode 100644
index 3c573db1d77..00000000000
--- a/src/test/run-pass/for-loop-while/linear-for-loop.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-// run-pass
-pub fn main() {
-    let x = vec![1, 2, 3];
-    let mut y = 0;
-    for i in &x { println!("{}", *i); y += *i; }
-    println!("{}", y);
-    assert_eq!(y, 6);
-    let s = "hello there".to_string();
-    let mut i: isize = 0;
-    for c in s.bytes() {
-        if i == 0 { assert_eq!(c, 'h' as u8); }
-        if i == 1 { assert_eq!(c, 'e' as u8); }
-        if i == 2 { assert_eq!(c, 'l' as u8); }
-        if i == 3 { assert_eq!(c, 'l' as u8); }
-        if i == 4 { assert_eq!(c, 'o' as u8); }
-        // ...
-
-        i += 1;
-        println!("{}", i);
-        println!("{}", c);
-    }
-    assert_eq!(i, 11);
-}
diff --git a/src/test/run-pass/for-loop-while/liveness-assign-imm-local-after-loop.rs b/src/test/run-pass/for-loop-while/liveness-assign-imm-local-after-loop.rs
deleted file mode 100644
index 11b6971656f..00000000000
--- a/src/test/run-pass/for-loop-while/liveness-assign-imm-local-after-loop.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-// run-pass
-#![allow(dead_code)]
-#![allow(unused_assignments)]
-// pretty-expanded FIXME #23616
-
-#![allow(unreachable_code)]
-#![allow(unused_variables)]
-
-fn test(_cond: bool) {
-    let v: isize;
-    v = 1;
-    loop { } // loop never terminates, so no error is reported
-    v = 2;
-}
-
-pub fn main() {
-    // note: don't call test()... :)
-}
diff --git a/src/test/run-pass/for-loop-while/liveness-loop-break.rs b/src/test/run-pass/for-loop-while/liveness-loop-break.rs
deleted file mode 100644
index 60a63bccb10..00000000000
--- a/src/test/run-pass/for-loop-while/liveness-loop-break.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-// run-pass
-fn test() {
-    let v;
-    loop {
-        v = 3;
-        break;
-    }
-    println!("{}", v);
-}
-
-pub fn main() {
-    test();
-}
diff --git a/src/test/run-pass/for-loop-while/liveness-move-in-loop.rs b/src/test/run-pass/for-loop-while/liveness-move-in-loop.rs
deleted file mode 100644
index ce73d6335cb..00000000000
--- a/src/test/run-pass/for-loop-while/liveness-move-in-loop.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-// run-pass
-#![allow(dead_code)]
-
-// pretty-expanded FIXME #23616
-
-fn take(x: isize) -> isize {x}
-
-fn the_loop() {
-    let mut list = Vec::new();
-    loop {
-        let x = 5;
-        if x > 3 {
-            list.push(take(x));
-        } else {
-            break;
-        }
-    }
-}
-
-pub fn main() {}
diff --git a/src/test/run-pass/for-loop-while/loop-break-cont-1.rs b/src/test/run-pass/for-loop-while/loop-break-cont-1.rs
deleted file mode 100644
index f207746f085..00000000000
--- a/src/test/run-pass/for-loop-while/loop-break-cont-1.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-// run-pass
-
-pub fn main() {
-  let _i = 0_usize;
-  loop {
-    break;
-  }
-  assert!(true);
-}
diff --git a/src/test/run-pass/for-loop-while/loop-break-cont.rs b/src/test/run-pass/for-loop-while/loop-break-cont.rs
deleted file mode 100644
index 92d5a32c62b..00000000000
--- a/src/test/run-pass/for-loop-while/loop-break-cont.rs
+++ /dev/null
@@ -1,39 +0,0 @@
-// run-pass
-pub fn main() {
-  let mut i = 0_usize;
-  loop {
-    println!("a");
-    i += 1_usize;
-    if i == 10_usize {
-      break;
-    }
-  }
-  assert_eq!(i, 10_usize);
-  let mut is_even = false;
-  loop {
-    if i == 21_usize {
-        break;
-    }
-    println!("b");
-    is_even = false;
-    i += 1_usize;
-    if i % 2_usize != 0_usize {
-        continue;
-    }
-    is_even = true;
-  }
-  assert!(!is_even);
-  loop {
-    println!("c");
-    if i == 22_usize {
-        break;
-    }
-    is_even = false;
-    i += 1_usize;
-    if i % 2_usize != 0_usize {
-        continue;
-    }
-    is_even = true;
-  }
-  assert!(is_even);
-}
diff --git a/src/test/run-pass/for-loop-while/loop-break-value.rs b/src/test/run-pass/for-loop-while/loop-break-value.rs
deleted file mode 100644
index e1edbbb929e..00000000000
--- a/src/test/run-pass/for-loop-while/loop-break-value.rs
+++ /dev/null
@@ -1,138 +0,0 @@
-// run-pass
-#![allow(unreachable_code)]
-#![feature(never_type)]
-
-#[allow(unused)]
-fn never_returns() {
-    loop {
-        break loop {};
-    }
-}
-
-pub fn main() {
-    let value = 'outer: loop {
-        if 1 == 1 {
-            break 13;
-        } else {
-            let _never: ! = loop {
-                break loop {
-                    break 'outer panic!();
-                }
-            };
-        }
-    };
-    assert_eq!(value, 13);
-
-    let x = [1, 3u32, 5];
-    let y = [17];
-    let z = [];
-    let coerced: &[_] = loop {
-        match 2 {
-            1 => break &x,
-            2 => break &y,
-            3 => break &z,
-            _ => (),
-        }
-    };
-    assert_eq!(coerced, &[17u32]);
-
-    let trait_unified = loop {
-        break if true {
-            break Default::default()
-        } else {
-            break [13, 14]
-        };
-    };
-    assert_eq!(trait_unified, [0, 0]);
-
-    let trait_unified_2 = loop {
-        if false {
-            break [String::from("Hello")]
-        } else {
-            break Default::default()
-        };
-    };
-    assert_eq!(trait_unified_2, [""]);
-
-    let trait_unified_3 = loop {
-        break if false {
-            break [String::from("Hello")]
-        } else {
-            ["Yes".into()]
-        };
-    };
-    assert_eq!(trait_unified_3, ["Yes"]);
-
-    let regular_break = loop {
-        if true {
-            break;
-        } else {
-            break break Default::default();
-        }
-    };
-    assert_eq!(regular_break, ());
-
-    let regular_break_2 = loop {
-        if true {
-            break Default::default();
-        } else {
-            break;
-        }
-    };
-    assert_eq!(regular_break_2, ());
-
-    let regular_break_3 = loop {
-        break if true {
-            Default::default()
-        } else {
-            break;
-        }
-    };
-    assert_eq!(regular_break_3, ());
-
-    let regular_break_4 = loop {
-        break ();
-        break;
-    };
-    assert_eq!(regular_break_4, ());
-
-    let regular_break_5 = loop {
-        break;
-        break ();
-    };
-    assert_eq!(regular_break_5, ());
-
-    let nested_break_value = 'outer2: loop {
-        let _a: u32 = 'inner: loop {
-            if true {
-                break 'outer2 "hello";
-            } else {
-                break 'inner 17;
-            }
-        };
-        panic!();
-    };
-    assert_eq!(nested_break_value, "hello");
-
-    let break_from_while_cond = loop {
-        'inner_loop: while break 'inner_loop {
-            panic!();
-        }
-        break 123;
-    };
-    assert_eq!(break_from_while_cond, 123);
-
-    let break_from_while_to_outer = 'outer_loop: loop {
-        while break 'outer_loop 567 {
-            panic!("from_inner");
-        }
-        panic!("from outer");
-    };
-    assert_eq!(break_from_while_to_outer, 567);
-
-    let rust = true;
-    let value = loop {
-        break rust;
-    };
-    assert!(value);
-}
diff --git a/src/test/run-pass/for-loop-while/loop-diverges.rs b/src/test/run-pass/for-loop-while/loop-diverges.rs
deleted file mode 100644
index f657bf9e0b3..00000000000
--- a/src/test/run-pass/for-loop-while/loop-diverges.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-// run-pass
-#![allow(unused_parens)]
-// pretty-expanded FIXME #23616
-
-/* Make sure a loop{} can be the tailexpr in the body
-of a diverging function */
-
-fn forever() -> ! {
-  loop{}
-}
-
-pub fn main() {
-  if (1 == 2) { forever(); }
-}
diff --git a/src/test/run-pass/for-loop-while/loop-label-shadowing.rs b/src/test/run-pass/for-loop-while/loop-label-shadowing.rs
deleted file mode 100644
index acb53e254bb..00000000000
--- a/src/test/run-pass/for-loop-while/loop-label-shadowing.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-// run-pass
-// Issue #12512.
-
-// pretty-expanded FIXME #23616
-
-fn main() {
-    let mut foo = Vec::new();
-    'foo: for i in &[1, 2, 3] {
-        foo.push(*i);
-    }
-}
diff --git a/src/test/run-pass/for-loop-while/loop-labeled-break-value.rs b/src/test/run-pass/for-loop-while/loop-labeled-break-value.rs
deleted file mode 100644
index cc8f826983b..00000000000
--- a/src/test/run-pass/for-loop-while/loop-labeled-break-value.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-// run-pass
-// pretty-expanded FIXME #23616
-
-fn main() {
-    'outer: loop {
-        let _: i32 = loop { break 'outer };
-    }
-    'outer2: loop {
-        let _: i32 = loop { loop { break 'outer2 } };
-    }
-}
diff --git a/src/test/run-pass/for-loop-while/loop-no-reinit-needed-post-bot.rs b/src/test/run-pass/for-loop-while/loop-no-reinit-needed-post-bot.rs
deleted file mode 100644
index 1b5db20129d..00000000000
--- a/src/test/run-pass/for-loop-while/loop-no-reinit-needed-post-bot.rs
+++ /dev/null
@@ -1,34 +0,0 @@
-// run-pass
-// pretty-expanded FIXME #23616
-
-struct S;
-// Ensure S is moved, not copied, on assignment.
-impl Drop for S { fn drop(&mut self) { } }
-
-// user-defined function "returning" bottom (i.e., no return at all).
-fn my_panic() -> ! { loop {} }
-
-pub fn step(f: bool) {
-    let mut g = S;
-    let mut i = 0;
-    loop
-    {
-        if i > 10 { break; } else { i += 1; }
-
-        let _g = g;
-
-        if f {
-            // re-initialize g, but only before restarting loop.
-            g = S;
-            continue;
-        }
-
-        my_panic();
-
-        // we never get here, so we do not need to re-initialize g.
-    }
-}
-
-pub fn main() {
-    step(true);
-}
diff --git a/src/test/run-pass/for-loop-while/loop-scope.rs b/src/test/run-pass/for-loop-while/loop-scope.rs
deleted file mode 100644
index 73324a3e1bd..00000000000
--- a/src/test/run-pass/for-loop-while/loop-scope.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-// run-pass
-
-pub fn main() {
-    let x = vec![10, 20, 30];
-    let mut sum = 0;
-    for x in &x { sum += *x; }
-    assert_eq!(sum, 60);
-}
diff --git a/src/test/run-pass/for-loop-while/while-cont.rs b/src/test/run-pass/for-loop-while/while-cont.rs
deleted file mode 100644
index a864e8ef70a..00000000000
--- a/src/test/run-pass/for-loop-while/while-cont.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-// run-pass
-// Issue #825: Should recheck the loop condition after continuing
-pub fn main() {
-    let mut i = 1;
-    while i > 0 {
-        assert!((i > 0));
-        println!("{}", i);
-        i -= 1;
-        continue;
-    }
-}
diff --git a/src/test/run-pass/for-loop-while/while-flow-graph.rs b/src/test/run-pass/for-loop-while/while-flow-graph.rs
deleted file mode 100644
index 1748964a7b2..00000000000
--- a/src/test/run-pass/for-loop-while/while-flow-graph.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-// run-pass
-
-
-// pretty-expanded FIXME #23616
-
-pub fn main() { let x: isize = 10; while x == 10 && x == 11 { let _y = 0xf00_usize; } }
diff --git a/src/test/run-pass/for-loop-while/while-label.rs b/src/test/run-pass/for-loop-while/while-label.rs
deleted file mode 100644
index 5abc41daf94..00000000000
--- a/src/test/run-pass/for-loop-while/while-label.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-// run-pass
-#![allow(unreachable_code)]
-
-
-pub fn main() {
-    let mut i = 100;
-    'w: while 1 + 1 == 2 {
-        i -= 1;
-        if i == 95 {
-            break 'w;
-            panic!("Should have broken out of loop");
-        }
-    }
-    assert_eq!(i, 95);
-}
diff --git a/src/test/run-pass/for-loop-while/while-let.rs b/src/test/run-pass/for-loop-while/while-let.rs
deleted file mode 100644
index b9d70ff0b9d..00000000000
--- a/src/test/run-pass/for-loop-while/while-let.rs
+++ /dev/null
@@ -1,46 +0,0 @@
-// run-pass
-
-use std::collections::BinaryHeap;
-
-fn make_pq() -> BinaryHeap<isize> {
-    BinaryHeap::from(vec![1,2,3])
-}
-
-pub fn main() {
-    let mut pq = make_pq();
-    let mut sum = 0;
-    while let Some(x) = pq.pop() {
-        sum += x;
-    }
-    assert_eq!(sum, 6);
-
-    pq = make_pq();
-    sum = 0;
-    'a: while let Some(x) = pq.pop() {
-        sum += x;
-        if x == 2 {
-            break 'a;
-        }
-    }
-    assert_eq!(sum, 5);
-
-    pq = make_pq();
-    sum = 0;
-    'a2: while let Some(x) = pq.pop() {
-        if x == 3 {
-            continue 'a2;
-        }
-        sum += x;
-    }
-    assert_eq!(sum, 3);
-
-    let mut pq1 = make_pq();
-    sum = 0;
-    while let Some(x) = pq1.pop() {
-        let mut pq2 = make_pq();
-        while let Some(y) = pq2.pop() {
-            sum += x * y;
-        }
-    }
-    assert_eq!(sum, 6 + 12 + 18);
-}
diff --git a/src/test/run-pass/for-loop-while/while-loop-constraints-2.rs b/src/test/run-pass/for-loop-while/while-loop-constraints-2.rs
deleted file mode 100644
index 3c5cdf06cd8..00000000000
--- a/src/test/run-pass/for-loop-while/while-loop-constraints-2.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-// run-pass
-#![allow(unused_assignments)]
-#![allow(unused_variables)]
-
-pub fn main() {
-    let mut y: isize = 42;
-    let mut z: isize = 42;
-    let mut x: isize;
-    while z < 50 {
-        z += 1;
-        while false { x = y; y = z; }
-        println!("{}", y);
-    }
-    assert!((y == 42 && z == 50));
-}
diff --git a/src/test/run-pass/for-loop-while/while-prelude-drop.rs b/src/test/run-pass/for-loop-while/while-prelude-drop.rs
deleted file mode 100644
index 196b9daf6ec..00000000000
--- a/src/test/run-pass/for-loop-while/while-prelude-drop.rs
+++ /dev/null
@@ -1,24 +0,0 @@
-// run-pass
-#![allow(non_camel_case_types)]
-
-use std::string::String;
-
-#[derive(PartialEq)]
-enum t { a, b(String), }
-
-fn make(i: isize) -> t {
-    if i > 10 { return t::a; }
-    let mut s = String::from("hello");
-    // Ensure s is non-const.
-
-    s.push_str("there");
-    return t::b(s);
-}
-
-pub fn main() {
-    let mut i = 0;
-
-
-    // The auto slot for the result of make(i) should not leak.
-    while make(i) != t::a { i += 1; }
-}
diff --git a/src/test/run-pass/for-loop-while/while-with-break.rs b/src/test/run-pass/for-loop-while/while-with-break.rs
deleted file mode 100644
index a9d52dda544..00000000000
--- a/src/test/run-pass/for-loop-while/while-with-break.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-// run-pass
-
-pub fn main() {
-    let mut i: isize = 90;
-    while i < 100 {
-        println!("{}", i);
-        i = i + 1;
-        if i == 95 {
-            let _v: Vec<isize> =
-                vec![1, 2, 3, 4, 5]; // we check that it is freed by break
-
-            println!("breaking");
-            break;
-        }
-    }
-    assert_eq!(i, 95);
-}
diff --git a/src/test/run-pass/for-loop-while/while.rs b/src/test/run-pass/for-loop-while/while.rs
deleted file mode 100644
index 90f718a3483..00000000000
--- a/src/test/run-pass/for-loop-while/while.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-// run-pass
-
-
-pub fn main() {
-    let mut x: isize = 10;
-    let mut y: isize = 0;
-    while y < x { println!("{}", y); println!("hello"); y = y + 1; }
-    while x > 0 {
-        println!("goodbye");
-        x = x - 1;
-        println!("{}", x);
-    }
-}