Auto merge of #52409 - estebank:move-cfail-ui, r=oli-obk

Move some `compile-fail` tests to `ui`

Re: #44844.

545 files changed, 4 insertions, 12817 deletions

diff --git a/src/test/compile-fail/issue-10176.rs b/src/test/compile-fail/issue-10176.rs
deleted file mode 100644
index c968844ae21..00000000000
--- a/src/test/compile-fail/issue-10176.rs
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn f() -> isize {
-    (return 1, return 2)
-//~^ ERROR mismatched types
-//~| expected type `isize`
-//~| found type `(!, !)`
-//~| expected isize, found tuple
-}
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-10200.rs b/src/test/compile-fail/issue-10200.rs
deleted file mode 100644
index 8c58ef6261e..00000000000
--- a/src/test/compile-fail/issue-10200.rs
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-struct Foo(bool);
-fn foo(_: usize) -> Foo { Foo(false) }
-
-fn main() {
-    match Foo(true) {
-        foo(x) //~ ERROR expected tuple struct/variant, found function `foo`
-        => ()
-    }
-}
diff --git a/src/test/compile-fail/issue-10291.rs b/src/test/compile-fail/issue-10291.rs
deleted file mode 100644
index d4e7dc7e9a3..00000000000
--- a/src/test/compile-fail/issue-10291.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn test<'x>(x: &'x isize) {
-    drop::<Box<for<'z> FnMut(&'z isize) -> &'z isize>>(Box::new(|z| {
-        x //~ ERROR E0312
-    }));
-}
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-10398.rs b/src/test/compile-fail/issue-10398.rs
deleted file mode 100644
index 08e8effc626..00000000000
--- a/src/test/compile-fail/issue-10398.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![feature(box_syntax)]
-
-fn main() {
-    let x: Box<_> = box 1;
-    let f = move|| {
-        let _a = x;
-        drop(x);
-        //~^ ERROR: use of moved value: `x`
-    };
-    f();
-}
diff --git a/src/test/compile-fail/issue-10401.rs b/src/test/compile-fail/issue-10401.rs
deleted file mode 100644
index e36193aee25..00000000000
--- a/src/test/compile-fail/issue-10401.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn main() {
-    let mut a = "a";
-    a += { "b" };
-    //~^ ERROR: binary assignment operation `+=` cannot be applied
-}
diff --git a/src/test/compile-fail/issue-10412.rs b/src/test/compile-fail/issue-10412.rs
deleted file mode 100644
index ee553730a35..00000000000
--- a/src/test/compile-fail/issue-10412.rs
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-trait Serializable<'self, T> { //~ ERROR lifetimes cannot use keyword names
-    fn serialize(val : &'self T) -> Vec<u8>; //~ ERROR lifetimes cannot use keyword names
-    fn deserialize(repr : &[u8]) -> &'self T; //~ ERROR lifetimes cannot use keyword names
-}
-
-impl<'self> Serializable<str> for &'self str { //~ ERROR lifetimes cannot use keyword names
-    //~^ ERROR lifetimes cannot use keyword names
-    //~| ERROR missing lifetime specifier
-    fn serialize(val : &'self str) -> Vec<u8> { //~ ERROR lifetimes cannot use keyword names
-        vec![1]
-    }
-    fn deserialize(repr: &[u8]) -> &'self str { //~ ERROR lifetimes cannot use keyword names
-        "hi"
-    }
-}
-
-fn main() {
-    println!("hello");
-    let x = "foo".to_string();
-    let y = x;
-    println!("{}", y);
-}
diff --git a/src/test/compile-fail/issue-10465.rs b/src/test/compile-fail/issue-10465.rs
deleted file mode 100644
index ed91e935407..00000000000
--- a/src/test/compile-fail/issue-10465.rs
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-pub mod a {
-    pub trait A {
-        fn foo(&self);
-    }
-
-}
-pub mod b {
-    use a::A;
-
-    pub struct B;
-    impl A for B { fn foo(&self) {} }
-
-    pub mod c {
-        use b::B;
-
-        fn foo(b: &B) {
-            b.foo(); //~ ERROR: no method named `foo` found
-        }
-    }
-
-}
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-10536.rs b/src/test/compile-fail/issue-10536.rs
deleted file mode 100644
index 3b0ea55cfa9..00000000000
--- a/src/test/compile-fail/issue-10536.rs
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// We only want to assert that this doesn't ICE, we don't particularly care
-// about whether it nor it fails to compile.
-
-// error-pattern:
-
-macro_rules! foo{
-    () => {{
-        macro_rules! bar{() => (())}
-        1
-    }}
-}
-
-pub fn main() {
-    foo!();
-
-    assert!({one! two()});
-
-    // regardless of whether nested macro_rules works, the following should at
-    // least throw a conventional error.
-    assert!({one! two});
-}
diff --git a/src/test/compile-fail/issue-10545.rs b/src/test/compile-fail/issue-10545.rs
deleted file mode 100644
index 708eea39a95..00000000000
--- a/src/test/compile-fail/issue-10545.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-
-mod a {
-    struct S;
-    impl S { }
-}
-
-fn foo(_: a::S) { //~ ERROR: struct `S` is private
-}
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-10656.rs b/src/test/compile-fail/issue-10656.rs
deleted file mode 100644
index 0b335a526a4..00000000000
--- a/src/test/compile-fail/issue-10656.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// error-pattern: missing documentation for crate
-
-#![deny(missing_docs)]
-#![crate_type="lib"]
diff --git a/src/test/compile-fail/issue-10764.rs b/src/test/compile-fail/issue-10764.rs
deleted file mode 100644
index cd4ec495556..00000000000
--- a/src/test/compile-fail/issue-10764.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn f(_: extern "Rust" fn()) {}
-extern fn bar() {}
-
-fn main() { f(bar) }
-//~^ ERROR mismatched types
diff --git a/src/test/compile-fail/issue-10877.rs b/src/test/compile-fail/issue-10877.rs
deleted file mode 100644
index 39f25b837cd..00000000000
--- a/src/test/compile-fail/issue-10877.rs
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-struct Foo { x: isize }
-extern {
-    fn foo(1: ());
-    //~^ ERROR: patterns aren't allowed in foreign function declarations
-    fn bar((): isize);
-    //~^ ERROR: patterns aren't allowed in foreign function declarations
-    fn baz(Foo { x }: isize);
-    //~^ ERROR: patterns aren't allowed in foreign function declarations
-    fn qux((x,y): ());
-    //~^ ERROR: patterns aren't allowed in foreign function declarations
-    fn this_is_actually_ok(a: usize);
-    fn and_so_is_this(_: usize);
-}
-fn main() {}
diff --git a/src/test/compile-fail/issue-10991.rs b/src/test/compile-fail/issue-10991.rs
deleted file mode 100644
index 2d00f339f33..00000000000
--- a/src/test/compile-fail/issue-10991.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn main() {
-    let nil = ();
-    let _t = nil as usize; //~ ERROR: non-primitive cast: `()` as `usize`
-}
diff --git a/src/test/compile-fail/issue-11154.rs b/src/test/compile-fail/issue-11154.rs
deleted file mode 100644
index 1ff68123374..00000000000
--- a/src/test/compile-fail/issue-11154.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// compile-flags: -C lto -C prefer-dynamic
-
-// error-pattern: cannot prefer dynamic linking
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-11192.rs b/src/test/compile-fail/issue-11192.rs
deleted file mode 100644
index 7d8a1528aba..00000000000
--- a/src/test/compile-fail/issue-11192.rs
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![feature(box_syntax)]
-
-struct Foo {
-    x: isize
-}
-
-impl Drop for Foo {
-    fn drop(&mut self) {
-        println!("drop {}", self.x);
-    }
-}
-
-fn main() {
-    let mut ptr: Box<_> = box Foo { x: 0 };
-    let mut test = |foo: &Foo| {
-        println!("access {}", foo.x);
-        ptr = box Foo { x: ptr.x + 1 };
-        println!("access {}", foo.x);
-    };
-    test(&*ptr);
-    //~^ ERROR: cannot borrow `*ptr` as immutable
-}
diff --git a/src/test/compile-fail/issue-11374.rs b/src/test/compile-fail/issue-11374.rs
deleted file mode 100644
index 1e444a6bebf..00000000000
--- a/src/test/compile-fail/issue-11374.rs
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-use std::io::{self, Read};
-use std::vec;
-
-pub struct Container<'a> {
-    reader: &'a mut Read
-}
-
-impl<'a> Container<'a> {
-    pub fn wrap<'s>(reader: &'s mut io::Read) -> Container<'s> {
-        Container { reader: reader }
-    }
-
-    pub fn read_to(&mut self, vec: &mut [u8]) {
-        self.reader.read(vec);
-    }
-}
-
-pub fn for_stdin<'a>() -> Container<'a> {
-    let mut r = io::stdin();
-    Container::wrap(&mut r as &mut io::Read)
-}
-
-fn main() {
-    let mut c = for_stdin();
-    let mut v = Vec::new();
-    c.read_to(v); //~ ERROR E0308
-}
diff --git a/src/test/compile-fail/issue-11493.rs b/src/test/compile-fail/issue-11493.rs
deleted file mode 100644
index 3045c06ca4c..00000000000
--- a/src/test/compile-fail/issue-11493.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// This file must never have a trailing newline
-
-fn id<T>(x: T) -> T { x }
-
-fn main() {
-    let x = Some(3);
-    let y = x.as_ref().unwrap_or(&id(5)); //~ ERROR: borrowed value does not live long enough
-}
diff --git a/src/test/compile-fail/issue-11515.rs b/src/test/compile-fail/issue-11515.rs
deleted file mode 100644
index 7afb8314ea6..00000000000
--- a/src/test/compile-fail/issue-11515.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![feature(box_syntax)]
-
-struct Test {
-    func: Box<FnMut()+'static>
-}
-
-fn main() {
-    let closure: Box<Fn()+'static> = Box::new(|| ());
-    let test = box Test { func: closure }; //~ ERROR mismatched types
-}
diff --git a/src/test/compile-fail/issue-11681.rs b/src/test/compile-fail/issue-11681.rs
deleted file mode 100644
index 71f1d5dcc9a..00000000000
--- a/src/test/compile-fail/issue-11681.rs
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// This tests verifies that unary structs and enum variants
-// are treated as rvalues and their lifetime is not bounded to
-// the static scope.
-
-struct Test;
-
-impl Drop for Test {
-    fn drop (&mut self) {}
-}
-
-fn createTest<'a>() -> &'a Test {
-  let testValue = &Test; //~ ERROR borrowed value does not live long enough
-  return testValue;
-}
-
-
-pub fn main() {
-    createTest();
-}
diff --git a/src/test/compile-fail/issue-11692-1.rs b/src/test/compile-fail/issue-11692-1.rs
deleted file mode 100644
index f577aad04e6..00000000000
--- a/src/test/compile-fail/issue-11692-1.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn main() {
-    print!(test!());
-    //~^ ERROR: format argument must be a string literal
-}
diff --git a/src/test/compile-fail/issue-11692-2.rs b/src/test/compile-fail/issue-11692-2.rs
deleted file mode 100644
index acac2d151fe..00000000000
--- a/src/test/compile-fail/issue-11692-2.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn main() {
-    concat!(test!());
-    //~^ ERROR cannot find macro `test!` in this scope
-}
diff --git a/src/test/compile-fail/issue-11740.rs b/src/test/compile-fail/issue-11740.rs
deleted file mode 100644
index 0bda06be9e8..00000000000
--- a/src/test/compile-fail/issue-11740.rs
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![feature(rustc_attrs)]
-#![allow(warnings)]
-
-struct Attr {
-    name: String,
-    value: String,
-}
-
-struct Element {
-    attrs: Vec<Box<Attr>>,
-}
-
-impl Element {
-    pub unsafe fn get_attr<'a>(&'a self, name: &str) {
-        self.attrs
-            .iter()
-            .find(|attr| {
-                      let attr: &&Box<Attr> = std::mem::transmute(attr);
-                      true
-                  });
-    }
-}
-
-#[rustc_error]
-fn main() { //~ ERROR compilation successful
-    let element = Element { attrs: Vec::new() };
-    let _ = unsafe { element.get_attr("foo") };
-}
diff --git a/src/test/compile-fail/issue-11771.rs b/src/test/compile-fail/issue-11771.rs
deleted file mode 100644
index 69899105bc3..00000000000
--- a/src/test/compile-fail/issue-11771.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn main() {
-    let x = ();
-    1 +
-    x //~^ ERROR E0277
-    ;
-
-    let x: () = ();
-    1 +
-    x //~^ ERROR E0277
-    ;
-}
diff --git a/src/test/compile-fail/issue-11844.rs b/src/test/compile-fail/issue-11844.rs
deleted file mode 100644
index a6dbe954ec0..00000000000
--- a/src/test/compile-fail/issue-11844.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![feature(box_syntax)]
-
-fn main() {
-    let a = Some(box 1);
-    match a {
-        Ok(a) => //~ ERROR: mismatched types
-            println!("{}",a),
-        None => panic!()
-    }
-}
diff --git a/src/test/compile-fail/issue-11873.rs b/src/test/compile-fail/issue-11873.rs
deleted file mode 100644
index 4618851529a..00000000000
--- a/src/test/compile-fail/issue-11873.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2012-2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn main() {
-    let mut v = vec![1];
-    let mut f = || v.push(2);
-    let _w = v; //~ ERROR: cannot move out of `v`
-
-    f();
-}
diff --git a/src/test/compile-fail/issue-12028.rs b/src/test/compile-fail/issue-12028.rs
deleted file mode 100644
index 980385ce4cc..00000000000
--- a/src/test/compile-fail/issue-12028.rs
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// Test an example where we fail to infer the type parameter H. This
-// is because there is really nothing constraining it. At one time, we
-// would infer based on the where clauses in scope, but that no longer
-// works.
-
-trait Hash<H> {
-    fn hash2(&self, hasher: &H) -> u64;
-}
-
-trait Stream {
-    fn input(&mut self, bytes: &[u8]);
-    fn result(&self) -> u64;
-}
-
-trait StreamHasher {
-    type S : Stream;
-    fn stream(&self) -> Self::S;
-}
-
-//////////////////////////////////////////////////////////////////////////////
-
-trait StreamHash<H: StreamHasher>: Hash<H> {
-    fn input_stream(&self, stream: &mut H::S);
-}
-
-impl<H: StreamHasher> Hash<H> for u8 {
-    fn hash2(&self, hasher: &H) -> u64 {
-        let mut stream = hasher.stream();
-        self.input_stream(&mut stream); //~ ERROR type annotations required
-        Stream::result(&stream)
-    }
-}
-
-impl<H: StreamHasher> StreamHash<H> for u8 {
-    fn input_stream(&self, stream: &mut H::S) {
-        Stream::input(stream, &[*self]);
-    }
-}
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-12041.rs b/src/test/compile-fail/issue-12041.rs
deleted file mode 100644
index f0f4bf5ca71..00000000000
--- a/src/test/compile-fail/issue-12041.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-use std::sync::mpsc::channel;
-use std::thread;
-
-fn main() {
-    let (tx, rx) = channel();
-    let _t = thread::spawn(move|| -> () {
-        loop {
-            let tx = tx;
-            //~^ ERROR: use of moved value: `tx`
-            tx.send(1);
-        }
-    });
-}
diff --git a/src/test/compile-fail/issue-12116.rs b/src/test/compile-fail/issue-12116.rs
deleted file mode 100644
index a8d2c552553..00000000000
--- a/src/test/compile-fail/issue-12116.rs
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright 2012-2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![feature(box_patterns)]
-#![feature(box_syntax)]
-#![allow(dead_code)]
-#![allow(unused_variables)]
-#![deny(unreachable_patterns)]
-
-enum IntList {
-    Cons(isize, Box<IntList>),
-    Nil
-}
-
-fn tail(source_list: &IntList) -> IntList {
-    match source_list {
-        &IntList::Cons(val, box ref next_list) => tail(next_list),
-        &IntList::Cons(val, box IntList::Nil)  => IntList::Cons(val, box IntList::Nil),
-//~^ ERROR unreachable pattern
-        _                          => panic!()
-    }
-}
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-12127.rs b/src/test/compile-fail/issue-12127.rs
deleted file mode 100644
index 5565a9a5761..00000000000
--- a/src/test/compile-fail/issue-12127.rs
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![feature(box_syntax, unboxed_closures)]
-
-fn to_fn_once<A,F:FnOnce<A>>(f: F) -> F { f }
-fn do_it(x: &isize) { }
-
-fn main() {
-    let x: Box<_> = box 22;
-    let f = to_fn_once(move|| do_it(&*x));
-    to_fn_once(move|| {
-        f();
-        f();
-        //~^ ERROR: use of moved value: `f`
-    })()
-}
diff --git a/src/test/compile-fail/issue-12369.rs b/src/test/compile-fail/issue-12369.rs
deleted file mode 100644
index 1b9af393ccc..00000000000
--- a/src/test/compile-fail/issue-12369.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![feature(slice_patterns)]
-#![deny(unreachable_patterns)]
-
-fn main() {
-    let sl = vec![1,2,3];
-    let v: isize = match &*sl {
-        &[] => 0,
-        &[a,b,c] => 3,
-        &[a, ref rest..] => a,
-        &[10,a, ref rest..] => 10 //~ ERROR: unreachable pattern
-    };
-}
diff --git a/src/test/compile-fail/issue-12470.rs b/src/test/compile-fail/issue-12470.rs
deleted file mode 100644
index 93785817e14..00000000000
--- a/src/test/compile-fail/issue-12470.rs
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright 2012-2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![feature(box_syntax)]
-
-trait X {
-    fn get_i(&self) -> isize;
-}
-
-
-struct B {
-    i: isize
-}
-
-impl X for B {
-    fn get_i(&self) -> isize {
-        self.i
-    }
-}
-
-struct A<'a> {
-    p: &'a (X+'a)
-}
-
-fn make_a<'a>(p: &'a X) -> A<'a> {
-    A { p: p }
-}
-
-fn make_make_a<'a>() -> A<'a> {
-    let b: Box<B> = box B {i:1};
-    let bb: &B = &*b;    //~ ERROR does not live long enough
-    make_a(bb)
-}
-
-fn main() {
-    let _a = make_make_a();
-}
diff --git a/src/test/compile-fail/issue-12552.rs b/src/test/compile-fail/issue-12552.rs
deleted file mode 100644
index e4788bac256..00000000000
--- a/src/test/compile-fail/issue-12552.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// this code used to cause an ICE
-
-fn main() {
-  let t = Err(0);
-  match t {
-    Some(k) => match k { //~ ERROR mismatched types
-      a => println!("{}", a)
-    },
-    None => () //~ ERROR mismatched types
-  }
-}
diff --git a/src/test/compile-fail/issue-12567.rs b/src/test/compile-fail/issue-12567.rs
deleted file mode 100644
index 30cdd07b399..00000000000
--- a/src/test/compile-fail/issue-12567.rs
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![feature(slice_patterns)]
-
-fn match_vecs<'a, T>(l1: &'a [T], l2: &'a [T]) {
-    match (l1, l2) {
-        (&[], &[]) => println!("both empty"),
-        (&[], &[hd, ..]) | (&[hd, ..], &[])
-            => println!("one empty"),
-        //~^^ ERROR: cannot move out of type `[T]`, a non-copy slice
-        //~^^^ ERROR: cannot move out of type `[T]`, a non-copy slice
-        (&[hd1, ..], &[hd2, ..])
-            => println!("both nonempty"),
-        //~^^ ERROR: cannot move out of type `[T]`, a non-copy slice
-        //~^^^ ERROR: cannot move out of type `[T]`, a non-copy slice
-    }
-}
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-12796.rs b/src/test/compile-fail/issue-12796.rs
deleted file mode 100644
index 0c3c82a99f2..00000000000
--- a/src/test/compile-fail/issue-12796.rs
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-trait Trait {
-    fn outer(&self) {
-        fn inner(_: &Self) {
-            //~^ ERROR can't use type parameters from outer function
-        }
-    }
-}
-
-fn main() { }
diff --git a/src/test/compile-fail/issue-12863.rs b/src/test/compile-fail/issue-12863.rs
deleted file mode 100644
index d3432410c54..00000000000
--- a/src/test/compile-fail/issue-12863.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-mod foo { pub fn bar() {} }
-
-fn main() {
-    match () {
-        foo::bar => {} //~ ERROR expected unit struct/variant or constant, found function `foo::bar`
-    }
-}
diff --git a/src/test/compile-fail/issue-12997-1.rs b/src/test/compile-fail/issue-12997-1.rs
deleted file mode 100644
index 2d8d7857c99..00000000000
--- a/src/test/compile-fail/issue-12997-1.rs
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// compile-flags: --test
-
-//! Test that makes sure wrongly-typed bench functions aren't ignored
-
-#[bench]
-fn foo() { } //~ ERROR functions used as benches
-
-#[bench]
-fn bar(x: isize, y: isize) { } //~ ERROR functions used as benches
diff --git a/src/test/compile-fail/issue-12997-2.rs b/src/test/compile-fail/issue-12997-2.rs
deleted file mode 100644
index 8d3df68577b..00000000000
--- a/src/test/compile-fail/issue-12997-2.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// compile-flags: --test
-
-//! Test that makes sure wrongly-typed bench functions are rejected
-
-#[bench]
-fn bar(x: isize) { }
-//~^ ERROR mismatched types
diff --git a/src/test/compile-fail/issue-13033.rs b/src/test/compile-fail/issue-13033.rs
deleted file mode 100644
index f1fd617717a..00000000000
--- a/src/test/compile-fail/issue-13033.rs
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-trait Foo {
-    fn bar(&mut self, other: &mut Foo);
-}
-
-struct Baz;
-
-impl Foo for Baz {
-    fn bar(&mut self, other: &Foo) {}
-    //~^ ERROR method `bar` has an incompatible type for trait
-    //~| expected type `fn(&mut Baz, &mut dyn Foo)`
-    //~| found type `fn(&mut Baz, &dyn Foo)`
-}
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-13352.rs b/src/test/compile-fail/issue-13352.rs
deleted file mode 100644
index e9d76c758cd..00000000000
--- a/src/test/compile-fail/issue-13352.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// ignore-cloudabi no std::process
-
-fn foo(_: Box<FnMut()>) {}
-
-fn main() {
-    foo(loop {
-        std::process::exit(0);
-    });
-    2_usize + (loop {});
-    //~^ ERROR E0277
-}
diff --git a/src/test/compile-fail/issue-13359.rs b/src/test/compile-fail/issue-13359.rs
deleted file mode 100644
index e33859e8c19..00000000000
--- a/src/test/compile-fail/issue-13359.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn foo(_s: i16) { }
-
-fn bar(_s: u32) { }
-
-fn main() {
-    foo(1*(1 as isize));
-    //~^ ERROR mismatched types
-    //~| expected i16, found isize
-
-    bar(1*(1 as usize));
-    //~^ ERROR mismatched types
-    //~| expected u32, found usize
-}
diff --git a/src/test/compile-fail/issue-13404.rs b/src/test/compile-fail/issue-13404.rs
deleted file mode 100644
index 0059e92e07f..00000000000
--- a/src/test/compile-fail/issue-13404.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-use a::f;
-use b::f; //~ ERROR: unresolved import `b::f` [E0432]
-          //~^ no `f` in `b`
-
-mod a { pub fn f() {} }
-mod b { }
-
-fn main() {
-    f();
-}
diff --git a/src/test/compile-fail/issue-13407.rs b/src/test/compile-fail/issue-13407.rs
deleted file mode 100644
index afb2e867f45..00000000000
--- a/src/test/compile-fail/issue-13407.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-mod A {
-    struct C;
-}
-
-fn main() {
-    A::C = 1;
-    //~^ ERROR: invalid left-hand side expression
-    //~| ERROR: mismatched types
-    //~| ERROR: struct `C` is private
-}
diff --git a/src/test/compile-fail/issue-13446.rs b/src/test/compile-fail/issue-13446.rs
deleted file mode 100644
index 6ad3ec67b29..00000000000
--- a/src/test/compile-fail/issue-13446.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-
-// Used to cause ICE
-
-// error-pattern: mismatched types
-
-static VEC: [u32; 256] = vec![];
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-13466.rs b/src/test/compile-fail/issue-13466.rs
deleted file mode 100644
index abddf6ba7a3..00000000000
--- a/src/test/compile-fail/issue-13466.rs
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// Regression test for #13466
-
-pub fn main() {
-    // The expected arm type `Option<T>` has one type parameter, while
-    // the actual arm `Result<T, E>` has two. typeck should not be
-    // tricked into looking up a non-existing second type parameter.
-    let _x: usize = match Some(1) {
-        Ok(u) => u,
-        //~^ ERROR mismatched types
-        //~| expected type `std::option::Option<{integer}>`
-        //~| found type `std::result::Result<_, _>`
-        //~| expected enum `std::option::Option`, found enum `std::result::Result`
-
-        Err(e) => panic!(e)
-        //~^ ERROR mismatched types
-        //~| expected type `std::option::Option<{integer}>`
-        //~| found type `std::result::Result<_, _>`
-        //~| expected enum `std::option::Option`, found enum `std::result::Result`
-    };
-}
diff --git a/src/test/compile-fail/issue-13482-2.rs b/src/test/compile-fail/issue-13482-2.rs
deleted file mode 100644
index fe7fbb176cc..00000000000
--- a/src/test/compile-fail/issue-13482-2.rs
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// compile-flags:-Z verbose
-
-fn main() {
-    let x = [1,2];
-    let y = match x {
-        [] => None, //~ ERROR pattern requires 0 elements but array has 2
-        [a,_] => Some(a)
-    };
-}
diff --git a/src/test/compile-fail/issue-13482.rs b/src/test/compile-fail/issue-13482.rs
deleted file mode 100644
index 32a63b79a32..00000000000
--- a/src/test/compile-fail/issue-13482.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn main() {
-  let x = [1,2];
-  let y = match x {
-    [] => None, //~ ERROR pattern requires 0 elements but array has 2
-    [a,_] => Some(a)
-  };
-}
diff --git a/src/test/compile-fail/issue-13497-2.rs b/src/test/compile-fail/issue-13497-2.rs
deleted file mode 100644
index 31716837493..00000000000
--- a/src/test/compile-fail/issue-13497-2.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn read_lines_borrowed<'a>() -> Vec<&'a str> {
-    let rawLines: Vec<String> = vec!["foo  ".to_string(), "  bar".to_string()];
-    rawLines //~ ERROR `rawLines` does not live long enough
-        .iter().map(|l| l.trim()).collect()
-}
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-13497.rs b/src/test/compile-fail/issue-13497.rs
deleted file mode 100644
index d544a92d9c3..00000000000
--- a/src/test/compile-fail/issue-13497.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn read_lines_borrowed1() -> Vec<
-    &str //~ ERROR missing lifetime specifier
-> {
-    let rawLines: Vec<String> = vec!["foo  ".to_string(), "  bar".to_string()];
-    rawLines.iter().map(|l| l.trim()).collect()
-}
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-1362.rs b/src/test/compile-fail/issue-1362.rs
deleted file mode 100644
index d51db479599..00000000000
--- a/src/test/compile-fail/issue-1362.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// Regression test for issue #1362 - without that fix the span will be bogus
-// no-reformat
-fn main() {
-  let x: u32 = 20i32; //~ ERROR mismatched types
-}
-// NOTE: Do not add any extra lines as the line number the error is
-// on is significant; an error later in the source file might not
-// trigger the bug.
diff --git a/src/test/compile-fail/issue-13641.rs b/src/test/compile-fail/issue-13641.rs
deleted file mode 100644
index 3b690e08f61..00000000000
--- a/src/test/compile-fail/issue-13641.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-mod a {
-    struct Foo;
-    impl Foo { pub fn new() {} }
-    enum Bar {}
-    impl Bar { pub fn new() {} }
-}
-
-fn main() {
-    a::Foo::new();
-    //~^ ERROR: struct `Foo` is private
-    a::Bar::new();
-    //~^ ERROR: enum `Bar` is private
-}
diff --git a/src/test/compile-fail/issue-13727.rs b/src/test/compile-fail/issue-13727.rs
deleted file mode 100644
index 2e815548e89..00000000000
--- a/src/test/compile-fail/issue-13727.rs
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![allow(overflowing_literals)]
-#![deny(unreachable_patterns)]
-
-fn test(val: u8) {
-  match val {
-    256 => print!("0b1110\n"),
-    512 => print!("0b1111\n"),
-    //~^ ERROR: unreachable pattern
-    _   => print!("fail\n"),
-  }
-}
-
-fn main() {
-  test(1);
-}
diff --git a/src/test/compile-fail/issue-13847.rs b/src/test/compile-fail/issue-13847.rs
deleted file mode 100644
index 0314f109a7c..00000000000
--- a/src/test/compile-fail/issue-13847.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn main() {
-    return.is_failure //~ ERROR no field `is_failure` on type `!`
-}
diff --git a/src/test/compile-fail/issue-13853-2.rs b/src/test/compile-fail/issue-13853-2.rs
deleted file mode 100644
index 1635a8f69a6..00000000000
--- a/src/test/compile-fail/issue-13853-2.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-trait FromStructReader<'a> { }
-trait ResponseHook {
-     fn get(&self);
-}
-fn foo(res : Box<ResponseHook>) { res.get } //~ ERROR attempted to take value of method
-fn main() {}
diff --git a/src/test/compile-fail/issue-13853-5.rs b/src/test/compile-fail/issue-13853-5.rs
deleted file mode 100644
index 78b079a7c44..00000000000
--- a/src/test/compile-fail/issue-13853-5.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-trait Deserializer<'a> { }
-
-trait Deserializable {
-    fn deserialize_token<'a, D: Deserializer<'a>>(_: D, _: &'a str) -> Self;
-}
-
-impl<'a, T: Deserializable> Deserializable for &'a str {
-    //~^ ERROR type parameter `T` is not constrained
-    fn deserialize_token<D: Deserializer<'a>>(_x: D, _y: &'a str) -> &'a str {
-    }
-}
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-13853.rs b/src/test/compile-fail/issue-13853.rs
deleted file mode 100644
index 86a6bdfd4dd..00000000000
--- a/src/test/compile-fail/issue-13853.rs
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-trait Node {
-    fn zomg();
-}
-
-trait Graph<N: Node> {
-    fn nodes<'a, I: Iterator<Item=&'a N>>(&'a self) -> I
-        where N: 'a;
-}
-
-impl<N: Node> Graph<N> for Vec<N> {
-    fn nodes<'a, I: Iterator<Item=&'a N>>(&self) -> I
-        where N: 'a
-    {
-        self.iter() //~ ERROR mismatched types
-    }
-}
-
-struct Stuff;
-
-impl Node for Stuff {
-    fn zomg() {
-        println!("zomg");
-    }
-}
-
-fn iterate<N: Node, G: Graph<N>>(graph: &G) {
-    for node in graph.iter() { //~ ERROR no method named `iter` found
-        node.zomg();
-    }
-}
-
-pub fn main() {
-    let graph = Vec::new();
-
-    graph.push(Stuff);
-
-    iterate(graph); //~ ERROR mismatched types
-}
diff --git a/src/test/compile-fail/issue-14091-2.rs b/src/test/compile-fail/issue-14091-2.rs
deleted file mode 100644
index d3823a8cc55..00000000000
--- a/src/test/compile-fail/issue-14091-2.rs
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// error-pattern: cannot apply unary operator `!` to type `BytePos`
-
-// Very
-
-// sensitive
-pub struct BytePos(pub u32);
-
-// to particular
-
-// line numberings / offsets
-
-fn main() {
-    let x = BytePos(1);
-
-    assert!(x, x);
-}
diff --git a/src/test/compile-fail/issue-14091.rs b/src/test/compile-fail/issue-14091.rs
deleted file mode 100644
index 9c594ef485f..00000000000
--- a/src/test/compile-fail/issue-14091.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// error-pattern:mismatched types
-
-fn main(){assert!(1,1);}
diff --git a/src/test/compile-fail/issue-14221.rs b/src/test/compile-fail/issue-14221.rs
deleted file mode 100644
index d11fe99c07f..00000000000
--- a/src/test/compile-fail/issue-14221.rs
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![deny(unreachable_patterns)]
-#![allow(unused_variables)]
-#![allow(non_snake_case)]
-
-pub enum E {
-    A,
-    B,
-}
-
-pub mod b {
-    pub fn key(e: ::E) -> &'static str {
-        match e {
-            A => "A",
-//~^ WARN pattern binding `A` is named the same as one of the variants of the type `E`
-            B => "B", //~ ERROR: unreachable pattern
-//~^ WARN pattern binding `B` is named the same as one of the variants of the type `E`
-        }
-    }
-}
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-14227.rs b/src/test/compile-fail/issue-14227.rs
deleted file mode 100644
index 250e78ce246..00000000000
--- a/src/test/compile-fail/issue-14227.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![allow(safe_extern_statics, warnings)]
-
-extern {
-    pub static symbol: ();
-}
-static CRASH: () = symbol;
-//~^ ERROR could not evaluate static initializer
-//~| tried to read from foreign (extern) static
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-14285.rs b/src/test/compile-fail/issue-14285.rs
deleted file mode 100644
index dceecee6ca7..00000000000
--- a/src/test/compile-fail/issue-14285.rs
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2012-2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-trait Foo {
-    fn dummy(&self) { }
-}
-
-struct A;
-
-impl Foo for A {}
-
-struct B<'a>(&'a (Foo+'a));
-
-fn foo<'a>(a: &Foo) -> B<'a> {
-    B(a)    //~ ERROR 22:5: 22:9: explicit lifetime required in the type of `a` [E0621]
-}
-
-fn main() {
-    let _test = foo(&A);
-}
diff --git a/src/test/compile-fail/issue-14309.rs b/src/test/compile-fail/issue-14309.rs
deleted file mode 100644
index f76fa3e4a8e..00000000000
--- a/src/test/compile-fail/issue-14309.rs
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![deny(improper_ctypes)]
-#![allow(dead_code)]
-
-struct A {
-    x: i32
-}
-
-#[repr(C, packed)]
-struct B {
-    x: i32,
-    y: A
-}
-
-#[repr(C)]
-struct C {
-    x: i32
-}
-
-type A2 = A;
-type B2 = B;
-type C2 = C;
-
-#[repr(C)]
-struct D {
-    x: C,
-    y: A
-}
-
-extern "C" {
-    fn foo(x: A); //~ ERROR type `A` which is not FFI-safe
-    fn bar(x: B); //~ ERROR type `A`
-    fn baz(x: C);
-    fn qux(x: A2); //~ ERROR type `A`
-    fn quux(x: B2); //~ ERROR type `A`
-    fn corge(x: C2);
-    fn fred(x: D); //~ ERROR type `A`
-}
-
-fn main() { }
diff --git a/src/test/compile-fail/issue-14366.rs b/src/test/compile-fail/issue-14366.rs
deleted file mode 100644
index 0b154d0a3ea..00000000000
--- a/src/test/compile-fail/issue-14366.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn main() {
-    let _x = "test" as &::std::any::Any;
-    //~^ ERROR the size for values of type
-}
diff --git a/src/test/compile-fail/issue-1448-2.rs b/src/test/compile-fail/issue-1448-2.rs
deleted file mode 100644
index ddfed3647c2..00000000000
--- a/src/test/compile-fail/issue-1448-2.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// Regression test for issue #1448 and #1386
-
-fn foo(a: u32) -> u32 { a }
-
-fn main() {
-    println!("{}", foo(10i32)); //~ ERROR mismatched types
-}
diff --git a/src/test/compile-fail/issue-14541.rs b/src/test/compile-fail/issue-14541.rs
deleted file mode 100644
index 84c600d2201..00000000000
--- a/src/test/compile-fail/issue-14541.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-struct vec2 { y: f32 }
-struct vec3 { y: f32, z: f32 }
-
-fn make(v: vec2) {
-    let vec3 { y: _, z: _ } = v;
-    //~^ ERROR mismatched types
-    //~| expected type `vec2`
-    //~| found type `vec3`
-    //~| expected struct `vec2`, found struct `vec3`
-}
-
-fn main() { }
diff --git a/src/test/compile-fail/issue-14721.rs b/src/test/compile-fail/issue-14721.rs
deleted file mode 100644
index 58e8e10ee37..00000000000
--- a/src/test/compile-fail/issue-14721.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn main() {
-    let foo = "str";
-    println!("{}", foo.desc); //~ no field `desc` on type `&str`
-}
diff --git a/src/test/compile-fail/issue-1476.rs b/src/test/compile-fail/issue-1476.rs
deleted file mode 100644
index 48bf71f5892..00000000000
--- a/src/test/compile-fail/issue-1476.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn main() {
-    println!("{}", x); //~ ERROR cannot find value `x` in this scope
-}
diff --git a/src/test/compile-fail/issue-14772.rs b/src/test/compile-fail/issue-14772.rs
deleted file mode 100644
index aaaad67be52..00000000000
--- a/src/test/compile-fail/issue-14772.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// compile-flags: --test
-
-#[test]
-mod foo {} //~ ERROR only functions may be used as tests
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-14845.rs b/src/test/compile-fail/issue-14845.rs
deleted file mode 100644
index 74f0833e8d1..00000000000
--- a/src/test/compile-fail/issue-14845.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-
-struct X {
-    a: [u8; 1]
-}
-
-fn main() {
-    let x = X { a: [0] };
-    let _f = &x.a as *mut u8; //~ ERROR casting
-
-    let local: [u8; 1] = [0];
-    let _v = &local as *mut u8; //~ ERROR casting
-}
diff --git a/src/test/compile-fail/issue-14853.rs b/src/test/compile-fail/issue-14853.rs
deleted file mode 100644
index e4da3e4fa43..00000000000
--- a/src/test/compile-fail/issue-14853.rs
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-use std::fmt::Debug;
-
-trait Str {}
-
-trait Something: Sized {
-    fn yay<T: Debug>(_: Option<Self>, thing: &[T]);
-}
-
-struct X { data: u32 }
-
-impl Something for X {
-    fn yay<T: Str>(_:Option<X>, thing: &[T]) {
-    //~^ ERROR E0276
-    }
-}
-
-fn main() {
-    let arr = &["one", "two", "three"];
-    println!("{:?}", Something::yay(None::<X>, arr));
-}
diff --git a/src/test/compile-fail/issue-14915.rs b/src/test/compile-fail/issue-14915.rs
deleted file mode 100644
index 810d6656a8f..00000000000
--- a/src/test/compile-fail/issue-14915.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![feature(box_syntax)]
-
-fn main() {
-    let x: Box<isize> = box 0;
-
-    println!("{}", x + 1);
-    //~^ ERROR binary operation `+` cannot be applied to type `std::boxed::Box<isize>`
-}
diff --git a/src/test/compile-fail/issue-15034.rs b/src/test/compile-fail/issue-15034.rs
deleted file mode 100644
index a62e46820d3..00000000000
--- a/src/test/compile-fail/issue-15034.rs
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-pub struct Lexer<'a> {
-    input: &'a str,
-}
-
-impl<'a> Lexer<'a> {
-    pub fn new(input: &'a str) -> Lexer<'a> {
-        Lexer { input: input }
-    }
-}
-
-struct Parser<'a> {
-    lexer: &'a mut Lexer<'a>,
-}
-
-impl<'a> Parser<'a> {
-    pub fn new(lexer: &'a mut Lexer) -> Parser<'a> {
-        Parser { lexer: lexer }
-        //~^ ERROR 27:25: 27:30: explicit lifetime required in the type of `lexer` [E0621]
-    }
-}
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-15094.rs b/src/test/compile-fail/issue-15094.rs
deleted file mode 100644
index 1dd6763cbe5..00000000000
--- a/src/test/compile-fail/issue-15094.rs
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![feature(fn_traits, unboxed_closures)]
-
-use std::{fmt, ops};
-
-struct Debuger<T> {
-    x: T
-}
-
-impl<T: fmt::Debug> ops::FnOnce<(),> for Debuger<T> {
-    type Output = ();
-    fn call_once(self, _args: ()) {
-    //~^ ERROR `call_once` has an incompatible type for trait
-    //~| expected type `extern "rust-call" fn
-    //~| found type `fn
-        println!("{:?}", self.x);
-    }
-}
-
-fn make_shower<T>(x: T) -> Debuger<T> {
-    Debuger { x: x }
-}
-
-pub fn main() {
-    let show3 = make_shower(3);
-    show3();
-}
diff --git a/src/test/compile-fail/issue-15129.rs b/src/test/compile-fail/issue-15129.rs
deleted file mode 100644
index 7a7ba46de74..00000000000
--- a/src/test/compile-fail/issue-15129.rs
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-pub enum T {
-    T1(()),
-    T2(())
-}
-
-pub enum V {
-    V1(isize),
-    V2(bool)
-}
-
-fn main() {
-    match (T::T1(()), V::V2(true)) {
-    //~^ ERROR non-exhaustive patterns: `(T1(()), V2(_))` not covered
-        (T::T1(()), V::V1(i)) => (),
-        (T::T2(()), V::V2(b)) => ()
-    }
-}
diff --git a/src/test/compile-fail/issue-15167.rs b/src/test/compile-fail/issue-15167.rs
deleted file mode 100644
index d224b8a548c..00000000000
--- a/src/test/compile-fail/issue-15167.rs
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// macro f should not be able to inject a reference to 'n'.
-
-macro_rules! f { () => (n) }
-//~^ ERROR cannot find value `n` in this scope
-//~| ERROR cannot find value `n` in this scope
-//~| ERROR cannot find value `n` in this scope
-//~| ERROR cannot find value `n` in this scope
-
-fn main() -> (){
-    for n in 0..1 {
-        println!("{}", f!());
-    }
-
-    if let Some(n) = None {
-        println!("{}", f!());
-    }
-
-    if false {
-    } else if let Some(n) = None {
-        println!("{}", f!());
-    }
-
-    while let Some(n) = None {
-        println!("{}", f!());
-    }
-}
diff --git a/src/test/compile-fail/issue-15207.rs b/src/test/compile-fail/issue-15207.rs
deleted file mode 100644
index 70da8cf4169..00000000000
--- a/src/test/compile-fail/issue-15207.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn main() {
-    loop {
-        break.push(1) //~ ERROR no method named `push` found for type `!`
-        ;
-    }
-}
diff --git a/src/test/compile-fail/issue-15381.rs b/src/test/compile-fail/issue-15381.rs
deleted file mode 100644
index 1cdd803971b..00000000000
--- a/src/test/compile-fail/issue-15381.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn main() {
-    let values: Vec<u8> = vec![1,2,3,4,5,6,7,8];
-
-    for &[x,y,z] in values.chunks(3).filter(|&xs| xs.len() == 3) {
-        //~^ ERROR refutable pattern in `for` loop binding: `&[]` not covered
-        println!("y={}", y);
-    }
-}
diff --git a/src/test/compile-fail/issue-15756.rs b/src/test/compile-fail/issue-15756.rs
deleted file mode 100644
index c123e85a0e0..00000000000
--- a/src/test/compile-fail/issue-15756.rs
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-use std::slice::Chunks;
-use std::slice::ChunksMut;
-
-fn dft_iter<'a, T>(arg1: Chunks<'a,T>, arg2: ChunksMut<'a,T>)
-{
-    for
-    &mut something
-    //~^ ERROR the size for values of type
-    in arg2
-    {
-    }
-}
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-15783.rs b/src/test/compile-fail/issue-15783.rs
deleted file mode 100644
index 37a2f1582bf..00000000000
--- a/src/test/compile-fail/issue-15783.rs
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-pub fn foo(params: Option<&[&str]>) -> usize {
-    params.unwrap().first().unwrap().len()
-}
-
-fn main() {
-    let name = "Foo";
-    let x = Some(&[name]);
-    let msg = foo(x);
-//~^ ERROR mismatched types
-//~| expected type `std::option::Option<&[&str]>`
-//~| found type `std::option::Option<&[&str; 1]>`
-//~| expected slice, found array of 1 elements
-    assert_eq!(msg, 3);
-}
diff --git a/src/test/compile-fail/issue-15896.rs b/src/test/compile-fail/issue-15896.rs
deleted file mode 100644
index 35ef9ba2b4b..00000000000
--- a/src/test/compile-fail/issue-15896.rs
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2012-2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// Regression test for #15896. It used to ICE rustc.
-
-fn main() {
-    enum R { REB(()) }
-    struct Tau { t: usize }
-    enum E { B(R, Tau) }
-
-    let e = E::B(R::REB(()), Tau { t: 3 });
-    let u = match e {
-        E::B(
-          Tau{t: x},
-          //~^ ERROR mismatched types
-          //~| expected type `main::R`
-          //~| found type `main::Tau`
-          //~| expected enum `main::R`, found struct `main::Tau`
-          _) => x,
-    };
-}
diff --git a/src/test/compile-fail/issue-15965.rs b/src/test/compile-fail/issue-15965.rs
deleted file mode 100644
index 76ba5a0f4b3..00000000000
--- a/src/test/compile-fail/issue-15965.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn main() {
-    return
-        { return () }
-//~^ ERROR type annotations needed [E0282]
-    ()
-    ;
-}
diff --git a/src/test/compile-fail/issue-16048.rs b/src/test/compile-fail/issue-16048.rs
deleted file mode 100644
index cda83fe54b0..00000000000
--- a/src/test/compile-fail/issue-16048.rs
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-trait NoLifetime {
-    fn get<'p, T : Test<'p>>(&self) -> T;
-    //~^ NOTE lifetimes in impl do not match this method in trait
-}
-
-trait Test<'p> {
-    fn new(buf: &'p mut [u8]) -> Self;
-}
-
-struct Foo<'a> {
-    buf: &'a mut [u8],
-}
-
-impl<'a> Test<'a> for Foo<'a> {
-    fn new(buf: &'a mut [u8]) -> Foo<'a> {
-        Foo { buf: buf }
-    }
-}
-
-impl<'a> NoLifetime for Foo<'a> {
-    fn get<'p, T : Test<'a>>(&self) -> T {
-    //~^ ERROR E0195
-    //~| NOTE lifetimes do not match method in trait
-        return *self as T;
-    }
-}
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-16098.rs b/src/test/compile-fail/issue-16098.rs
deleted file mode 100644
index 68ac19b383f..00000000000
--- a/src/test/compile-fail/issue-16098.rs
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-macro_rules! prob1 {
-    (0) => {
-        0
-    };
-    ($n:expr) => {
-        if ($n % 3 == 0) || ($n % 5 == 0) {
-            $n + prob1!($n - 1); //~ ERROR recursion limit reached while expanding the macro `prob1`
-        } else {
-            prob1!($n - 1);
-        }
-    };
-}
-
-fn main() {
-    println!("Problem 1: {}", prob1!(1000));
-}
diff --git a/src/test/compile-fail/issue-16149.rs b/src/test/compile-fail/issue-16149.rs
deleted file mode 100644
index 60117bd88d4..00000000000
--- a/src/test/compile-fail/issue-16149.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-extern {
-    static externalValue: isize;
-}
-
-fn main() {
-    let boolValue = match 42 {
-        externalValue => true,
-        //~^ ERROR match bindings cannot shadow statics
-        _ => false
-    };
-}
diff --git a/src/test/compile-fail/issue-16250.rs b/src/test/compile-fail/issue-16250.rs
deleted file mode 100644
index f9d01003005..00000000000
--- a/src/test/compile-fail/issue-16250.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![deny(warnings)]
-
-pub struct Foo;
-
-extern {
-    pub fn foo(x: (Foo)); //~ ERROR unspecified layout
-}
-
-fn main() {
-}
diff --git a/src/test/compile-fail/issue-16338.rs b/src/test/compile-fail/issue-16338.rs
deleted file mode 100644
index 438073e3b2f..00000000000
--- a/src/test/compile-fail/issue-16338.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-struct Slice<T> {
-    data: *const T,
-    len: usize,
-}
-
-fn main() {
-    let Slice { data: data, len: len } = "foo";
-    //~^ ERROR mismatched types
-    //~| found type `Slice<_>`
-}
diff --git a/src/test/compile-fail/issue-16401.rs b/src/test/compile-fail/issue-16401.rs
deleted file mode 100644
index 3060bbea43c..00000000000
--- a/src/test/compile-fail/issue-16401.rs
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-struct Slice<T> {
-    data: *const T,
-    len: usize,
-}
-
-fn main() {
-    match () {
-        Slice { data: data, len: len } => (),
-        //~^ ERROR mismatched types
-        //~| expected type `()`
-        //~| found type `Slice<_>`
-        //~| expected (), found struct `Slice`
-        _ => unreachable!()
-    }
-}
diff --git a/src/test/compile-fail/issue-16538.rs b/src/test/compile-fail/issue-16538.rs
deleted file mode 100644
index cc652119377..00000000000
--- a/src/test/compile-fail/issue-16538.rs
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![allow(safe_extern_statics)]
-
-mod Y {
-    pub type X = usize;
-    extern {
-        pub static x: *const usize;
-    }
-    pub fn foo(value: *const X) -> *const X {
-        value
-    }
-}
-
-static foo: *const Y::X = Y::foo(Y::x as *const Y::X);
-//~^ ERROR `*const usize` cannot be shared between threads safely [E0277]
-//~| ERROR E0015
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-16562.rs b/src/test/compile-fail/issue-16562.rs
deleted file mode 100644
index a400263a243..00000000000
--- a/src/test/compile-fail/issue-16562.rs
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-trait MatrixShape {}
-
-struct Col<D, C> {
-    data: D,
-    col: C,
-}
-
-trait Collection { fn len(&self) -> usize; }
-
-impl<T, M: MatrixShape> Collection for Col<M, usize> {
-//~^ ERROR type parameter `T` is not constrained
-    fn len(&self) -> usize {
-        unimplemented!()
-    }
-}
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-16683.rs b/src/test/compile-fail/issue-16683.rs
deleted file mode 100644
index fcbf8a3d351..00000000000
--- a/src/test/compile-fail/issue-16683.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-trait T<'a> {
-    fn a(&'a self) -> &'a bool;
-    fn b(&self) {
-        self.a(); //~ ERROR cannot infer
-    }
-}
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-16922.rs b/src/test/compile-fail/issue-16922.rs
deleted file mode 100644
index 1768c834cb3..00000000000
--- a/src/test/compile-fail/issue-16922.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-use std::any::Any;
-
-fn foo<T: Any>(value: &T) -> Box<Any> {
-    Box::new(value) as Box<Any>
-    //~^ ERROR explicit lifetime required in the type of `value` [E0621]
-}
-
-fn main() {
-    let _ = foo(&5);
-}
diff --git a/src/test/compile-fail/issue-16939.rs b/src/test/compile-fail/issue-16939.rs
deleted file mode 100644
index e16c58b8a6c..00000000000
--- a/src/test/compile-fail/issue-16939.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// Make sure we don't ICE when making an overloaded call with the
-// wrong arity.
-
-fn _foo<F: Fn()> (f: F) {
-    |t| f(t); //~ ERROR E0057
-}
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-16966.rs b/src/test/compile-fail/issue-16966.rs
deleted file mode 100644
index ecf81c8af17..00000000000
--- a/src/test/compile-fail/issue-16966.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// error-pattern:type annotations needed
-fn main() {
-    panic!(
-        std::default::Default::default()
-    );
-}
diff --git a/src/test/compile-fail/issue-1697.rs b/src/test/compile-fail/issue-1697.rs
deleted file mode 100644
index f8a68264339..00000000000
--- a/src/test/compile-fail/issue-1697.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2012-2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// Testing that we don't fail abnormally after hitting the errors
-
-use unresolved::*; //~ ERROR unresolved import `unresolved` [E0432]
-                   //~^ Maybe a missing `extern crate unresolved;`?
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-16994.rs b/src/test/compile-fail/issue-16994.rs
deleted file mode 100644
index ae4e8ce1df8..00000000000
--- a/src/test/compile-fail/issue-16994.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![feature(rustc_attrs)]
-
-fn cb<'a,T>(_x: Box<Fn((&'a i32, &'a (Vec<&'static i32>, bool))) -> T>) -> T {
-    panic!()
-}
-
-#[rustc_error]
-fn main() { //~ ERROR compilation successful
-    cb(Box::new(|(k, &(ref v, b))| (*k, v.clone(), b)));
-}
diff --git a/src/test/compile-fail/issue-17001.rs b/src/test/compile-fail/issue-17001.rs
deleted file mode 100644
index 413e8b464ff..00000000000
--- a/src/test/compile-fail/issue-17001.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-mod foo {}
-
-fn main() {
-    let p = foo { x: () }; //~ ERROR expected struct, variant or union type, found module `foo`
-}
diff --git a/src/test/compile-fail/issue-17025.rs b/src/test/compile-fail/issue-17025.rs
deleted file mode 100644
index f250103b144..00000000000
--- a/src/test/compile-fail/issue-17025.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// ignore-test the unsized enum no longer compiles
-
-enum A {
-    B(char),
-    C([Box<A>]),
-}
-
-fn c(c:char) {
-    A::B(c);
-    //~^ ERROR cannot move a value of type A: the size of A cannot be statically determined
-}
-
-pub fn main() {}
diff --git a/src/test/compile-fail/issue-17033.rs b/src/test/compile-fail/issue-17033.rs
deleted file mode 100644
index 1cd43cbb0f8..00000000000
--- a/src/test/compile-fail/issue-17033.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn f<'r>(p: &'r mut fn(p: &mut ())) {
-    (*p)(()) //~  ERROR mismatched types
-             //~| expected type `&mut ()`
-             //~| found type `()`
-             //~| expected &mut (), found ()
-}
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-17252.rs b/src/test/compile-fail/issue-17252.rs
deleted file mode 100644
index 1c3e6890c8e..00000000000
--- a/src/test/compile-fail/issue-17252.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-const FOO: usize = FOO; //~ ERROR E0391
-
-fn main() {
-    let _x: [u8; FOO]; // caused stack overflow prior to fix
-    let _y: usize = 1 + {
-        const BAR: usize = BAR;
-        let _z: [u8; BAR]; // caused stack overflow prior to fix
-        1
-    };
-}
diff --git a/src/test/compile-fail/issue-17337.rs b/src/test/compile-fail/issue-17337.rs
deleted file mode 100644
index 1208321b529..00000000000
--- a/src/test/compile-fail/issue-17337.rs
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![feature(staged_api)]
-#![deny(deprecated)]
-
-#![unstable(feature = "test_feature", issue = "0")]
-
-struct Foo;
-
-impl Foo {
-    #[unstable(feature = "test_feature", issue = "0")]
-    #[rustc_deprecated(since = "1.0.0", reason = "text")]
-    fn foo(self) {}
-}
-
-fn main() {
-    Foo
-    .foo(); //~ ERROR use of deprecated item
-}
diff --git a/src/test/compile-fail/issue-17373.rs b/src/test/compile-fail/issue-17373.rs
deleted file mode 100644
index f6e6a8a0852..00000000000
--- a/src/test/compile-fail/issue-17373.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn main() {
-    *return //~ ERROR type `!` cannot be dereferenced
-    ;
-}
diff --git a/src/test/compile-fail/issue-17385.rs b/src/test/compile-fail/issue-17385.rs
deleted file mode 100644
index eb293c79247..00000000000
--- a/src/test/compile-fail/issue-17385.rs
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-struct X(isize);
-
-enum Enum {
-    Variant1,
-    Variant2
-}
-
-impl Drop for X {
-    fn drop(&mut self) {}
-}
-impl Drop for Enum {
-    fn drop(&mut self) {}
-}
-
-fn main() {
-    let foo = X(1);
-    drop(foo);
-    match foo { //~ ERROR use of moved value
-        X(1) => (),
-        _ => unreachable!()
-    }
-
-    let e = Enum::Variant2;
-    drop(e);
-    match e { //~ ERROR use of moved value
-        Enum::Variant1 => unreachable!(),
-        Enum::Variant2 => ()
-    }
-}
diff --git a/src/test/compile-fail/issue-17405.rs b/src/test/compile-fail/issue-17405.rs
deleted file mode 100644
index 5a6bd5ed588..00000000000
--- a/src/test/compile-fail/issue-17405.rs
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-enum Foo {
-    Bar(isize)
-}
-
-fn main() {
-    match Foo::Bar(1) {
-        Foo { i } => () //~ ERROR expected struct, variant or union type, found enum `Foo`
-    }
-}
diff --git a/src/test/compile-fail/issue-17431-1.rs b/src/test/compile-fail/issue-17431-1.rs
deleted file mode 100644
index 260cc366fae..00000000000
--- a/src/test/compile-fail/issue-17431-1.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-struct Foo { foo: Option<Option<Foo>> }
-//~^ ERROR recursive type `Foo` has infinite size
-
-impl Foo { fn bar(&self) {} }
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-17431-2.rs b/src/test/compile-fail/issue-17431-2.rs
deleted file mode 100644
index f39fb0e31c6..00000000000
--- a/src/test/compile-fail/issue-17431-2.rs
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-struct Baz { q: Option<Foo> }
-//~^ ERROR recursive type `Baz` has infinite size
-
-struct Foo { q: Option<Baz> }
-//~^ ERROR recursive type `Foo` has infinite size
-
-impl Foo { fn bar(&self) {} }
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-17431-3.rs b/src/test/compile-fail/issue-17431-3.rs
deleted file mode 100644
index 9ba085591f0..00000000000
--- a/src/test/compile-fail/issue-17431-3.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-use std::sync::Mutex;
-
-struct Foo { foo: Mutex<Option<Foo>> }
-//~^ ERROR recursive type `Foo` has infinite size
-
-impl Foo { fn bar(&self) {} }
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-17431-4.rs b/src/test/compile-fail/issue-17431-4.rs
deleted file mode 100644
index 665c3cf8fe6..00000000000
--- a/src/test/compile-fail/issue-17431-4.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-use std::marker;
-
-struct Foo<T> { foo: Option<Option<Foo<T>>>, marker: marker::PhantomData<T> }
-//~^ ERROR recursive type `Foo` has infinite size
-
-impl<T> Foo<T> { fn bar(&self) {} }
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-17431-5.rs b/src/test/compile-fail/issue-17431-5.rs
deleted file mode 100644
index 85ed4d5d634..00000000000
--- a/src/test/compile-fail/issue-17431-5.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-use std::marker;
-
-struct Foo { foo: Bar<Foo> }
-
-struct Bar<T> { x: Bar<Foo> , marker: marker::PhantomData<T> }
-//~^ ERROR recursive type `Bar` has infinite size
-
-impl Foo { fn foo(&self) {} }
-
-fn main() {
-}
diff --git a/src/test/compile-fail/issue-17431-6.rs b/src/test/compile-fail/issue-17431-6.rs
deleted file mode 100644
index 4c1e82c3d6a..00000000000
--- a/src/test/compile-fail/issue-17431-6.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-use std::sync::Mutex;
-
-enum Foo { X(Mutex<Option<Foo>>) }
-//~^ ERROR recursive type `Foo` has infinite size
-
-impl Foo { fn bar(self) {} }
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-17431-7.rs b/src/test/compile-fail/issue-17431-7.rs
deleted file mode 100644
index 71b85da29fc..00000000000
--- a/src/test/compile-fail/issue-17431-7.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-enum Foo { Voo(Option<Option<Foo>>) }
-//~^ ERROR recursive type `Foo` has infinite size
-
-impl Foo { fn bar(&self) {} }
-
-fn main() { }
diff --git a/src/test/compile-fail/issue-17444.rs b/src/test/compile-fail/issue-17444.rs
deleted file mode 100644
index dafcff23838..00000000000
--- a/src/test/compile-fail/issue-17444.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-enum Test {
-    Foo = 0
-}
-
-fn main() {
-    let _x = Test::Foo as *const isize;
-    //~^ ERROR casting `Test` as `*const isize` is invalid
-}
diff --git a/src/test/compile-fail/issue-17458.rs b/src/test/compile-fail/issue-17458.rs
deleted file mode 100644
index f5b7a0c13b7..00000000000
--- a/src/test/compile-fail/issue-17458.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-static X: usize = 0 as *const usize as usize;
-//~^ ERROR: raw pointers cannot be cast to integers in statics
-
-fn main() {
-    assert_eq!(X, 0);
-}
diff --git a/src/test/compile-fail/issue-17545.rs b/src/test/compile-fail/issue-17545.rs
deleted file mode 100644
index 9264305e6ea..00000000000
--- a/src/test/compile-fail/issue-17545.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![feature(fn_traits)]
-
-fn id<T>(x: T) -> T { x }
-
-pub fn foo<'a, F: Fn(&'a ())>(bar: F) {
-    bar.call((
-        &id(()), //~ ERROR borrowed value does not live long enough
-    ));
-}
-fn main() {}
diff --git a/src/test/compile-fail/issue-17546.rs b/src/test/compile-fail/issue-17546.rs
deleted file mode 100644
index fe125b973d9..00000000000
--- a/src/test/compile-fail/issue-17546.rs
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-use foo::MyEnum::Result;
-use foo::NoResult; // Through a re-export
-
-mod foo {
-    pub use self::MyEnum::NoResult;
-
-    pub enum MyEnum {
-        Result,
-        NoResult
-    }
-
-    fn new() -> NoResult<MyEnum, String> {
-        //~^ ERROR expected type, found variant `NoResult`
-        unimplemented!()
-    }
-}
-
-mod bar {
-    use foo::MyEnum::Result;
-    use foo;
-
-    fn new() -> Result<foo::MyEnum, String> {
-        //~^ ERROR expected type, found variant `Result`
-        unimplemented!()
-    }
-}
-
-fn new() -> Result<foo::MyEnum, String> {
-    //~^ ERROR expected type, found variant `Result`
-    unimplemented!()
-}
-
-fn newer() -> NoResult<foo::MyEnum, String> {
-    //~^ ERROR expected type, found variant `NoResult`
-    unimplemented!()
-}
-
-fn main() {
-    let _ = new();
-}
diff --git a/src/test/compile-fail/issue-17551.rs b/src/test/compile-fail/issue-17551.rs
deleted file mode 100644
index b55863f0dda..00000000000
--- a/src/test/compile-fail/issue-17551.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-use std::marker;
-
-struct B<T>(marker::PhantomData<T>);
-
-fn main() {
-    let foo = B(marker::PhantomData); //~ ERROR type annotations needed
-    let closure = || foo;
-}
diff --git a/src/test/compile-fail/issue-17651.rs b/src/test/compile-fail/issue-17651.rs
deleted file mode 100644
index cbd0da4b53c..00000000000
--- a/src/test/compile-fail/issue-17651.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// Test that moves of unsized values within closures are caught
-// and rejected.
-
-fn main() {
-    (|| Box::new(*(&[0][..])))();
-    //~^ ERROR the size for values of type
-}
diff --git a/src/test/compile-fail/issue-17718-const-bad-values.rs b/src/test/compile-fail/issue-17718-const-bad-values.rs
deleted file mode 100644
index 17ec77d77ee..00000000000
--- a/src/test/compile-fail/issue-17718-const-bad-values.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-const C1: &'static mut [usize] = &mut [];
-//~^ ERROR: references in constants may only refer to immutable values
-
-static mut S: usize = 3;
-const C2: &'static mut usize = unsafe { &mut S };
-//~^ ERROR: constants cannot refer to statics
-//~| ERROR: references in constants may only refer to immutable values
-//~| ERROR: references in constants may only refer to immutable values
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-17718-const-borrow.rs b/src/test/compile-fail/issue-17718-const-borrow.rs
deleted file mode 100644
index 07123c69492..00000000000
--- a/src/test/compile-fail/issue-17718-const-borrow.rs
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-use std::cell::UnsafeCell;
-
-const A: UnsafeCell<usize> = UnsafeCell::new(1);
-const B: &'static UnsafeCell<usize> = &A;
-//~^ ERROR: cannot borrow a constant which may contain interior mutability
-
-struct C { a: UnsafeCell<usize> }
-const D: C = C { a: UnsafeCell::new(1) };
-const E: &'static UnsafeCell<usize> = &D.a;
-//~^ ERROR: cannot borrow a constant which may contain interior mutability
-const F: &'static C = &D;
-//~^ ERROR: cannot borrow a constant which may contain interior mutability
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-17718-const-naming.rs b/src/test/compile-fail/issue-17718-const-naming.rs
deleted file mode 100644
index 4857c2fb446..00000000000
--- a/src/test/compile-fail/issue-17718-const-naming.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![warn(unused)]
-#[deny(warnings)]
-
-const foo: isize = 3;
-//~^ ERROR: should have an upper case name such as
-//~^^ ERROR: constant item is never used
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-17718-constants-not-static.rs b/src/test/compile-fail/issue-17718-constants-not-static.rs
deleted file mode 100644
index 9b7ed463499..00000000000
--- a/src/test/compile-fail/issue-17718-constants-not-static.rs
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn id<T>(x: T) -> T { x }
-
-const FOO: usize = 3;
-
-fn foo() -> &'static usize { &id(FOO) }
-//~^ ERROR: borrowed value does not live long enough
-
-fn main() {
-}
diff --git a/src/test/compile-fail/issue-17718-patterns.rs b/src/test/compile-fail/issue-17718-patterns.rs
deleted file mode 100644
index b9f5e98b6fa..00000000000
--- a/src/test/compile-fail/issue-17718-patterns.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-static A1: usize = 1;
-static mut A2: usize = 1;
-const A3: usize = 1;
-
-fn main() {
-    match 1 {
-        A1 => {} //~ ERROR: match bindings cannot shadow statics
-        A2 => {} //~ ERROR: match bindings cannot shadow statics
-        A3 => {}
-        _ => {}
-    }
-}
diff --git a/src/test/compile-fail/issue-17718-references.rs b/src/test/compile-fail/issue-17718-references.rs
deleted file mode 100644
index 586cfebcd16..00000000000
--- a/src/test/compile-fail/issue-17718-references.rs
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![allow(warnings)]
-
-struct Struct { a: usize }
-
-const C: usize = 1;
-static S: usize = 1;
-
-const T1: &'static usize = &C;
-const T2: &'static usize = &S; //~ ERROR: constants cannot refer to statics
-static T3: &'static usize = &C;
-static T4: &'static usize = &S;
-
-const T5: usize = C;
-const T6: usize = S; //~ ERROR: constants cannot refer to statics
-static T7: usize = C;
-static T8: usize = S;
-
-const T9: Struct = Struct { a: C };
-const T10: Struct = Struct { a: S };
-//~^ ERROR: constants cannot refer to statics
-static T11: Struct = Struct { a: C };
-static T12: Struct = Struct { a: S };
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-17718-static-move.rs b/src/test/compile-fail/issue-17718-static-move.rs
deleted file mode 100644
index a5a7117956f..00000000000
--- a/src/test/compile-fail/issue-17718-static-move.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-struct Foo;
-const INIT: Foo = Foo;
-static FOO: Foo = INIT;
-
-fn main() {
-    let _a = FOO; //~ ERROR: cannot move out of static item
-}
diff --git a/src/test/compile-fail/issue-17718-static-sync.rs b/src/test/compile-fail/issue-17718-static-sync.rs
deleted file mode 100644
index c5349d4e82b..00000000000
--- a/src/test/compile-fail/issue-17718-static-sync.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![feature(optin_builtin_traits)]
-
-use std::marker::Sync;
-
-struct Foo;
-impl !Sync for Foo {}
-
-static FOO: usize = 3;
-static BAR: Foo = Foo;
-//~^ ERROR: `Foo` cannot be shared between threads safely [E0277]
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-17728.rs b/src/test/compile-fail/issue-17728.rs
deleted file mode 100644
index 8516a8ea52e..00000000000
--- a/src/test/compile-fail/issue-17728.rs
+++ /dev/null
@@ -1,132 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-use std::fmt::{Debug, Formatter, Error};
-use std::collections::HashMap;
-
-trait HasInventory {
-    fn getInventory<'s>(&'s self) -> &'s mut Inventory;
-    fn addToInventory(&self, item: &Item);
-    fn removeFromInventory(&self, itemName: &str) -> bool;
-}
-
-trait TraversesWorld {
-    fn attemptTraverse(&self, room: &Room, directionStr: &str) -> Result<&Room, &str> {
-        let direction = str_to_direction(directionStr);
-        let maybe_room = room.direction_to_room.get(&direction);
-        match maybe_room {
-            Some(entry) => Ok(entry),
-            //~^ ERROR 25:28: 25:37: lifetime mismatch [E0623]
-            _ => Err("Direction does not exist in room.")
-        }
-    }
-}
-
-
-#[derive(Debug, Eq, PartialEq, Hash)]
-enum RoomDirection {
-    West,
-    East,
-    North,
-    South,
-    Up,
-    Down,
-    In,
-    Out,
-
-    None
-}
-
-struct Room {
-    description: String,
-    items: Vec<Item>,
-    direction_to_room: HashMap<RoomDirection, Room>,
-}
-
-impl Room {
-    fn new(description: &'static str) -> Room {
-        Room {
-            description: description.to_string(),
-            items: Vec::new(),
-            direction_to_room: HashMap::new()
-        }
-    }
-
-    fn add_direction(&mut self, direction: RoomDirection, room: Room) {
-        self.direction_to_room.insert(direction, room);
-    }
-}
-
-struct Item {
-    name: String,
-}
-
-struct Inventory {
-    items: Vec<Item>,
-}
-
-impl Inventory {
-    fn new() -> Inventory {
-        Inventory {
-            items: Vec::new()
-        }
-    }
-}
-
-struct Player {
-    name: String,
-    inventory: Inventory,
-}
-
-impl Player {
-    fn new(name: &'static str) -> Player {
-        Player {
-            name: name.to_string(),
-            inventory: Inventory::new()
-        }
-    }
-}
-
-impl TraversesWorld for Player {
-}
-
-impl Debug for Player {
-    fn fmt(&self, formatter: &mut Formatter) -> Result<(), Error> {
-        formatter.write_str("Player{ name:");
-        formatter.write_str(&self.name);
-        formatter.write_str(" }");
-        Ok(())
-    }
-}
-
-fn str_to_direction(to_parse: &str) -> RoomDirection {
-    match to_parse { //~ ERROR match arms have incompatible types
-        "w" | "west" => RoomDirection::West,
-        "e" | "east" => RoomDirection::East,
-        "n" | "north" => RoomDirection::North,
-        "s" | "south" => RoomDirection::South,
-        "in" => RoomDirection::In,
-        "out" => RoomDirection::Out,
-        "up" => RoomDirection::Up,
-        "down" => RoomDirection::Down,
-        _ => None
-    }
-}
-
-fn main() {
-    let mut player = Player::new("Test player");
-    let mut room = Room::new("A test room");
-    println!("Made a player: {:?}", player);
-    println!("Direction parse: {:?}", str_to_direction("east"));
-    match player.attemptTraverse(&room, "west") {
-        Ok(_) => println!("Was able to move west"),
-        Err(msg) => println!("Not able to move west: {}", msg)
-    };
-}
diff --git a/src/test/compile-fail/issue-17740.rs b/src/test/compile-fail/issue-17740.rs
deleted file mode 100644
index 1d5ef4360dc..00000000000
--- a/src/test/compile-fail/issue-17740.rs
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-struct Foo<'a> {
-    data: &'a[u8],
-}
-
-impl <'a> Foo<'a>{
-    fn bar(self: &mut Foo) {
-    //~^ mismatched method receiver
-    //~| expected type `Foo<'a>`
-    //~| found type `Foo<'_>`
-    //~| lifetime mismatch
-    //~| mismatched method receiver
-    //~| expected type `Foo<'a>`
-    //~| found type `Foo<'_>`
-    //~| lifetime mismatch
-    }
-}
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-17758.rs b/src/test/compile-fail/issue-17758.rs
deleted file mode 100644
index a47f5c16a46..00000000000
--- a/src/test/compile-fail/issue-17758.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// Test that regionck suggestions in a provided method of a trait
-// don't ICE
-
-trait Foo<'a> {
-    fn foo(&'a self);
-    fn bar(&self) {
-        self.foo();
-        //~^ ERROR cannot infer
-    }
-}
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-17800.rs b/src/test/compile-fail/issue-17800.rs
deleted file mode 100644
index f7cae91aa93..00000000000
--- a/src/test/compile-fail/issue-17800.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-enum MyOption<T> {
-    MySome(T),
-    MyNone,
-}
-
-fn main() {
-    match MyOption::MySome(42) {
-        MyOption::MySome { x: 42 } => (),
-        //~^ ERROR variant `MyOption::MySome` does not have a field named `x`
-        //~| ERROR pattern does not mention field `0`
-        _ => (),
-    }
-}
diff --git a/src/test/compile-fail/issue-17904-2.rs b/src/test/compile-fail/issue-17904-2.rs
deleted file mode 100644
index a15ccb71aa7..00000000000
--- a/src/test/compile-fail/issue-17904-2.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// Test that we can parse a unit struct with a where clause, even if
-// it leads to an error later on since `T` is unused.
-
-struct Foo<T> where T: Copy; //~ ERROR parameter `T` is never used
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-17905.rs b/src/test/compile-fail/issue-17905.rs
deleted file mode 100644
index f11d482ea16..00000000000
--- a/src/test/compile-fail/issue-17905.rs
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#[derive(Debug)]
-struct Pair<T, V> (T, V);
-
-impl Pair<
-    &str, //~ ERROR missing lifetime specifier
-    isize
-> {
-    fn say(self: &Pair<&str, isize>) {
-        println!("{}", self);
-    }
-}
-
-fn main() {
-    let result = &Pair("shane", 1);
-    result.say();
-}
diff --git a/src/test/compile-fail/issue-17933.rs b/src/test/compile-fail/issue-17933.rs
deleted file mode 100644
index 049a0665c54..00000000000
--- a/src/test/compile-fail/issue-17933.rs
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-pub static X: usize = 1;
-
-fn main() {
-    match 1 {
-        self::X => { },
-        //~^ ERROR expected unit struct/variant or constant, found static `self::X`
-        _       => { },
-    }
-}
diff --git a/src/test/compile-fail/issue-17954.rs b/src/test/compile-fail/issue-17954.rs
deleted file mode 100644
index 4211057610b..00000000000
--- a/src/test/compile-fail/issue-17954.rs
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// revisions: ast mir
-//[mir]compile-flags: -Z borrowck=mir
-
-#![feature(thread_local)]
-
-#[thread_local]
-static FOO: u8 = 3;
-
-fn main() {
-    let a = &FOO;
-    //[mir]~^ ERROR `FOO` does not live long enough [E0597]
-    //[mir]~| does not live long enough
-    //[mir]~| NOTE borrowed value must be valid for the static lifetime
-    //[ast]~^^^^ ERROR borrowed value does not live long enough
-    //[ast]~| does not live long enough
-    //[ast]~| NOTE borrowed value must be valid for the static lifetime
-
-    std::thread::spawn(move || {
-        println!("{}", a);
-    });
-}
-//[mir]~^ borrowed value only lives until here
-//[ast]~^^ temporary value only lives until here
diff --git a/src/test/compile-fail/issue-17959.rs b/src/test/compile-fail/issue-17959.rs
deleted file mode 100644
index 37c8173c4f6..00000000000
--- a/src/test/compile-fail/issue-17959.rs
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-extern crate core;
-
-use core::ops::Drop;
-
-trait Bar {}
-
-struct G<T: ?Sized> {
-    _ptr: *const T
-}
-
-impl<T> Drop for G<T> {
-//~^ ERROR: The requirement `T: std::marker::Sized` is added only by the Drop impl. [E0367]
-    fn drop(&mut self) {
-        if !self._ptr.is_null() {
-        }
-    }
-}
-
-fn main() {
-    let x:G<Bar>;
-}
diff --git a/src/test/compile-fail/issue-17994.rs b/src/test/compile-fail/issue-17994.rs
deleted file mode 100644
index 25141b9b825..00000000000
--- a/src/test/compile-fail/issue-17994.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-trait Tr {}
-type Huh<T> where T: Tr = isize; //~  ERROR type parameter `T` is unused
-fn main() {}
diff --git a/src/test/compile-fail/issue-17999.rs b/src/test/compile-fail/issue-17999.rs
deleted file mode 100644
index 88945f80eae..00000000000
--- a/src/test/compile-fail/issue-17999.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![deny(unused_variables)]
-
-fn main() {
-    for _ in 1..101 {
-        let x = (); //~ ERROR: unused variable: `x`
-        match () {
-            a => {} //~ ERROR: unused variable: `a`
-        }
-    }
-}
diff --git a/src/test/compile-fail/issue-18058.rs b/src/test/compile-fail/issue-18058.rs
deleted file mode 100644
index 4c815e689d4..00000000000
--- a/src/test/compile-fail/issue-18058.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-impl Undefined {}
-//~^ ERROR cannot find type `Undefined` in this scope
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-18107.rs b/src/test/compile-fail/issue-18107.rs
deleted file mode 100644
index 260038b7add..00000000000
--- a/src/test/compile-fail/issue-18107.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-pub trait AbstractRenderer {}
-
-fn _create_render(_: &()) ->
-    AbstractRenderer
-//~^ ERROR the size for values of type
-{
-    match 0 {
-        _ => unimplemented!()
-    }
-}
-
-fn main() {
-}
diff --git a/src/test/compile-fail/issue-18118-2.rs b/src/test/compile-fail/issue-18118-2.rs
deleted file mode 100644
index 6efe532b5fd..00000000000
--- a/src/test/compile-fail/issue-18118-2.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-pub fn main() {
-    const z: &'static isize = {
-        static p: isize = 3;
-        &p
-        //~^ ERROR constants cannot refer to statics, use a constant instead
-    };
-}
diff --git a/src/test/compile-fail/issue-18118.rs b/src/test/compile-fail/issue-18118.rs
deleted file mode 100644
index 7194c159c1e..00000000000
--- a/src/test/compile-fail/issue-18118.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-pub fn main() {
-    const z: &'static isize = {
-        //~^ ERROR let bindings in constants are unstable
-        //~| ERROR statements in constants are unstable
-        let p = 3;
-        //~^ ERROR let bindings in constants are unstable
-        //~| ERROR statements in constants are unstable
-        &p //~ ERROR `p` does not live long enough
-        //~^ ERROR let bindings in constants are unstable
-    };
-}
diff --git a/src/test/compile-fail/issue-18119.rs b/src/test/compile-fail/issue-18119.rs
deleted file mode 100644
index 412f7566f47..00000000000
--- a/src/test/compile-fail/issue-18119.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-const X: u8 = 1;
-static Y: u8 = 1;
-fn foo() {}
-
-impl X {}
-//~^ ERROR expected type, found constant `X`
-impl Y {}
-//~^ ERROR expected type, found static `Y`
-impl foo {}
-//~^ ERROR expected type, found function `foo`
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-18159.rs b/src/test/compile-fail/issue-18159.rs
deleted file mode 100644
index 8991eded3d6..00000000000
--- a/src/test/compile-fail/issue-18159.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn main() {
-    let x; //~ ERROR type annotations needed
-}
diff --git a/src/test/compile-fail/issue-18294.rs b/src/test/compile-fail/issue-18294.rs
deleted file mode 100644
index efc1ba1635c..00000000000
--- a/src/test/compile-fail/issue-18294.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn main() {
-    const X: u32 = 1;
-    const Y: usize = &X as *const u32 as usize; //~ ERROR E0018
-    println!("{}", Y);
-}
diff --git a/src/test/compile-fail/issue-18389.rs b/src/test/compile-fail/issue-18389.rs
deleted file mode 100644
index aad3d52153a..00000000000
--- a/src/test/compile-fail/issue-18389.rs
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-use std::any::Any;
-use std::any::TypeId;
-
-trait Private<P, R> {
-    fn call(&self, p: P, r: R);
-}
-pub trait Public: Private<
-//~^ ERROR private trait `Private<<Self as Public>::P, <Self as Public>::R>` in public interface
-    <Self as Public>::P,
-    <Self as Public>::R
-> {
-    type P;
-    type R;
-
-    fn call_inner(&self);
-}
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-18400.rs b/src/test/compile-fail/issue-18400.rs
deleted file mode 100644
index dd17189aeea..00000000000
--- a/src/test/compile-fail/issue-18400.rs
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-trait Set<T> {
-    fn contains(&self, _: T) -> bool;
-    fn set(&mut self, _: T);
-}
-
-impl<'a, T, S> Set<&'a [T]> for S where
-    T: Copy,
-    S: Set<T>,
-{
-    fn contains(&self, bits: &[T]) -> bool {
-        bits.iter().all(|&bit| self.contains(bit))
-    }
-
-    fn set(&mut self, bits: &[T]) {
-        for &bit in bits {
-            self.set(bit)
-        }
-    }
-}
-
-fn main() {
-    let bits: &[_] = &[0, 1];
-
-    0.contains(bits);
-    //~^ ERROR overflow
-}
diff --git a/src/test/compile-fail/issue-18423.rs b/src/test/compile-fail/issue-18423.rs
deleted file mode 100644
index 5945a7a1c9a..00000000000
--- a/src/test/compile-fail/issue-18423.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// Test that `Box` cannot be used with a lifetime parameter.
-
-struct Foo<'a> {
-    x: Box<'a, isize> //~ ERROR wrong number of lifetime parameters
-}
-
-pub fn main() {
-}
diff --git a/src/test/compile-fail/issue-18446.rs b/src/test/compile-fail/issue-18446.rs
deleted file mode 100644
index 60afea5a621..00000000000
--- a/src/test/compile-fail/issue-18446.rs
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// Test that name clashes between the method in an impl for the type
-// and the method in the trait when both are in the same scope.
-
-trait T {
-    fn foo(&self);
-}
-
-impl<'a> T + 'a {
-    fn foo(&self) {}
-}
-
-impl T for i32 {
-    fn foo(&self) {}
-}
-
-fn main() {
-    let x: &T = &0i32;
-    x.foo(); //~ ERROR multiple applicable items in scope [E0034]
-}
diff --git a/src/test/compile-fail/issue-18532.rs b/src/test/compile-fail/issue-18532.rs
deleted file mode 100644
index 2be5fdcac4e..00000000000
--- a/src/test/compile-fail/issue-18532.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// Test that overloaded call parameter checking does not ICE
-// when a type error or unconstrained type variable propagates
-// into it.
-
-fn main() {
-    (return)((),()); //~ ERROR expected function, found `!`
-}
diff --git a/src/test/compile-fail/issue-18566.rs b/src/test/compile-fail/issue-18566.rs
deleted file mode 100644
index 41e82d0cd89..00000000000
--- a/src/test/compile-fail/issue-18566.rs
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-use std::ops::Deref;
-
-struct MyPtr<'a>(&'a mut usize);
-impl<'a> Deref for MyPtr<'a> {
-    type Target = usize;
-
-    fn deref<'b>(&'b self) -> &'b usize { self.0 }
-}
-
-trait Tr {
-    fn poke(&self, s: &mut usize);
-}
-
-impl Tr for usize {
-    fn poke(&self, s: &mut usize)  {
-        *s = 2;
-    }
-}
-
-fn main() {
-    let s = &mut 1;
-
-    MyPtr(s).poke(s);
-    //~^ ERROR cannot borrow `*s` as mutable more than once at a time
-}
diff --git a/src/test/compile-fail/issue-18611.rs b/src/test/compile-fail/issue-18611.rs
deleted file mode 100644
index a3ad76e1be0..00000000000
--- a/src/test/compile-fail/issue-18611.rs
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn add_state(op: <isize as HasState>::State) {
-//~^ ERROR `isize: HasState` is not satisfied
-}
-
-trait HasState {
-    type State;
-}
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-1871.rs b/src/test/compile-fail/issue-1871.rs
deleted file mode 100644
index e4d132c8641..00000000000
--- a/src/test/compile-fail/issue-1871.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// Tests that we don't generate a spurious error about f.honk's type
-// being undeterminable
-fn main() {
-  let f = 42;
-
-  let _g = if f < 5 {
-      f.honk() //~ ERROR no method named `honk` found
-  }
-  else {
-      ()
-  };
-}
diff --git a/src/test/compile-fail/issue-18783.rs b/src/test/compile-fail/issue-18783.rs
deleted file mode 100644
index 9a7b3781f1e..00000000000
--- a/src/test/compile-fail/issue-18783.rs
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-use std::cell::RefCell;
-
-fn main() {
-    let mut y = 1;
-    let c = RefCell::new(vec![]);
-    c.push(Box::new(|| y = 0));
-    c.push(Box::new(|| y = 0));
-//~^ ERROR cannot borrow `y` as mutable more than once at a time
-}
-
-fn ufcs() {
-    let mut y = 1;
-    let c = RefCell::new(vec![]);
-
-    Push::push(&c, Box::new(|| y = 0));
-    Push::push(&c, Box::new(|| y = 0));
-//~^ ERROR cannot borrow `y` as mutable more than once at a time
-}
-
-trait Push<'c> {
-    fn push<'f: 'c>(&self, push: Box<FnMut() + 'f>);
-}
-
-impl<'c> Push<'c> for RefCell<Vec<Box<FnMut() + 'c>>> {
-    fn push<'f: 'c>(&self, fun: Box<FnMut() + 'f>) {
-        self.borrow_mut().push(fun)
-    }
-}
diff --git a/src/test/compile-fail/issue-18919.rs b/src/test/compile-fail/issue-18919.rs
deleted file mode 100644
index cc87a0977a0..00000000000
--- a/src/test/compile-fail/issue-18919.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-type FuncType<'f> = Fn(&isize) -> isize + 'f;
-
-fn ho_func(f: Option<FuncType>) {
-    //~^ ERROR the size for values of type
-}
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-18937.rs b/src/test/compile-fail/issue-18937.rs
deleted file mode 100644
index f7f84e6452d..00000000000
--- a/src/test/compile-fail/issue-18937.rs
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// Regression test for #18937.
-
-use std::fmt;
-
-#[derive(Debug)]
-struct MyString<'a>(&'a String);
-
-struct B {
-    list: Vec<Box<fmt::Debug>>,
-}
-
-trait A<'a> {
-    fn foo<F>(&mut self, f: F)
-        where F: fmt::Debug + 'a,
-              Self: Sized;
-}
-
-impl<'a> A<'a> for B {
-    fn foo<F>(&mut self, f: F) //~ ERROR impl has stricter
-        where F: fmt::Debug + 'static,
-    {
-        self.list.push(Box::new(f));
-    }
-}
-
-fn main() {
-    let mut b = B { list: Vec::new() };
-
-    // Create a borrowed pointer, put it in `b`, then drop what's borrowing it
-    let a = "hello".to_string();
-    b.foo(MyString(&a));
-
-    // Drop the data which `b` has a reference to
-    drop(a);
-
-    // Use the data, probably segfaulting
-    for b in b.list.iter() {
-        println!("{:?}", b);
-    }
-}
diff --git a/src/test/compile-fail/issue-18959.rs b/src/test/compile-fail/issue-18959.rs
deleted file mode 100644
index 7a6d012a3b6..00000000000
--- a/src/test/compile-fail/issue-18959.rs
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-pub trait Foo { fn foo<T>(&self, ext_thing: &T); }
-pub trait Bar: Foo { }
-impl<T: Foo> Bar for T { }
-
-pub struct Thing;
-impl Foo for Thing {
-    fn foo<T>(&self, _: &T) {}
-}
-
-#[inline(never)]
-fn foo(b: &Bar) {
-    //~^ ERROR E0038
-    b.foo(&0)
-}
-
-fn main() {
-    let mut thing = Thing;
-    let test: &Bar = &mut thing;
-    foo(test);
-}
diff --git a/src/test/compile-fail/issue-1900.rs b/src/test/compile-fail/issue-1900.rs
deleted file mode 100644
index ccdd9db25c4..00000000000
--- a/src/test/compile-fail/issue-1900.rs
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// error-pattern: `main` function is not allowed to have generic parameters
-fn main<T>() { }
diff --git a/src/test/compile-fail/issue-19086.rs b/src/test/compile-fail/issue-19086.rs
deleted file mode 100644
index ba571ce17fd..00000000000
--- a/src/test/compile-fail/issue-19086.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-use Foo::FooB;
-
-enum Foo {
-    FooB { x: i32, y: i32 }
-}
-
-fn main() {
-    let f = FooB { x: 3, y: 4 };
-    match f {
-        FooB(a, b) => println!("{} {}", a, b),
-        //~^ ERROR expected tuple struct/variant, found struct variant `FooB`
-    }
-}
diff --git a/src/test/compile-fail/issue-19244-1.rs b/src/test/compile-fail/issue-19244-1.rs
deleted file mode 100644
index df34aab4b8f..00000000000
--- a/src/test/compile-fail/issue-19244-1.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-const TUP: (usize,) = (42,);
-
-fn main() {
-    let a: [isize; TUP.1];
-    //~^ ERROR no field `1` on type `(usize,)`
-}
diff --git a/src/test/compile-fail/issue-19244-2.rs b/src/test/compile-fail/issue-19244-2.rs
deleted file mode 100644
index 864f8f6b54e..00000000000
--- a/src/test/compile-fail/issue-19244-2.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-struct MyStruct { field: usize }
-const STRUCT: MyStruct = MyStruct { field: 42 };
-
-fn main() {
-    let a: [isize; STRUCT.nonexistent_field];
-    //~^ no field `nonexistent_field` on type `MyStruct`
-}
diff --git a/src/test/compile-fail/issue-19380.rs b/src/test/compile-fail/issue-19380.rs
deleted file mode 100644
index 322952ffef1..00000000000
--- a/src/test/compile-fail/issue-19380.rs
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-trait Qiz {
-  fn qiz();
-}
-
-struct Foo;
-impl Qiz for Foo {
-  fn qiz() {}
-}
-
-struct Bar {
-  foos: &'static [&'static (Qiz + 'static)]
-//~^ ERROR E0038
-}
-
-const FOO : Foo = Foo;
-const BAR : Bar = Bar { foos: &[&FOO]};
-
-fn main() { }
diff --git a/src/test/compile-fail/issue-19482.rs b/src/test/compile-fail/issue-19482.rs
deleted file mode 100644
index b54f008f8ce..00000000000
--- a/src/test/compile-fail/issue-19482.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// Test that a partially specified trait object with unspecified associated
-// type does not type-check.
-
-trait Foo {
-    type A;
-
-    fn dummy(&self) { }
-}
-
-fn bar(x: &Foo) {}
-//~^ ERROR the associated type `A` (from the trait `Foo`) must be specified
-
-pub fn main() {}
diff --git a/src/test/compile-fail/issue-19521.rs b/src/test/compile-fail/issue-19521.rs
deleted file mode 100644
index 93d95ca0b0f..00000000000
--- a/src/test/compile-fail/issue-19521.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn main() {
-    "".homura()(); //~ ERROR no method named `homura` found
-}
diff --git a/src/test/compile-fail/issue-19538.rs b/src/test/compile-fail/issue-19538.rs
deleted file mode 100644
index a6190500582..00000000000
--- a/src/test/compile-fail/issue-19538.rs
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-trait Foo {
-    fn foo<T>(&self, val: T);
-}
-
-trait Bar: Foo { }
-
-pub struct Thing;
-
-impl Foo for Thing {
-    fn foo<T>(&self, val: T) { }
-}
-
-impl Bar for Thing { }
-
-fn main() {
-    let mut thing = Thing;
-    let test: &mut Bar = &mut thing;
-    //~^ ERROR E0038
-    //~| ERROR E0038
-}
diff --git a/src/test/compile-fail/issue-19601.rs b/src/test/compile-fail/issue-19601.rs
deleted file mode 100644
index 02b4932cea8..00000000000
--- a/src/test/compile-fail/issue-19601.rs
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![feature(rustc_attrs)]
-#![allow(warnings)]
-
-trait A<T> {}
-struct B<T> where B<T>: A<B<T>> { t: T }
-
-#[rustc_error]
-fn main() { //~ ERROR compilation successful
-}
diff --git a/src/test/compile-fail/issue-19660.rs b/src/test/compile-fail/issue-19660.rs
deleted file mode 100644
index c4b871a28c5..00000000000
--- a/src/test/compile-fail/issue-19660.rs
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// error-pattern: requires `copy` lang_item
-
-#![feature(lang_items, start, no_core)]
-#![no_core]
-
-#[lang = "sized"]
-trait Sized { }
-
-struct S;
-
-#[start]
-fn main(_: isize, _: *const *const u8) -> isize {
-    let _ = S;
-    0
-}
diff --git a/src/test/compile-fail/issue-19692.rs b/src/test/compile-fail/issue-19692.rs
deleted file mode 100644
index ca1715445e5..00000000000
--- a/src/test/compile-fail/issue-19692.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-struct Homura;
-
-fn akemi(homura: Homura) {
-    let Some(ref madoka) = Some(homura.kaname()); //~ ERROR no method named `kaname` found
-    madoka.clone();
-}
-
-fn main() { }
diff --git a/src/test/compile-fail/issue-19734.rs b/src/test/compile-fail/issue-19734.rs
deleted file mode 100644
index a3820d20aac..00000000000
--- a/src/test/compile-fail/issue-19734.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn main() {}
-
-struct Type;
-
-impl Type {
-    undef!();
-    //~^ ERROR cannot find macro `undef!` in this scope
-}
diff --git a/src/test/compile-fail/issue-19883.rs b/src/test/compile-fail/issue-19883.rs
deleted file mode 100644
index 9b6a87702a9..00000000000
--- a/src/test/compile-fail/issue-19883.rs
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-trait From<Src> {
-    type Output;
-
-    fn from(src: Src) -> <Self as From<Src>>::Output;
-}
-
-trait To: Sized {
-    fn to<Dst: From<Self>>(self) ->
-        <Dst as From<Self>>::Dst
-        //~^ ERROR cannot find associated type `Dst` in trait `From`
-    {
-        From::from(self)
-    }
-}
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-19982.rs b/src/test/compile-fail/issue-19982.rs
deleted file mode 100644
index 9dbca997341..00000000000
--- a/src/test/compile-fail/issue-19982.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![feature(unboxed_closures)]
-
-struct Foo;
-
-impl Fn<(&(),)> for Foo { } //~ ERROR missing lifetime specifier
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-19991.rs b/src/test/compile-fail/issue-19991.rs
deleted file mode 100644
index e07dfaf9fe5..00000000000
--- a/src/test/compile-fail/issue-19991.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// Test if the sugared if-let construct correctly prints "missing an else clause" when an else
-// clause does not exist, instead of the unsympathetic "match arms have incompatible types"
-
-fn main() {
-    if let Some(homura) = Some("madoka") { //~  ERROR missing an else clause
-                                           //~| expected type `()`
-                                           //~| found type `{integer}`
-                                           //~| expected (), found integral variable
-        765
-    };
-}
diff --git a/src/test/compile-fail/issue-20005.rs b/src/test/compile-fail/issue-20005.rs
deleted file mode 100644
index 8db09182fa3..00000000000
--- a/src/test/compile-fail/issue-20005.rs
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-trait From<Src> {
-    type Result;
-
-    fn from(src: Src) -> Self::Result;
-}
-
-trait To {
-    fn to<Dst>(  //~ ERROR the size for values of type
-        self
-    ) -> <Dst as From<Self>>::Result where Dst: From<Self> {
-        From::from(self)
-    }
-}
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-20162.rs b/src/test/compile-fail/issue-20162.rs
deleted file mode 100644
index b2f3a2da516..00000000000
--- a/src/test/compile-fail/issue-20162.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-struct X { x: i32 }
-
-fn main() {
-    let mut b: Vec<X> = vec![];
-    b.sort();
-    //~^ ERROR `X: std::cmp::Ord` is not satisfied
-}
diff --git a/src/test/compile-fail/issue-20225.rs b/src/test/compile-fail/issue-20225.rs
deleted file mode 100644
index da98f21e461..00000000000
--- a/src/test/compile-fail/issue-20225.rs
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![feature(fn_traits, unboxed_closures)]
-
-struct Foo;
-
-impl<'a, T> Fn<(&'a T,)> for Foo {
-  extern "rust-call" fn call(&self, (_,): (T,)) {}
-  //~^ ERROR: has an incompatible type for trait
-  //~| expected reference
-}
-
-impl<'a, T> FnMut<(&'a T,)> for Foo {
-  extern "rust-call" fn call_mut(&mut self, (_,): (T,)) {}
-  //~^ ERROR: has an incompatible type for trait
-  //~| expected reference
-}
-
-impl<'a, T> FnOnce<(&'a T,)> for Foo {
-  type Output = ();
-
-  extern "rust-call" fn call_once(self, (_,): (T,)) {}
-  //~^ ERROR: has an incompatible type for trait
-  //~| expected reference
-}
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-20261.rs b/src/test/compile-fail/issue-20261.rs
deleted file mode 100644
index bb4dbdcd0cb..00000000000
--- a/src/test/compile-fail/issue-20261.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn main() {
-    // NB: this (almost) typechecks when default binding modes are enabled.
-    for (ref i,) in [].iter() {
-        i.clone();
-        //~^ ERROR type annotations needed
-    }
-}
diff --git a/src/test/compile-fail/issue-20313.rs b/src/test/compile-fail/issue-20313.rs
deleted file mode 100644
index dfb23c05036..00000000000
--- a/src/test/compile-fail/issue-20313.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-extern {
-    #[link_name = "llvm.sqrt.f32"]
-    fn sqrt(x: f32) -> f32; //~ ERROR linking to LLVM intrinsics is experimental
-}
-
-fn main(){
-}
diff --git a/src/test/compile-fail/issue-20413.rs b/src/test/compile-fail/issue-20413.rs
deleted file mode 100644
index a48c03aa178..00000000000
--- a/src/test/compile-fail/issue-20413.rs
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-trait Foo {
-  fn answer(self);
-}
-
-struct NoData<T>;
-//~^ ERROR: parameter `T` is never used
-
-impl<T> Foo for T where NoData<T>: Foo {
-//~^ ERROR: overflow evaluating the requirement
-  fn answer(self) {
-    let val: NoData<T> = NoData;
-  }
-}
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-20433.rs b/src/test/compile-fail/issue-20433.rs
deleted file mode 100644
index f760cd59968..00000000000
--- a/src/test/compile-fail/issue-20433.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn main() {}
-
-struct The;
-
-impl The {
-    fn iceman(c: Vec<[i32]>) {}
-    //~^ ERROR the size for values of type
-}
diff --git a/src/test/compile-fail/issue-20605.rs b/src/test/compile-fail/issue-20605.rs
deleted file mode 100644
index 60d012ab134..00000000000
--- a/src/test/compile-fail/issue-20605.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn changer<'a>(mut things: Box<Iterator<Item=&'a mut u8>>) {
-    for item in *things { *item = 0 }
-//~^ ERROR the size for values of type
-}
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-20616-1.rs b/src/test/compile-fail/issue-20616-1.rs
deleted file mode 100644
index 3e29383d62c..00000000000
--- a/src/test/compile-fail/issue-20616-1.rs
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// We need all these 9 issue-20616-N.rs files
-// because we can only catch one parsing error at a time
-
-
-
-type Type_1_<'a, T> = &'a T;
-
-
-type Type_1<'a T> = &'a T; //~ error: expected one of `,`, `:`, or `>`, found `T`
-
-
-//type Type_2 = Type_1_<'static ()>; // error: expected `,` or `>` after lifetime name, found `(`
-
-
-//type Type_3<T> = Box<T,,>; // error: expected type, found `,`
-
-
-//type Type_4<T> = Type_1_<'static,, T>; // error: expected type, found `,`
-
-
-type Type_5_<'a> = Type_1_<'a, ()>;
-
-
-//type Type_5<'a> = Type_1_<'a, (),,>; // error: expected type, found `,`
-
-
-//type Type_6 = Type_5_<'a,,>; // error: expected type, found `,`
-
-
-//type Type_7 = Box<(),,>; // error: expected type, found `,`
-
-
-//type Type_8<'a,,> = &'a (); // error: expected ident, found `,`
-
-
-//type Type_9<T,,> = Box<T>; // error: expected ident, found `,`
diff --git a/src/test/compile-fail/issue-20616-2.rs b/src/test/compile-fail/issue-20616-2.rs
deleted file mode 100644
index 1ec7a74559a..00000000000
--- a/src/test/compile-fail/issue-20616-2.rs
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// We need all these 9 issue-20616-N.rs files
-// because we can only catch one parsing error at a time
-
-
-
-type Type_1_<'a, T> = &'a T;
-
-
-//type Type_1<'a T> = &'a T; // error: expected `,` or `>` after lifetime name, found `T`
-
-
-type Type_2 = Type_1_<'static ()>; //~ error: expected one of `,` or `>`, found `(`
-
-
-//type Type_3<T> = Box<T,,>; // error: expected type, found `,`
-
-
-//type Type_4<T> = Type_1_<'static,, T>; // error: expected type, found `,`
-
-
-type Type_5_<'a> = Type_1_<'a, ()>;
-
-
-//type Type_5<'a> = Type_1_<'a, (),,>; // error: expected type, found `,`
-
-
-//type Type_6 = Type_5_<'a,,>; // error: expected type, found `,`
-
-
-//type Type_7 = Box<(),,>; // error: expected type, found `,`
-
-
-//type Type_8<'a,,> = &'a (); // error: expected ident, found `,`
-
-
-//type Type_9<T,,> = Box<T>; // error: expected ident, found `,`
diff --git a/src/test/compile-fail/issue-20616-3.rs b/src/test/compile-fail/issue-20616-3.rs
deleted file mode 100644
index 885fd246547..00000000000
--- a/src/test/compile-fail/issue-20616-3.rs
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// We need all these 9 issue-20616-N.rs files
-// because we can only catch one parsing error at a time
-
-
-
-type Type_1_<'a, T> = &'a T;
-
-
-//type Type_1<'a T> = &'a T; // error: expected `,` or `>` after lifetime name, found `T`
-
-
-//type Type_2 = Type_1_<'static ()>; // error: expected `,` or `>` after lifetime name, found `(`
-
-
-type Type_3<T> = Box<T,,>; //~ error: expected one of `>`, identifier, lifetime, or type, found `,`
-
-
-//type Type_4<T> = Type_1_<'static,, T>; // error: expected type, found `,`
-
-
-type Type_5_<'a> = Type_1_<'a, ()>;
-
-
-//type Type_5<'a> = Type_1_<'a, (),,>; // error: expected type, found `,`
-
-
-//type Type_6 = Type_5_<'a,,>; // error: expected type, found `,`
-
-
-//type Type_7 = Box<(),,>; // error: expected type, found `,`
-
-
-//type Type_8<'a,,> = &'a (); // error: expected ident, found `,`
-
-
-//type Type_9<T,,> = Box<T>; // error: expected ident, found `,`
diff --git a/src/test/compile-fail/issue-20616-4.rs b/src/test/compile-fail/issue-20616-4.rs
deleted file mode 100644
index 0dbe92fc1bc..00000000000
--- a/src/test/compile-fail/issue-20616-4.rs
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// We need all these 9 issue-20616-N.rs files
-// because we can only catch one parsing error at a time
-
-
-
-type Type_1_<'a, T> = &'a T;
-
-
-//type Type_1<'a T> = &'a T; // error: expected `,` or `>` after lifetime name, found `T`
-
-
-//type Type_2 = Type_1_<'static ()>; // error: expected `,` or `>` after lifetime name, found `(`
-
-
-//type Type_3<T> = Box<T,,>; // error: expected type, found `,`
-
-
-type Type_4<T> = Type_1_<'static,, T>;
-//~^ error: expected one of `>`, identifier, lifetime, or type, found `,`
-
-
-type Type_5_<'a> = Type_1_<'a, ()>;
-
-
-//type Type_5<'a> = Type_1_<'a, (),,>; // error: expected type, found `,`
-
-
-//type Type_6 = Type_5_<'a,,>; // error: expected type, found `,`
-
-
-//type Type_7 = Box<(),,>; // error: expected type, found `,`
-
-
-//type Type_8<'a,,> = &'a (); // error: expected ident, found `,`
-
-
-//type Type_9<T,,> = Box<T>; // error: expected ident, found `,`
diff --git a/src/test/compile-fail/issue-20616-5.rs b/src/test/compile-fail/issue-20616-5.rs
deleted file mode 100644
index 794e5178f4b..00000000000
--- a/src/test/compile-fail/issue-20616-5.rs
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// We need all these 9 issue-20616-N.rs files
-// because we can only catch one parsing error at a time
-
-
-
-type Type_1_<'a, T> = &'a T;
-
-
-//type Type_1<'a T> = &'a T; // error: expected `,` or `>` after lifetime name, found `T`
-
-
-//type Type_2 = Type_1_<'static ()>; // error: expected `,` or `>` after lifetime name, found `(`
-
-
-//type Type_3<T> = Box<T,,>; // error: expected type, found `,`
-
-
-//type Type_4<T> = Type_1_<'static,, T>; // error: expected type, found `,`
-
-
-type Type_5_<'a> = Type_1_<'a, ()>;
-
-
-type Type_5<'a> = Type_1_<'a, (),,>;
-//~^ error: expected one of `>`, identifier, lifetime, or type, found `,`
-
-
-//type Type_6 = Type_5_<'a,,>; // error: expected type, found `,`
-
-
-//type Type_7 = Box<(),,>; // error: expected type, found `,`
-
-
-//type Type_8<'a,,> = &'a (); // error: expected ident, found `,`
-
-
-//type Type_9<T,,> = Box<T>; // error: expected ident, found `,`
diff --git a/src/test/compile-fail/issue-20616-6.rs b/src/test/compile-fail/issue-20616-6.rs
deleted file mode 100644
index fe91751a4a0..00000000000
--- a/src/test/compile-fail/issue-20616-6.rs
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// We need all these 9 issue-20616-N.rs files
-// because we can only catch one parsing error at a time
-
-
-
-type Type_1_<'a, T> = &'a T;
-
-
-//type Type_1<'a T> = &'a T; // error: expected `,` or `>` after lifetime name, found `T`
-
-
-//type Type_2 = Type_1_<'static ()>; // error: expected `,` or `>` after lifetime name, found `(`
-
-
-//type Type_3<T> = Box<T,,>; // error: expected type, found `,`
-
-
-//type Type_4<T> = Type_1_<'static,, T>; // error: expected type, found `,`
-
-
-type Type_5_<'a> = Type_1_<'a, ()>;
-
-
-//type Type_5<'a> = Type_1_<'a, (),,>; // error: expected type, found `,`
-
-
-type Type_6 = Type_5_<'a,,>;
-//~^ error: expected one of `>`, identifier, lifetime, or type, found `,`
-
-
-//type Type_7 = Box<(),,>; // error: expected type, found `,`
-
-
-//type Type_8<'a,,> = &'a (); // error: expected ident, found `,`
-
-
-//type Type_9<T,,> = Box<T>; // error: expected ident, found `,`
diff --git a/src/test/compile-fail/issue-20616-7.rs b/src/test/compile-fail/issue-20616-7.rs
deleted file mode 100644
index 184ad027102..00000000000
--- a/src/test/compile-fail/issue-20616-7.rs
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// We need all these 9 issue-20616-N.rs files
-// because we can only catch one parsing error at a time
-
-
-
-type Type_1_<'a, T> = &'a T;
-
-
-//type Type_1<'a T> = &'a T; // error: expected `,` or `>` after lifetime name, found `T`
-
-
-//type Type_2 = Type_1_<'static ()>; // error: expected `,` or `>` after lifetime name, found `(`
-
-
-//type Type_3<T> = Box<T,,>; // error: expected type, found `,`
-
-
-//type Type_4<T> = Type_1_<'static,, T>; // error: expected type, found `,`
-
-
-type Type_5_<'a> = Type_1_<'a, ()>;
-
-
-//type Type_5<'a> = Type_1_<'a, (),,>; // error: expected type, found `,`
-
-
-//type Type_6 = Type_5_<'a,,>; // error: expected type, found `,`
-
-
-type Type_7 = Box<(),,>; //~ error: expected one of `>`, identifier, lifetime, or type, found `,`
-
-
-//type Type_8<'a,,> = &'a (); // error: expected ident, found `,`
-
-
-//type Type_9<T,,> = Box<T>; // error: expected ident, found `,`
diff --git a/src/test/compile-fail/issue-20616-8.rs b/src/test/compile-fail/issue-20616-8.rs
deleted file mode 100644
index 5cdec33e94b..00000000000
--- a/src/test/compile-fail/issue-20616-8.rs
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// We need all these 9 issue-20616-N.rs files
-// because we can only catch one parsing error at a time
-
-
-
-type Type_1_<'a, T> = &'a T;
-
-
-//type Type_1<'a T> = &'a T; // error: expected `,` or `>` after lifetime name, found `T`
-
-
-//type Type_2 = Type_1_<'static ()>; // error: expected `,` or `>` after lifetime name, found `(`
-
-
-//type Type_3<T> = Box<T,,>; // error: expected type, found `,`
-
-
-//type Type_4<T> = Type_1_<'static,, T>; // error: expected type, found `,`
-
-
-type Type_5_<'a> = Type_1_<'a, ()>;
-
-
-//type Type_5<'a> = Type_1_<'a, (),,>; // error: expected type, found `,`
-
-
-//type Type_6 = Type_5_<'a,,>; // error: expected type, found `,`
-
-
-//type Type_7 = Box<(),,>; // error: expected type, found `,`
-
-
-type Type_8<'a,,> = &'a (); //~ error: expected one of `>`, identifier, or lifetime, found `,`
-
-
-//type Type_9<T,,> = Box<T>; // error: expected identifier, found `,`
diff --git a/src/test/compile-fail/issue-20616-9.rs b/src/test/compile-fail/issue-20616-9.rs
deleted file mode 100644
index 7995addb692..00000000000
--- a/src/test/compile-fail/issue-20616-9.rs
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// We need all these 9 issue-20616-N.rs files
-// because we can only catch one parsing error at a time
-
-
-
-type Type_1_<'a, T> = &'a T;
-
-
-//type Type_1<'a T> = &'a T; // error: expected `,` or `>` after lifetime name, found `T`
-
-
-//type Type_2 = Type_1_<'static ()>; // error: expected `,` or `>` after lifetime name, found `(`
-
-
-//type Type_3<T> = Box<T,,>; // error: expected type, found `,`
-
-
-//type Type_4<T> = Type_1_<'static,, T>; // error: expected type, found `,`
-
-
-type Type_5_<'a> = Type_1_<'a, ()>;
-
-
-//type Type_5<'a> = Type_1_<'a, (),,>; // error: expected type, found `,`
-
-
-//type Type_6 = Type_5_<'a,,>; // error: expected type, found `,`
-
-
-//type Type_7 = Box<(),,>; // error: expected type, found `,`
-
-
-//type Type_8<'a,,> = &'a (); // error: expected identifier, found `,`
-
-
-type Type_9<T,,> = Box<T>; //~ error: expected one of `>`, identifier, or lifetime, found `,`
diff --git a/src/test/compile-fail/issue-20714.rs b/src/test/compile-fail/issue-20714.rs
deleted file mode 100644
index cb322f00723..00000000000
--- a/src/test/compile-fail/issue-20714.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-struct G;
-
-fn main() {
-    let g = G(); //~ ERROR: expected function, found `G`
-}
diff --git a/src/test/compile-fail/issue-20772.rs b/src/test/compile-fail/issue-20772.rs
deleted file mode 100644
index d67c76a1525..00000000000
--- a/src/test/compile-fail/issue-20772.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-trait T : Iterator<Item=Self::Item>
-//~^ ERROR cycle detected
-//~| ERROR associated type `Item` not found for `Self`
-{}
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-20801.rs b/src/test/compile-fail/issue-20801.rs
deleted file mode 100644
index d3b97a9c058..00000000000
--- a/src/test/compile-fail/issue-20801.rs
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// We used to ICE when moving out of a `*mut T` or `*const T`.
-
-struct T(u8);
-
-static mut GLOBAL_MUT_T: T = T(0);
-
-static GLOBAL_T: T = T(0);
-
-fn imm_ref() -> &'static T {
-    unsafe { &GLOBAL_T }
-}
-
-fn mut_ref() -> &'static mut T {
-    unsafe { &mut GLOBAL_MUT_T }
-}
-
-fn mut_ptr() -> *mut T {
-    unsafe { 0 as *mut T }
-}
-
-fn const_ptr() -> *const T {
-    unsafe { 0 as *const T }
-}
-
-pub fn main() {
-    let a = unsafe { *mut_ref() };
-    //~^ ERROR cannot move out of borrowed content
-
-    let b = unsafe { *imm_ref() };
-    //~^ ERROR cannot move out of borrowed content
-
-    let c = unsafe { *mut_ptr() };
-    //~^ ERROR cannot move out of dereference of raw pointer
-
-    let d = unsafe { *const_ptr() };
-    //~^ ERROR cannot move out of dereference of raw pointer
-}
diff --git a/src/test/compile-fail/issue-20825.rs b/src/test/compile-fail/issue-20825.rs
deleted file mode 100644
index cbb987cd512..00000000000
--- a/src/test/compile-fail/issue-20825.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-pub trait Subscriber {
-    type Input;
-}
-
-pub trait Processor: Subscriber<Input = Self::Input> {
-    //~^ ERROR cycle detected
-    type Input;
-}
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-20831-debruijn.rs b/src/test/compile-fail/issue-20831-debruijn.rs
deleted file mode 100644
index 3f00f561ae9..00000000000
--- a/src/test/compile-fail/issue-20831-debruijn.rs
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// Regression test for #20831: debruijn index account was thrown off
-// by the (anonymous) lifetime in `<Self as Publisher>::Output`
-// below. Note that changing to a named lifetime made the problem go
-// away.
-
-use std::cell::RefCell;
-use std::ops::{Shl, Shr};
-
-pub trait Subscriber {
-    type Input;
-}
-
-pub trait Publisher<'a> {
-    type Output;
-    fn subscribe(&mut self, _: Box<Subscriber<Input=Self::Output> + 'a>);
-}
-
-pub trait Processor<'a> : Subscriber + Publisher<'a> { }
-
-impl<'a, P> Processor<'a> for P where P : Subscriber + Publisher<'a> { }
-
-struct MyStruct<'a> {
-    sub: Box<Subscriber<Input=u64> + 'a>
-}
-
-impl<'a> Publisher<'a> for MyStruct<'a> {
-    type Output = u64;
-    fn subscribe(&mut self, t : Box<Subscriber<Input=<Self as Publisher>::Output> + 'a>) {
-        // Not obvious, but there is an implicit lifetime here -------^
-        //~^^ ERROR cannot infer
-        //
-        // The fact that `Publisher` is using an implicit lifetime is
-        // what was causing the debruijn accounting to be off, so
-        // leave it that way!
-        self.sub = t;
-    }
-}
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-20939.rs b/src/test/compile-fail/issue-20939.rs
deleted file mode 100644
index 5282ce4bb88..00000000000
--- a/src/test/compile-fail/issue-20939.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-trait Foo {}
-
-impl<'a> Foo for Foo+'a {}
-//~^ ERROR the object type `(dyn Foo + 'a)` automatically implements the trait `Foo`
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-2111.rs b/src/test/compile-fail/issue-2111.rs
deleted file mode 100644
index 8180ce52bdb..00000000000
--- a/src/test/compile-fail/issue-2111.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn foo(a: Option<usize>, b: Option<usize>) {
-  match (a,b) {
-  //~^ ERROR: non-exhaustive patterns: `(None, None)` not covered
-    (Some(a), Some(b)) if a == b => { }
-    (Some(_), None) |
-    (None, Some(_)) => { }
-  }
-}
-
-fn main() {
-  foo(None, None);
-}
diff --git a/src/test/compile-fail/issue-21160.rs b/src/test/compile-fail/issue-21160.rs
deleted file mode 100644
index 0de0ab2269b..00000000000
--- a/src/test/compile-fail/issue-21160.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-struct Bar;
-
-impl Bar {
-    fn hash<T>(&self, _: T) {}
-}
-
-#[derive(Hash)]
-struct Foo(Bar);
-//~^ error: `Bar: std::hash::Hash` is not satisfied
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-21174.rs b/src/test/compile-fail/issue-21174.rs
deleted file mode 100644
index 9d9b7e48043..00000000000
--- a/src/test/compile-fail/issue-21174.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-trait Trait<'a> {
-    type A;
-    type B;
-}
-
-fn foo<'a, T: Trait<'a>>(value: T::A) {
-    let new: T::B = unsafe { std::mem::transmute(value) };
-//~^ ERROR: transmute called with types of different sizes
-}
-
-fn main() { }
diff --git a/src/test/compile-fail/issue-21177.rs b/src/test/compile-fail/issue-21177.rs
deleted file mode 100644
index 9da57877a09..00000000000
--- a/src/test/compile-fail/issue-21177.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-trait Trait {
-    type A;
-    type B;
-}
-
-fn foo<T: Trait<A = T::B>>() { }
-//~^ ERROR cycle detected
-//~| ERROR associated type `B` not found for `T`
-
-fn main() { }
diff --git a/src/test/compile-fail/issue-21332.rs b/src/test/compile-fail/issue-21332.rs
deleted file mode 100644
index db3334834d4..00000000000
--- a/src/test/compile-fail/issue-21332.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-struct S;
-
-impl Iterator for S {
-    type Item = i32;
-    fn next(&mut self) -> Result<i32, i32> { Ok(7) }
-    //~^ ERROR method `next` has an incompatible type for trait
-    //~| expected enum `std::option::Option`, found enum `std::result::Result`
-}
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-21356.rs b/src/test/compile-fail/issue-21356.rs
deleted file mode 100644
index f66c09291cc..00000000000
--- a/src/test/compile-fail/issue-21356.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![allow(unused_macros)]
-
-macro_rules! test { ($wrong:t_ty ..) => () }
-                  //~^ ERROR: invalid fragment specifier `t_ty`
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-21449.rs b/src/test/compile-fail/issue-21449.rs
deleted file mode 100644
index cc44cf88f09..00000000000
--- a/src/test/compile-fail/issue-21449.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-mod MyMod {}
-
-fn main() {
-    let myVar = MyMod { T: 0 };
-    //~^ ERROR expected struct, variant or union type, found module `MyMod`
-}
diff --git a/src/test/compile-fail/issue-2149.rs b/src/test/compile-fail/issue-2149.rs
deleted file mode 100644
index 256c5d8e6f7..00000000000
--- a/src/test/compile-fail/issue-2149.rs
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-trait vec_monad<A> {
-    fn bind<B, F>(&self, f: F) where F: FnMut(A) -> Vec<B>;
-}
-
-impl<A> vec_monad<A> for Vec<A> {
-    fn bind<B, F>(&self, mut f: F) where F: FnMut(A) -> Vec<B> {
-        let mut r = panic!();
-        for elt in self { r = r + f(*elt); }
-        //~^ ERROR E0277
-   }
-}
-fn main() {
-    ["hi"].bind(|x| [x] );
-    //~^ ERROR no method named `bind` found for type `[&str; 1]` in the current scope
-}
diff --git a/src/test/compile-fail/issue-2150.rs b/src/test/compile-fail/issue-2150.rs
deleted file mode 100644
index 8b109b0a5c0..00000000000
--- a/src/test/compile-fail/issue-2150.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![deny(unreachable_code)]
-#![allow(unused_variables)]
-#![allow(dead_code)]
-
-fn fail_len(v: Vec<isize> ) -> usize {
-    let mut i = 3;
-    panic!();
-    for x in &v { i += 1; }
-    //~^ ERROR: unreachable statement
-    return i;
-}
-fn main() {}
diff --git a/src/test/compile-fail/issue-2151.rs b/src/test/compile-fail/issue-2151.rs
deleted file mode 100644
index 3cf971f3f8d..00000000000
--- a/src/test/compile-fail/issue-2151.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn main() {
-    let x = panic!();
-    x.clone(); //~ ERROR type annotations needed
-}
diff --git a/src/test/compile-fail/issue-21554.rs b/src/test/compile-fail/issue-21554.rs
deleted file mode 100644
index 1b87862a056..00000000000
--- a/src/test/compile-fail/issue-21554.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-struct Inches(i32);
-
-fn main() {
-    Inches as f32;
-    //~^ ERROR casting
-}
diff --git a/src/test/compile-fail/issue-21701.rs b/src/test/compile-fail/issue-21701.rs
deleted file mode 100644
index f24de2ffe6b..00000000000
--- a/src/test/compile-fail/issue-21701.rs
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn foo<U>(t: U) {
-    let y = t();
-//~^ ERROR: expected function, found `U`
-}
-
-struct Bar;
-
-pub fn some_func() {
-    let f = Bar();
-//~^ ERROR: expected function, found `Bar`
-}
-
-fn main() {
-    foo(|| { 1 });
-}
diff --git a/src/test/compile-fail/issue-21763.rs b/src/test/compile-fail/issue-21763.rs
deleted file mode 100644
index b4f952c87d4..00000000000
--- a/src/test/compile-fail/issue-21763.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// Regression test for HashMap only impl'ing Send/Sync if its contents do
-
-use std::collections::HashMap;
-use std::rc::Rc;
-
-fn foo<T: Send>() {}
-
-fn main() {
-    foo::<HashMap<Rc<()>, Rc<()>>>();
-    //~^ ERROR `std::rc::Rc<()>` cannot be sent between threads safely
-}
diff --git a/src/test/compile-fail/issue-21837.rs b/src/test/compile-fail/issue-21837.rs
deleted file mode 100644
index 86506de1ea9..00000000000
--- a/src/test/compile-fail/issue-21837.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-pub trait Bound {}
-pub struct Foo<T: Bound>(T);
-
-pub trait Trait1 {}
-impl<T: Bound> Trait1 for Foo<T> {}
-
-pub trait Trait2 {}
-impl<T> Trait2 for Foo<T> {} //~ ERROR the trait bound `T: Bound` is not satisfied
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-21946.rs b/src/test/compile-fail/issue-21946.rs
deleted file mode 100644
index 0d652be5c26..00000000000
--- a/src/test/compile-fail/issue-21946.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-trait Foo {
-    type A;
-}
-
-struct FooStruct;
-
-impl Foo for FooStruct {
-//~^ ERROR overflow evaluating the requirement `<FooStruct as Foo>::A`
-    type A = <FooStruct as Foo>::A;
-}
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-21974.rs b/src/test/compile-fail/issue-21974.rs
deleted file mode 100644
index 6ddfa4c8e3e..00000000000
--- a/src/test/compile-fail/issue-21974.rs
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// Test that (for now) we report an ambiguity error here, because
-// specific trait relationships are ignored for the purposes of trait
-// matching. This behavior should likely be improved such that this
-// test passes. See #21974 for more details.
-
-trait Foo {
-    fn foo(self);
-}
-
-fn foo<'a,'b,T>(x: &'a T, y: &'b T) //~ ERROR type annotations required
-    where &'a T : Foo,
-          &'b T : Foo
-{
-    x.foo();
-    y.foo();
-}
-
-fn main() { }
diff --git a/src/test/compile-fail/issue-22034.rs b/src/test/compile-fail/issue-22034.rs
deleted file mode 100644
index 5271ea79917..00000000000
--- a/src/test/compile-fail/issue-22034.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![feature(libc)]
-
-extern crate libc;
-
-fn main() {
-    let ptr: *mut () = 0 as *mut _;
-    let _: &mut Fn() = unsafe {
-        &mut *(ptr as *mut Fn())
-        //~^ ERROR `(): std::ops::Fn<()>` is not satisfied
-    };
-}
diff --git a/src/test/compile-fail/issue-22037.rs b/src/test/compile-fail/issue-22037.rs
deleted file mode 100644
index ffa881b49c5..00000000000
--- a/src/test/compile-fail/issue-22037.rs
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-trait A {
-    type Output;
-    fn a(&self) -> <Self as A>::X;
-    //~^ ERROR cannot find associated type `X` in trait `A`
-}
-
-impl A for u32 {
-    type Output = u32;
-    fn a(&self) -> u32 {
-        0
-    }
-}
-
-fn main() {
-    let a: u32 = 0;
-    let b: u32 = a.a();
-}
diff --git a/src/test/compile-fail/issue-22289.rs b/src/test/compile-fail/issue-22289.rs
deleted file mode 100644
index c23fc4f3344..00000000000
--- a/src/test/compile-fail/issue-22289.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn main() {
-    0 as &std::any::Any; //~ ERROR non-primitive cast
-}
diff --git a/src/test/compile-fail/issue-22312.rs b/src/test/compile-fail/issue-22312.rs
deleted file mode 100644
index 2128c420630..00000000000
--- a/src/test/compile-fail/issue-22312.rs
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-use std::ops::Index;
-
-pub trait Array2D: Index<usize> {
-    fn rows(&self) -> usize;
-    fn columns(&self) -> usize;
-    fn get<'a>(&'a self, y: usize, x: usize) -> Option<&'a <Self as Index<usize>>::Output> {
-        if y >= self.rows() || x >= self.columns() {
-            return None;
-        }
-        let i = y * self.columns() + x;
-        let indexer = &(*self as &Index<usize, Output = <Self as Index<usize>>::Output>);
-        //~^ERROR non-primitive cast
-        Some(indexer.index(i))
-    }
-}
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-22384.rs b/src/test/compile-fail/issue-22384.rs
deleted file mode 100644
index ae7fb01e057..00000000000
--- a/src/test/compile-fail/issue-22384.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-trait Trait {
-    fn foo();
-}
-
-fn main() {
-    <<i32 as Copy>::foobar as Trait>::foo();
-    //~^ ERROR cannot find associated type `foobar` in trait `Copy`
-}
diff --git a/src/test/compile-fail/issue-22434.rs b/src/test/compile-fail/issue-22434.rs
deleted file mode 100644
index 6effd02bac8..00000000000
--- a/src/test/compile-fail/issue-22434.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-pub trait Foo {
-    type A;
-}
-
-type I<'a> = &'a (Foo + 'a);
-//~^ ERROR the value of the associated type `A` (from the trait `Foo`) must be specified
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-22468.rs b/src/test/compile-fail/issue-22468.rs
deleted file mode 100644
index 50e5dd2955d..00000000000
--- a/src/test/compile-fail/issue-22468.rs
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn main() {
-    let foo = "bar";
-    let x = foo("baz");
-    //~^ ERROR: expected function, found `&str`
-}
-
-fn foo(file: &str) -> bool {
-    true
-}
diff --git a/src/test/compile-fail/issue-22599.rs b/src/test/compile-fail/issue-22599.rs
deleted file mode 100644
index b9ea3583296..00000000000
--- a/src/test/compile-fail/issue-22599.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![deny(unused_variables)]
-
-fn f(_: i32) {}
-
-fn main() {
-    let mut v = 0;
-    f(v);
-    v = match 0 { a => 0 }; //~ ERROR: unused variable: `a`
-    f(v);
-}
diff --git a/src/test/compile-fail/issue-22603.rs b/src/test/compile-fail/issue-22603.rs
deleted file mode 100644
index d08f916b870..00000000000
--- a/src/test/compile-fail/issue-22603.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![feature(unboxed_closures, fn_traits, rustc_attrs)]
-
-struct Foo;
-
-impl<A> FnOnce<(A,)> for Foo {
-    type Output = ();
-    extern "rust-call" fn call_once(self, (_,): (A,)) {
-    }
-}
-#[rustc_error]
-fn main() { //~ ERROR compilation successful
-    println!("{:?}", Foo("bar"));
-}
diff --git a/src/test/compile-fail/issue-22673.rs b/src/test/compile-fail/issue-22673.rs
deleted file mode 100644
index 2396007c3df..00000000000
--- a/src/test/compile-fail/issue-22673.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-trait Expr : PartialEq<Self::Item> {
-    //~^ ERROR: cycle detected
-    type Item;
-}
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-22684.rs b/src/test/compile-fail/issue-22684.rs
deleted file mode 100644
index a791758ad17..00000000000
--- a/src/test/compile-fail/issue-22684.rs
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-mod foo {
-    pub struct Foo;
-    impl Foo {
-        fn bar(&self) {}
-    }
-
-    pub trait Baz {
-        fn bar(&self) -> bool { true }
-    }
-    impl Baz for Foo {}
-}
-
-fn main() {
-    use foo::Baz;
-
-    // Check that `bar` resolves to the trait method, not the inherent impl method.
-    let _: () = foo::Foo.bar(); //~ ERROR mismatched types
-}
diff --git a/src/test/compile-fail/issue-22706.rs b/src/test/compile-fail/issue-22706.rs
deleted file mode 100644
index 3d9ec0a6581..00000000000
--- a/src/test/compile-fail/issue-22706.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn is_copy<T: ::std::marker<i32>::Copy>() {}
-//~^ ERROR type parameters are not allowed on this type [E0109]
-fn main() {}
diff --git a/src/test/compile-fail/issue-22789.rs b/src/test/compile-fail/issue-22789.rs
deleted file mode 100644
index cba1c367bb9..00000000000
--- a/src/test/compile-fail/issue-22789.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![feature(unboxed_closures, fn_traits, rustc_attrs)]
-
-#[rustc_error]
-fn main() { //~ ERROR compilation successful
-    let k = |x: i32| { x + 1 };
-    Fn::call(&k, (0,));
-}
diff --git a/src/test/compile-fail/issue-2281-part1.rs b/src/test/compile-fail/issue-2281-part1.rs
deleted file mode 100644
index e3fd9c48a52..00000000000
--- a/src/test/compile-fail/issue-2281-part1.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn main() { println!("{}", foobar); } //~ ERROR cannot find value `foobar` in this scope
diff --git a/src/test/compile-fail/issue-22874.rs b/src/test/compile-fail/issue-22874.rs
deleted file mode 100644
index e0a87b3a174..00000000000
--- a/src/test/compile-fail/issue-22874.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-struct Table {
-    rows: [[String]],
-    //~^ ERROR the size for values of type
-}
-
-fn f(table: &Table) -> &[String] {
-    &table.rows[0]
-}
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-22933-1.rs b/src/test/compile-fail/issue-22933-1.rs
deleted file mode 100644
index afb972faaca..00000000000
--- a/src/test/compile-fail/issue-22933-1.rs
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![feature(rustc_attrs)]
-#![allow(warnings)]
-
-struct CNFParser {
-    token: char,
-}
-
-impl CNFParser {
-    fn is_whitespace(c: char) -> bool {
-        c == ' ' || c == '\n'
-    }
-
-    fn consume_whitespace(&mut self) {
-        self.consume_while(&(CNFParser::is_whitespace))
-    }
-
-    fn consume_while(&mut self, p: &Fn(char) -> bool) {
-        while p(self.token) {
-            return
-        }
-    }
-}
-
-#[rustc_error]
-fn main() {} //~ ERROR compilation successful
diff --git a/src/test/compile-fail/issue-22933-3.rs b/src/test/compile-fail/issue-22933-3.rs
deleted file mode 100644
index 62adae41adf..00000000000
--- a/src/test/compile-fail/issue-22933-3.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-const FOO: [u32; u8::MIN as usize] = [];
-//~^ ERROR no associated item named `MIN` found for type `u8`
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-23024.rs b/src/test/compile-fail/issue-23024.rs
deleted file mode 100644
index 5d9b49f486c..00000000000
--- a/src/test/compile-fail/issue-23024.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![feature(box_syntax)]
-use std::any::Any;
-
-fn main()
-{
-    fn h(x:i32) -> i32 {3*x}
-    let mut vfnfer:Vec<Box<Any>> = vec![];
-    vfnfer.push(box h);
-    println!("{:?}",(vfnfer[0] as Fn)(3));
-    //~^ ERROR the precise format of `Fn`-family traits'
-    //~| ERROR wrong number of type arguments: expected 1, found 0 [E0243]
-    //~| ERROR the value of the associated type `Output` (from the trait `std::ops::FnOnce`)
-}
diff --git a/src/test/compile-fail/issue-23046.rs b/src/test/compile-fail/issue-23046.rs
deleted file mode 100644
index 670706b7a9a..00000000000
--- a/src/test/compile-fail/issue-23046.rs
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-pub enum Expr<'var, VAR> {
-    Let(Box<Expr<'var, VAR>>,
-        Box<for<'v> Fn(Expr<'v, VAR>) -> Expr<'v, VAR> + 'var>)
-}
-
-pub fn add<'var, VAR>
-                      (a: Expr<'var, VAR>, b: Expr<'var, VAR>) -> Expr<'var, VAR> {
-    loop {}
-}
-
-pub fn let_<'var, VAR, F: for<'v> Fn(Expr<'v, VAR>) -> Expr<'v, VAR>>
-                       (a: Expr<'var, VAR>, b: F) -> Expr<'var, VAR> {
-    loop {}
-}
-
-fn main() {
-    let ex = |x| { //~ ERROR type annotations needed
-        let_(add(x,x), |y| {
-            let_(add(x, x), |x|x)})};
-}
diff --git a/src/test/compile-fail/issue-23073.rs b/src/test/compile-fail/issue-23073.rs
deleted file mode 100644
index 2d219177a80..00000000000
--- a/src/test/compile-fail/issue-23073.rs
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![feature(associated_type_defaults)]
-
-trait Foo { type T; }
-trait Bar {
-    type Foo: Foo;
-    type FooT = <<Self as Bar>::Foo>::T; //~ ERROR ambiguous associated type
-}
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-23080-2.rs b/src/test/compile-fail/issue-23080-2.rs
deleted file mode 100644
index fc365a4b9aa..00000000000
--- a/src/test/compile-fail/issue-23080-2.rs
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// ignore-tidy-linelength
-
-//~^^^^^^^^^^^^ ERROR
-
-#![feature(optin_builtin_traits)]
-
-unsafe auto trait Trait {
-//~^ ERROR E0380
-    type Output;
-}
-
-fn call_method<T: Trait>(x: T) {}
-
-fn main() {
-    // ICE
-    call_method(());
-}
diff --git a/src/test/compile-fail/issue-23080.rs b/src/test/compile-fail/issue-23080.rs
deleted file mode 100644
index 153b6fd07e6..00000000000
--- a/src/test/compile-fail/issue-23080.rs
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// ignore-tidy-linelength
-
-#![feature(optin_builtin_traits)]
-
-unsafe auto trait Trait {
-//~^ ERROR E0380
-    fn method(&self) {
-        println!("Hello");
-    }
-}
-
-fn call_method<T: Trait>(x: T) {
-    x.method();
-}
-
-fn main() {
-    // ICE
-    call_method(());
-}
diff --git a/src/test/compile-fail/issue-23122-1.rs b/src/test/compile-fail/issue-23122-1.rs
deleted file mode 100644
index 36d8450848d..00000000000
--- a/src/test/compile-fail/issue-23122-1.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-trait Next {
-    type Next: Next;
-}
-
-struct GetNext<T: Next> { t: T }
-
-impl<T: Next> Next for GetNext<T> {
-    //~^ ERROR overflow evaluating the requirement
-    type Next = <GetNext<T> as Next>::Next;
-}
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-23122-2.rs b/src/test/compile-fail/issue-23122-2.rs
deleted file mode 100644
index faaf78f894b..00000000000
--- a/src/test/compile-fail/issue-23122-2.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-trait Next {
-    type Next: Next;
-}
-
-struct GetNext<T: Next> { t: T }
-
-impl<T: Next> Next for GetNext<T> {
-    //~^ ERROR overflow evaluating the requirement
-    type Next = <GetNext<T::Next> as Next>::Next;
-}
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-23253.rs b/src/test/compile-fail/issue-23253.rs
deleted file mode 100644
index 626604a87a7..00000000000
--- a/src/test/compile-fail/issue-23253.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-enum Foo { Bar }
-
-fn main() {
-    Foo::Bar.a;
-    //~^ no field `a` on type `Foo`
-}
diff --git a/src/test/compile-fail/issue-23281.rs b/src/test/compile-fail/issue-23281.rs
deleted file mode 100644
index 5de00eb8f68..00000000000
--- a/src/test/compile-fail/issue-23281.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// ignore-tidy-linelength
-
-pub struct Struct;
-
-impl Struct {
-    pub fn function(funs: Vec<Fn() -> ()>) {}
-    //~^ ERROR the size for values of type
-}
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-2330.rs b/src/test/compile-fail/issue-2330.rs
deleted file mode 100644
index f1a282695ac..00000000000
--- a/src/test/compile-fail/issue-2330.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-enum chan { }
-
-trait channel<T> {
-    fn send(&self, v: T);
-}
-
-// `chan` is not a trait, it's an enum
-impl chan for isize { //~ ERROR expected trait, found enum `chan`
-    fn send(&self, v: isize) { panic!() }
-}
-
-fn main() {
-}
diff --git a/src/test/compile-fail/issue-23589.rs b/src/test/compile-fail/issue-23589.rs
deleted file mode 100644
index 1c1d42da029..00000000000
--- a/src/test/compile-fail/issue-23589.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn main() {
-    let v: Vec(&str) = vec!['1', '2'];
-    //~^ ERROR parenthesized parameters may only be used with a trait
-}
diff --git a/src/test/compile-fail/issue-23595-2.rs b/src/test/compile-fail/issue-23595-2.rs
deleted file mode 100644
index 6a3ce03fce5..00000000000
--- a/src/test/compile-fail/issue-23595-2.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![feature(associated_type_defaults)]
-
-pub struct C<AType: A> {a:AType}
-
-pub trait A {
-    type B = C<Self::anything_here_kills_it>;
-    //~^ ERROR: associated type `anything_here_kills_it` not found for `Self`
-}
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-23966.rs b/src/test/compile-fail/issue-23966.rs
deleted file mode 100644
index 544d3c8af20..00000000000
--- a/src/test/compile-fail/issue-23966.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn main() {
-    "".chars().fold(|_, _| (), ());
-    //~^ ERROR E0277
-}
diff --git a/src/test/compile-fail/issue-24013.rs b/src/test/compile-fail/issue-24013.rs
deleted file mode 100644
index a7232781f6f..00000000000
--- a/src/test/compile-fail/issue-24013.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn main() {
-    use std::mem::{transmute, swap};
-    let a = 1;
-    let b = 2;
-    unsafe {swap::<&mut _>(transmute(&a), transmute(&b))};
-    //~^ ERROR type annotations needed
-}
diff --git a/src/test/compile-fail/issue-24204.rs b/src/test/compile-fail/issue-24204.rs
deleted file mode 100644
index 2a012da0083..00000000000
--- a/src/test/compile-fail/issue-24204.rs
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![allow(dead_code)]
-
-trait MultiDispatch<T> {
-    type O;
-}
-
-trait Trait: Sized {
-    type A: MultiDispatch<Self::B, O = Self>;
-    type B;
-
-    fn new<U>(u: U) -> <Self::A as MultiDispatch<U>>::O where Self::A : MultiDispatch<U>;
-}
-
-fn test<T: Trait<B=i32>>(b: i32) -> T where T::A: MultiDispatch<i32> { T::new(b) }
-//~^ ERROR type mismatch resolving
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-24267-flow-exit.rs b/src/test/compile-fail/issue-24267-flow-exit.rs
deleted file mode 100644
index 4aca6bf38e1..00000000000
--- a/src/test/compile-fail/issue-24267-flow-exit.rs
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// Ensure that we reject code when a nonlocal exit (`break`,
-// `continue`) causes us to pop over a needed assignment.
-
-pub fn main() {
-    foo1();
-    foo2();
-}
-
-pub fn foo1() {
-    let x: i32;
-    loop { x = break; }
-    println!("{}", x); //~ ERROR use of possibly uninitialized variable: `x`
-}
-
-pub fn foo2() {
-    let x: i32;
-    for _ in 0..10 { x = continue; }
-    println!("{}", x); //~ ERROR use of possibly uninitialized variable: `x`
-}
diff --git a/src/test/compile-fail/issue-24322.rs b/src/test/compile-fail/issue-24322.rs
deleted file mode 100644
index bb726aca921..00000000000
--- a/src/test/compile-fail/issue-24322.rs
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-struct B;
-
-impl B {
-    fn func(&self) -> u32 { 42 }
-}
-
-fn main() {
-    let x: &fn(&B) -> u32 = &B::func; //~ ERROR mismatched types
-}
diff --git a/src/test/compile-fail/issue-24352.rs b/src/test/compile-fail/issue-24352.rs
deleted file mode 100644
index 4b077314056..00000000000
--- a/src/test/compile-fail/issue-24352.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn main() {
-    1.0f64 - 1.0;
-    1.0f64 - 1 //~ ERROR E0277
-}
diff --git a/src/test/compile-fail/issue-24357.rs b/src/test/compile-fail/issue-24357.rs
deleted file mode 100644
index 016ce93a0bd..00000000000
--- a/src/test/compile-fail/issue-24357.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-struct NoCopy;
-fn main() {
-   let x = NoCopy;
-   let f = move || { let y = x; };
-   //~^ NOTE value moved (into closure) here
-   let z = x;
-   //~^ ERROR use of moved value: `x`
-   //~| NOTE value used here after move
-   //~| NOTE move occurs because `x` has type `NoCopy`
-}
diff --git a/src/test/compile-fail/issue-24363.rs b/src/test/compile-fail/issue-24363.rs
deleted file mode 100644
index 619ad74ad00..00000000000
--- a/src/test/compile-fail/issue-24363.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn main() {
-    1.create_a_type_error[ //~ `{integer}` is a primitive type and therefore doesn't have fields
-        ()+() //~ ERROR binary operation `+` cannot be applied
-              //   ^ ensure that we typeck the inner expression ^
-    ];
-}
diff --git a/src/test/compile-fail/issue-24365.rs b/src/test/compile-fail/issue-24365.rs
deleted file mode 100644
index 72df6fb5999..00000000000
--- a/src/test/compile-fail/issue-24365.rs
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-pub enum Attribute {
-    Code {attr_name_idx: u16},
-}
-
-pub enum Foo {
-    Bar
-}
-
-fn test(a: Foo) {
-    println!("{}", a.b); //~ no field `b` on type `Foo`
-}
-
-fn main() {
-    let x = Attribute::Code {
-        attr_name_idx: 42,
-    };
-    let z = (&x).attr_name_idx; //~ no field `attr_name_idx` on type `&Attribute`
-    let y = x.attr_name_idx; //~ no field `attr_name_idx` on type `Attribute`
-}
diff --git a/src/test/compile-fail/issue-24446.rs b/src/test/compile-fail/issue-24446.rs
deleted file mode 100644
index a9c7978642d..00000000000
--- a/src/test/compile-fail/issue-24446.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn main() {
-    static foo: Fn() -> u32 = || -> u32 {
-        //~^ ERROR mismatched types
-        //~| ERROR the size for values of type
-        0
-    };
-}
diff --git a/src/test/compile-fail/issue-24682.rs b/src/test/compile-fail/issue-24682.rs
deleted file mode 100644
index 0e872f71df4..00000000000
--- a/src/test/compile-fail/issue-24682.rs
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-trait A: Sized {
-    type N;
-    fn x() ->
-        Self<
-          N= //~ ERROR associated type bindings are not allowed here
-          Self::N> {
-        loop {}
-    }
-    fn y(&self) ->
-        std
-           <N=()> //~ ERROR associated type bindings are not allowed here
-           ::option::Option<()>
-    { None }
-    fn z(&self) ->
-        u32<N=()> //~ ERROR associated type bindings are not allowed here
-    { 42 }
-
-}
-
-fn main() {
-}
diff --git a/src/test/compile-fail/issue-24819.rs b/src/test/compile-fail/issue-24819.rs
deleted file mode 100644
index 52f5f1cd079..00000000000
--- a/src/test/compile-fail/issue-24819.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-use std::collections::HashSet;
-
-fn main() {
-    let mut v = Vec::new();
-    foo(&mut v);
-    //~^ ERROR mismatched types
-    //~| expected struct `std::collections::HashSet`, found struct `std::vec::Vec`
-}
-
-fn foo(h: &mut HashSet<u32>) {
-}
diff --git a/src/test/compile-fail/issue-24883.rs b/src/test/compile-fail/issue-24883.rs
deleted file mode 100644
index 097f2a5630c..00000000000
--- a/src/test/compile-fail/issue-24883.rs
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![feature(rustc_attrs)]
-
-mod a {
-    pub mod b { pub struct Foo; }
-
-    pub mod c {
-        use super::b;
-        pub struct Bar(pub b::Foo);
-    }
-
-    pub use self::c::*;
-}
-
-#[rustc_error]
-fn main() {  //~ ERROR compilation successful
-    let _ = a::c::Bar(a::b::Foo);
-    let _ = a::Bar(a::b::Foo);
-}
diff --git a/src/test/compile-fail/issue-25076.rs b/src/test/compile-fail/issue-25076.rs
deleted file mode 100644
index 1c255b4e631..00000000000
--- a/src/test/compile-fail/issue-25076.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-struct S;
-
-trait InOut<T> { type Out; }
-
-fn do_fold<B, F: InOut<B, Out=B>>(init: B, f: F) {}
-
-fn bot<T>() -> T { loop {} }
-
-fn main() {
-    do_fold(bot(), ()); //~ ERROR `(): InOut<_>` is not satisfied
-}
diff --git a/src/test/compile-fail/issue-25368.rs b/src/test/compile-fail/issue-25368.rs
deleted file mode 100644
index e70c0050221..00000000000
--- a/src/test/compile-fail/issue-25368.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2014-2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-use std::sync::mpsc::channel;
-use std::thread::spawn;
-use std::marker::PhantomData;
-
-struct Foo<T> {foo: PhantomData<T>}
-
-fn main() {
-    let (tx, rx) = channel();
-
-    spawn(move || {
-        tx.send(Foo{ foo: PhantomData }); //~ ERROR E0282
-    });
-}
diff --git a/src/test/compile-fail/issue-25386.rs b/src/test/compile-fail/issue-25386.rs
deleted file mode 100644
index b2775db5e75..00000000000
--- a/src/test/compile-fail/issue-25386.rs
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-mod stuff {
-    pub struct Item {
-        c_object: Box<CObj>,
-    }
-    pub struct CObj {
-        name: Option<String>,
-    }
-    impl Item {
-        pub fn new() -> Item {
-            Item {
-                c_object: Box::new(CObj { name: None }),
-            }
-        }
-    }
-}
-
-macro_rules! check_ptr_exist {
-    ($var:expr, $member:ident) => (
-        (*$var.c_object).$member.is_some()
-        //~^ ERROR field `name` of struct `stuff::CObj` is private
-        //~^^ ERROR field `c_object` of struct `stuff::Item` is private
-    );
-}
-
-fn main() {
-    let item = stuff::Item::new();
-    println!("{}", check_ptr_exist!(item, name));
-}
diff --git a/src/test/compile-fail/issue-25396.rs b/src/test/compile-fail/issue-25396.rs
deleted file mode 100644
index 7cfcbc5471a..00000000000
--- a/src/test/compile-fail/issue-25396.rs
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-use foo::baz;
-use bar::baz; //~ ERROR the name `baz` is defined multiple times
-
-use foo::Quux;
-use bar::Quux; //~ ERROR the name `Quux` is defined multiple times
-
-use foo::blah;
-use bar::blah; //~ ERROR the name `blah` is defined multiple times
-
-use foo::WOMP;
-use bar::WOMP; //~ ERROR the name `WOMP` is defined multiple times
-
-fn main() {}
-
-mod foo {
-    pub mod baz {}
-    pub trait Quux { }
-    pub type blah = (f64, u32);
-    pub const WOMP: u8 = 5;
-}
-
-mod bar {
-    pub mod baz {}
-    pub type Quux = i32;
-    pub struct blah { x: i8 }
-    pub const WOMP: i8 = -5;
-}
diff --git a/src/test/compile-fail/issue-25439.rs b/src/test/compile-fail/issue-25439.rs
deleted file mode 100644
index 6e33fd5ae71..00000000000
--- a/src/test/compile-fail/issue-25439.rs
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-struct Helper<'a, F: 'a>(&'a F);
-
-fn fix<F>(f: F) -> i32 where F: Fn(Helper<F>, i32) -> i32 {
-    f(Helper(&f), 8)
-}
-
-fn main() {
-    fix(|_, x| x); //~ ERROR closure/generator type that references itself [E0644]
-}
diff --git a/src/test/compile-fail/issue-25579.rs b/src/test/compile-fail/issue-25579.rs
deleted file mode 100644
index 71c1d63cf5a..00000000000
--- a/src/test/compile-fail/issue-25579.rs
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// revisions: ast mir
-//[mir]compile-flags: -Z borrowck=mir
-
-#![feature(rustc_attrs)]
-
-enum Sexpression {
-    Num(()),
-    Cons(&'static mut Sexpression)
-}
-
-fn causes_error_in_ast(mut l: &mut Sexpression) {
-    loop { match l {
-        &mut Sexpression::Num(ref mut n) => {},
-        &mut Sexpression::Cons(ref mut expr) => { //[ast]~ ERROR [E0499]
-            l = &mut **expr; //[ast]~ ERROR [E0506]
-        }
-    }}
-}
-
-#[rustc_error]
-fn main() { //[mir]~ ERROR compilation successful
-}
diff --git a/src/test/compile-fail/issue-25700.rs b/src/test/compile-fail/issue-25700.rs
deleted file mode 100644
index 477c3237f84..00000000000
--- a/src/test/compile-fail/issue-25700.rs
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-struct S<T: 'static>(Option<&'static T>);
-
-trait Tr { type Out; }
-impl<T> Tr for T { type Out = T; }
-
-impl<T: 'static> Copy for S<T> where S<T>: Tr<Out=T> {}
-impl<T: 'static> Clone for S<T> where S<T>: Tr<Out=T> {
-    fn clone(&self) -> Self { *self }
-}
-fn main() {
-    let t = S::<()>(None);
-    drop(t);
-    drop(t); //~ ERROR use of moved value
-}
diff --git a/src/test/compile-fail/issue-2590.rs b/src/test/compile-fail/issue-2590.rs
deleted file mode 100644
index d7e438d1049..00000000000
--- a/src/test/compile-fail/issue-2590.rs
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-
-struct parser {
-    tokens: Vec<isize> ,
-}
-
-trait parse {
-    fn parse(&self) -> Vec<isize> ;
-}
-
-impl parse for parser {
-    fn parse(&self) -> Vec<isize> {
-        self.tokens //~ ERROR cannot move out of borrowed content
-    }
-}
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-25901.rs b/src/test/compile-fail/issue-25901.rs
deleted file mode 100644
index 72fb2a682eb..00000000000
--- a/src/test/compile-fail/issue-25901.rs
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-struct A;
-struct B;
-
-static S: &'static B = &A;
-//~^ ERROR calls in statics are limited to constant functions
-
-use std::ops::Deref;
-
-impl Deref for A {
-    type Target = B;
-    fn deref(&self)->&B { static B_: B = B; &B_ }
-}
-
-fn main(){}
diff --git a/src/test/compile-fail/issue-26094.rs b/src/test/compile-fail/issue-26094.rs
deleted file mode 100644
index 99add95e806..00000000000
--- a/src/test/compile-fail/issue-26094.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-macro_rules! some_macro {
-    ($other: expr) => ({
-        $other(None)
-        //~^ this function takes 0 parameters but 1 parameter was supplied
-    })
-}
-
-fn some_function() {}
-
-fn main() {
-    some_macro!(some_function);
-    //~^ in this expansion of some_macro!
-}
diff --git a/src/test/compile-fail/issue-26158.rs b/src/test/compile-fail/issue-26158.rs
deleted file mode 100644
index 54f5313aed1..00000000000
--- a/src/test/compile-fail/issue-26158.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![feature(slice_patterns)]
-
-fn main() {
-    let x: &[u32] = &[];
-    let &[[ref _a, ref _b..]..] = x; //~ ERROR refutable pattern
-}
diff --git a/src/test/compile-fail/issue-26217.rs b/src/test/compile-fail/issue-26217.rs
deleted file mode 100644
index 06a8fe52588..00000000000
--- a/src/test/compile-fail/issue-26217.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn foo<T>() where for<'a> T: 'a {}
-
-fn main<'a>() {
-    foo::<&'a i32>();
-    //~^ ERROR the type `&'a i32` does not fulfill the required lifetime
-}
diff --git a/src/test/compile-fail/issue-26237.rs b/src/test/compile-fail/issue-26237.rs
deleted file mode 100644
index 22772e596b1..00000000000
--- a/src/test/compile-fail/issue-26237.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-macro_rules! macro_panic {
-    ($not_a_function:expr, $some_argument:ident) => {
-        $not_a_function($some_argument)
-        //~^ ERROR expected function, found `{integer}`
-    }
-}
-
-fn main() {
-    let mut value_a = 0;
-    let mut value_b = 0;
-    macro_panic!(value_a, value_b);
-    //~^ in this expansion of macro_panic!
-}
diff --git a/src/test/compile-fail/issue-26262.rs b/src/test/compile-fail/issue-26262.rs
deleted file mode 100644
index 8d79fd4570d..00000000000
--- a/src/test/compile-fail/issue-26262.rs
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// Check that projections don't count as constraining type parameters.
-
-struct S<T>(T);
-
-trait Tr { type Assoc; fn test(); }
-
-impl<T: Tr> S<T::Assoc> {
-//~^ ERROR the type parameter `T` is not constrained
-    fn foo(self, _: T) {
-        T::test();
-    }
-}
-
-trait Trait1<T> { type Bar; }
-trait Trait2<'x> { type Foo; }
-
-impl<'a,T: Trait2<'a>> Trait1<<T as Trait2<'a>>::Foo> for T {
-//~^ ERROR the lifetime parameter `'a` is not constrained
-    type Bar = &'a ();
-}
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-26459.rs b/src/test/compile-fail/issue-26459.rs
deleted file mode 100644
index 8be3d88bd5c..00000000000
--- a/src/test/compile-fail/issue-26459.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn main() {
-    match 'a' {
-        char{ch} => true
-        //~^ ERROR expected struct, variant or union type, found builtin type `char`
-    };
-}
diff --git a/src/test/compile-fail/issue-26548.rs b/src/test/compile-fail/issue-26548.rs
index aab674fbb1a..fc4f3d1fb53 100644
--- a/src/test/compile-fail/issue-26548.rs
+++ b/src/test/compile-fail/issue-26548.rs
@@ -8,9 +8,10 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// error-pattern: cycle detected when computing layout of
-// note-pattern: ...which requires computing layout of
-// note-pattern: ...which again requires computing layout of
+//~^^^^^^^^^^ ERROR cycle detected when computing layout of
+//~| NOTE ...which requires computing layout of
+//~| NOTE ...which again requires computing layout of
+//~| NOTE cycle used when compile_codegen_unit
 
 trait Mirror { type It: ?Sized; }
 impl<T: ?Sized> Mirror for T { type It = Self; }
diff --git a/src/test/compile-fail/issue-26614.rs b/src/test/compile-fail/issue-26614.rs
deleted file mode 100644
index c128fb3b479..00000000000
--- a/src/test/compile-fail/issue-26614.rs
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![feature(rustc_attrs)]
-#![allow(warnings)]
-
-trait Mirror {
-    type It;
-}
-
-impl<T> Mirror for T {
-    type It = Self;
-}
-
-
-#[rustc_error]
-fn main() { //~ ERROR compilation successful
-    let c: <u32 as Mirror>::It = 5;
-    const CCCC: <u32 as Mirror>::It = 5;
-}
diff --git a/src/test/compile-fail/issue-26812.rs b/src/test/compile-fail/issue-26812.rs
deleted file mode 100644
index 1dd00881078..00000000000
--- a/src/test/compile-fail/issue-26812.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![feature(default_type_parameter_fallback)]
-
-fn avg<T=T::Item>(_: T) {}
-//~^ ERROR type parameters with a default cannot use forward declared identifiers
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-26905.rs b/src/test/compile-fail/issue-26905.rs
deleted file mode 100644
index 3b8fac832a4..00000000000
--- a/src/test/compile-fail/issue-26905.rs
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![feature(unsize, coerce_unsized)]
-
-// Verfies that non-PhantomData ZSTs still cause coercions to fail.
-// They might have additional semantics that we don't want to bulldoze.
-
-use std::marker::{Unsize, PhantomData};
-use std::ops::CoerceUnsized;
-
-struct NotPhantomData<T: ?Sized>(PhantomData<T>);
-
-struct MyRc<T: ?Sized> {
-    _ptr: *const T,
-    _boo: NotPhantomData<T>,
-}
-
-impl<T: ?Sized + Unsize<U>, U: ?Sized> CoerceUnsized<MyRc<U>> for MyRc<T>{ } //~ERROR
-
-fn main() {
-    let data = [1, 2, 3];
-    let iter = data.iter();
-    let x = MyRc { _ptr: &iter, _boo: NotPhantomData(PhantomData) };
-    let _y: MyRc<Iterator<Item=&u32>> = x;
-}
-
diff --git a/src/test/compile-fail/issue-26930.rs b/src/test/compile-fail/issue-26930.rs
deleted file mode 100644
index 6c98f3e8560..00000000000
--- a/src/test/compile-fail/issue-26930.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![feature(rustc_attrs)]
-#![allow(unused)]
-
-extern crate core;
-use core as core_export;
-use self::x::*;
-mod x {}
-
-#[rustc_error]
-fn main() {} //~ ERROR compilation successful
diff --git a/src/test/compile-fail/issue-26948.rs b/src/test/compile-fail/issue-26948.rs
deleted file mode 100644
index c63cb5defb7..00000000000
--- a/src/test/compile-fail/issue-26948.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn main() {
-    enum Foo { A { x: u32 } }
-    let orig = Foo::A { x: 5 };
-    Foo::A { x: 6, ..orig };
-    //~^ ERROR functional record update syntax requires a struct
-}
diff --git a/src/test/compile-fail/issue-27008.rs b/src/test/compile-fail/issue-27008.rs
deleted file mode 100644
index f80135848e0..00000000000
--- a/src/test/compile-fail/issue-27008.rs
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-struct S;
-
-fn main() {
-    let b = [0; S];
-    //~^ ERROR mismatched types
-    //~| expected type `usize`
-    //~| found type `S`
-    //~| expected usize, found struct `S`
-}
diff --git a/src/test/compile-fail/issue-27033.rs b/src/test/compile-fail/issue-27033.rs
deleted file mode 100644
index b8552aaee90..00000000000
--- a/src/test/compile-fail/issue-27033.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn main() {
-    match Some(1) {
-        None @ _ => {} //~ ERROR match bindings cannot shadow unit variants
-    };
-    const C: u8 = 1;
-    match 1 {
-        C @ 2 => { //~ ERROR match bindings cannot shadow constant
-            println!("{}", C);
-        }
-        _ => {}
-    };
-}
diff --git a/src/test/compile-fail/issue-27042.rs b/src/test/compile-fail/issue-27042.rs
deleted file mode 100644
index 23afa4b6296..00000000000
--- a/src/test/compile-fail/issue-27042.rs
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2012-2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// Regression test for #27042. Test that a loop's label is included in its span.
-
-fn main() {
-    let _: i32 =
-        'a: // in this case, the citation is just the `break`:
-        loop { break }; //~ ERROR mismatched types
-    let _: i32 =
-        'b: //~ ERROR mismatched types
-        while true { break }; // but here we cite the whole loop
-    let _: i32 =
-        'c: //~ ERROR mismatched types
-        for _ in None { break }; // but here we cite the whole loop
-    let _: i32 =
-        'd: //~ ERROR mismatched types
-        while let Some(_) = None { break };
-}
diff --git a/src/test/compile-fail/issue-27060-2.rs b/src/test/compile-fail/issue-27060-2.rs
deleted file mode 100644
index 619616adda6..00000000000
--- a/src/test/compile-fail/issue-27060-2.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#[repr(packed)]
-pub struct Bad<T: ?Sized> {
-    data: T, //~ ERROR the size for values of type
-}
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-27078.rs b/src/test/compile-fail/issue-27078.rs
deleted file mode 100644
index 294c288a970..00000000000
--- a/src/test/compile-fail/issue-27078.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![feature(associated_consts)]
-
-trait Foo {
-    const BAR: i32;
-    fn foo(self) -> &'static i32 {
-        //~^ ERROR the size for values of type
-        &<Self>::BAR
-    }
-}
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-2718-a.rs b/src/test/compile-fail/issue-2718-a.rs
deleted file mode 100644
index 6de28cbbf35..00000000000
--- a/src/test/compile-fail/issue-2718-a.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2012-2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-pub struct send_packet<T> {
-    p: T
-}
-
-mod pingpong {
-    use send_packet;
-    pub type ping = send_packet<pong>;
-    pub struct pong(send_packet<ping>);
-    //~^ ERROR recursive type `pingpong::pong` has infinite size
-}
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-27340.rs b/src/test/compile-fail/issue-27340.rs
deleted file mode 100644
index ce3fa487d4e..00000000000
--- a/src/test/compile-fail/issue-27340.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-struct Foo;
-#[derive(Copy, Clone)]
-//~^ ERROR the trait `Copy` may not be implemented for this type
-struct Bar(Foo);
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-27433.rs b/src/test/compile-fail/issue-27433.rs
deleted file mode 100644
index 782b2057438..00000000000
--- a/src/test/compile-fail/issue-27433.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn main() {
-    let foo = 42u32;
-    const FOO : u32 = foo;
-                   //~^ ERROR can't capture dynamic environment
-}
diff --git a/src/test/compile-fail/issue-27592.rs b/src/test/compile-fail/issue-27592.rs
deleted file mode 100644
index 731d4fb2bf6..00000000000
--- a/src/test/compile-fail/issue-27592.rs
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// Regression test for issue #27592.
-
-fn write<'a, F: ::std::ops::FnOnce()->::std::fmt::Arguments<'a> + 'a>(fcn: F) {
-    use std::fmt::Write;
-    let _ = match fcn() { a => write!(&mut Stream, "{}", a), };
-}
-
-struct Stream;
-impl ::std::fmt::Write for Stream {
-    fn write_str(&mut self, _s: &str) -> ::std::fmt::Result {
-        Ok( () )
-    }
-}
-
-fn main() {
-    write(|| format_args!("{}", String::from("Hello world")));
-    //~^ ERROR borrowed value does not live long enough
-    //~| ERROR borrowed value does not live long enough
-}
diff --git a/src/test/compile-fail/issue-27815.rs b/src/test/compile-fail/issue-27815.rs
deleted file mode 100644
index d9840abf0ca..00000000000
--- a/src/test/compile-fail/issue-27815.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-mod A {}
-
-fn main() {
-    let u = A { x: 1 }; //~ ERROR expected struct, variant or union type, found module `A`
-    let v = u32 { x: 1 }; //~ ERROR expected struct, variant or union type, found builtin type `u32`
-    match () {
-        A { x: 1 } => {}
-        //~^ ERROR expected struct, variant or union type, found module `A`
-        u32 { x: 1 } => {}
-        //~^ ERROR expected struct, variant or union type, found builtin type `u32`
-    }
-}
diff --git a/src/test/compile-fail/issue-27895.rs b/src/test/compile-fail/issue-27895.rs
deleted file mode 100644
index 6063755c04f..00000000000
--- a/src/test/compile-fail/issue-27895.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn main() {
-    let i = 5;
-    let index = 6;
-
-    match i {
-        0..=index => println!("winner"),
-        //~^ ERROR runtime values cannot be referenced in patterns
-        _ => println!("hello"),
-    }
-}
diff --git a/src/test/compile-fail/issue-28098.rs b/src/test/compile-fail/issue-28098.rs
deleted file mode 100644
index 5dded2b1e16..00000000000
--- a/src/test/compile-fail/issue-28098.rs
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn main() {
-    let _ = Iterator::next(&mut ());
-    //~^ ERROR `(): std::iter::Iterator` is not satisfied
-
-    for _ in false {}
-    //~^ ERROR `bool: std::iter::Iterator` is not satisfied
-
-    let _ = Iterator::next(&mut ());
-    //~^ ERROR `(): std::iter::Iterator` is not satisfied
-
-    other()
-}
-
-pub fn other() {
-    // check errors are still reported globally
-
-    let _ = Iterator::next(&mut ());
-    //~^ ERROR `(): std::iter::Iterator` is not satisfied
-
-    let _ = Iterator::next(&mut ());
-    //~^ ERROR `(): std::iter::Iterator` is not satisfied
-
-    for _ in false {}
-    //~^ ERROR `bool: std::iter::Iterator` is not satisfied
-}
diff --git a/src/test/compile-fail/issue-28105.rs b/src/test/compile-fail/issue-28105.rs
deleted file mode 100644
index 8e58d1aaf24..00000000000
--- a/src/test/compile-fail/issue-28105.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2012-2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// Make sure that a continue span actually contains the keyword.
-
-fn main() {
-    continue //~ ERROR `continue` outside of loop
-    ;
-    break //~ ERROR `break` outside of loop
-    ;
-}
diff --git a/src/test/compile-fail/issue-28109.rs b/src/test/compile-fail/issue-28109.rs
deleted file mode 100644
index 0d372d30015..00000000000
--- a/src/test/compile-fail/issue-28109.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2012-2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// Make sure that label for continue and break is spanned correctly
-
-fn main() {
-    loop {
-        continue
-        'b //~ ERROR use of undeclared label
-        ;
-        break
-        'c //~ ERROR use of undeclared label
-        ;
-    }
-}
diff --git a/src/test/compile-fail/issue-28113.rs b/src/test/compile-fail/issue-28113.rs
deleted file mode 100644
index 7d2541966a4..00000000000
--- a/src/test/compile-fail/issue-28113.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![allow(warnings)]
-
-const X: u8 =
-    || -> u8 { 5 }()
-    //~^ ERROR calls in constants are limited to constant functions
-;
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-2823.rs b/src/test/compile-fail/issue-2823.rs
deleted file mode 100644
index 631bcb7bd9e..00000000000
--- a/src/test/compile-fail/issue-2823.rs
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-struct C {
-    x: isize,
-}
-
-impl Drop for C {
-    fn drop(&mut self) {
-        println!("dropping: {}", self.x);
-    }
-}
-
-fn main() {
-    let c = C{ x: 2};
-    let _d = c.clone(); //~ ERROR no method named `clone` found
-}
diff --git a/src/test/compile-fail/issue-28324.rs b/src/test/compile-fail/issue-28324.rs
deleted file mode 100644
index af73db2b4d2..00000000000
--- a/src/test/compile-fail/issue-28324.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![allow(safe_extern_statics)]
-
-extern {
-    static error_message_count: u32;
-}
-
-pub static BAZ: u32 = *&error_message_count;
-//~^ ERROR could not evaluate static initializer
-//~| tried to read from foreign (extern) static
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-28344.rs b/src/test/compile-fail/issue-28344.rs
deleted file mode 100644
index d28c3146404..00000000000
--- a/src/test/compile-fail/issue-28344.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-use std::ops::BitXor;
-
-fn main() {
-    let x: u8 = BitXor::bitor(0 as u8, 0 as u8);
-    //~^ ERROR must be specified
-    //~| no function or associated item named
-
-    let g = BitXor::bitor;
-    //~^ ERROR must be specified
-    //~| no function or associated item named
-}
diff --git a/src/test/compile-fail/issue-28433.rs b/src/test/compile-fail/issue-28433.rs
deleted file mode 100644
index 9253a490733..00000000000
--- a/src/test/compile-fail/issue-28433.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// compile-flags: -Z continue-parse-after-error
-
-enum bird {
-    pub duck,
-    //~^ ERROR: expected identifier, found keyword `pub`
-    //~| ERROR: expected
-    goose
-}
-
-
-fn main() {
-    let y = bird::goose;
-}
diff --git a/src/test/compile-fail/issue-28472.rs b/src/test/compile-fail/issue-28472.rs
deleted file mode 100644
index 837de8eddcf..00000000000
--- a/src/test/compile-fail/issue-28472.rs
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2012-2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// Check that the visibility modifier is included in the span of foreign items.
-
-extern {
-  fn foo();
-
-  pub //~ ERROR the name `foo` is defined multiple times
-  fn foo();
-
-  pub //~ ERROR the name `foo` is defined multiple times
-  static mut foo: u32;
-}
-
-fn main() {
-}
diff --git a/src/test/compile-fail/issue-2849.rs b/src/test/compile-fail/issue-2849.rs
deleted file mode 100644
index 203b28bd5e4..00000000000
--- a/src/test/compile-fail/issue-2849.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-enum foo { alpha, beta(isize) }
-
-fn main() {
-    match foo::alpha {
-      foo::alpha | foo::beta(i) => {}
-      //~^ ERROR variable `i` is not bound in all patterns
-    }
-}
diff --git a/src/test/compile-fail/issue-28576.rs b/src/test/compile-fail/issue-28576.rs
deleted file mode 100644
index bd7186708a6..00000000000
--- a/src/test/compile-fail/issue-28576.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-pub trait Foo<RHS=Self> {
-    type Assoc;
-}
-
-pub trait Bar: Foo<Assoc=()> {
-    fn new(&self, b: &
-           Bar //~ ERROR the trait `Bar` cannot be made into an object
-              <Assoc=()>
-    );
-}
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-28586.rs b/src/test/compile-fail/issue-28586.rs
deleted file mode 100644
index b8571d2e85e..00000000000
--- a/src/test/compile-fail/issue-28586.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// Regression test for issue #28586
-
-pub trait Foo {}
-impl Foo for [u8; usize::BYTES] {}
-//~^ ERROR no associated item named `BYTES` found for type `usize`
-
-fn main() { }
diff --git a/src/test/compile-fail/issue-28992-empty.rs b/src/test/compile-fail/issue-28992-empty.rs
deleted file mode 100644
index 536784508b7..00000000000
--- a/src/test/compile-fail/issue-28992-empty.rs
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// Can't use constants as tuple struct patterns
-
-
-const C1: i32 = 0;
-
-struct S;
-
-impl S {
-    const C2: i32 = 0;
-}
-
-fn main() {
-    if let C1(..) = 0 {} //~ ERROR expected tuple struct/variant, found constant `C1`
-    if let S::C2(..) = 0 {}
-    //~^ ERROR expected tuple struct/variant, found associated constant `<S>::C2`
-}
diff --git a/src/test/compile-fail/issue-29084.rs b/src/test/compile-fail/issue-29084.rs
deleted file mode 100644
index 6cb6bbf1893..00000000000
--- a/src/test/compile-fail/issue-29084.rs
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-macro_rules! foo {
-    ($d:expr) => {{
-        fn bar(d: u8) { }
-        bar(&mut $d);
-        //~^ ERROR mismatched types
-        //~| expected u8, found &mut u8
-        //~| expected type `u8`
-        //~| found type `&mut u8`
-    }}
-}
-
-fn main() {
-    foo!(0u8);
-    //~^ in this expansion of foo!
-}
diff --git a/src/test/compile-fail/issue-29147.rs b/src/test/compile-fail/issue-29147.rs
deleted file mode 100644
index 0ecaa409412..00000000000
--- a/src/test/compile-fail/issue-29147.rs
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![recursion_limit="1024"]
-
-pub struct S0<T>(T,T);
-pub struct S1<T>(Option<Box<S0<S0<T>>>>,Option<Box<S0<S0<T>>>>);
-pub struct S2<T>(Option<Box<S1<S1<T>>>>,Option<Box<S1<S1<T>>>>);
-pub struct S3<T>(Option<Box<S2<S2<T>>>>,Option<Box<S2<S2<T>>>>);
-pub struct S4<T>(Option<Box<S3<S3<T>>>>,Option<Box<S3<S3<T>>>>);
-pub struct S5<T>(Option<Box<S4<S4<T>>>>,Option<Box<S4<S4<T>>>>,Option<T>);
-
-trait Foo { fn xxx(&self); }
-trait Bar {} // anything local or #[fundamental]
-
-impl<T> Foo for T where T: Bar, T: Sync {
-    fn xxx(&self) {}
-}
-
-impl Foo for S5<u32> { fn xxx(&self) {} }
-impl Foo for S5<u64> { fn xxx(&self) {} }
-
-fn main() {
-    let _ = <S5<_>>::xxx; //~ ERROR cannot resolve `S5<_>: Foo`
-}
diff --git a/src/test/compile-fail/issue-29161.rs b/src/test/compile-fail/issue-29161.rs
deleted file mode 100644
index 97ba222fe45..00000000000
--- a/src/test/compile-fail/issue-29161.rs
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-mod a {
-    struct A;
-
-    impl Default for A {
-        pub fn default() -> A { //~ ERROR unnecessary visibility qualifier
-            A
-        }
-    }
-}
-
-
-fn main() {
-    a::A::default();
-    //~^ ERROR struct `A` is private
- }
diff --git a/src/test/compile-fail/issue-29184.rs b/src/test/compile-fail/issue-29184.rs
deleted file mode 100644
index 98fe12c1b9d..00000000000
--- a/src/test/compile-fail/issue-29184.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn main() {
-    let x: typeof(92) = 92; //~ ERROR `typeof` is a reserved keyword
-}
diff --git a/src/test/compile-fail/issue-2937.rs b/src/test/compile-fail/issue-2937.rs
deleted file mode 100644
index 0d684ec5ae1..00000000000
--- a/src/test/compile-fail/issue-2937.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2012-2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-use m::f as x; //~ ERROR unresolved import `m::f` [E0432]
-               //~^ no `f` in `m`
-
-mod m {}
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-2951.rs b/src/test/compile-fail/issue-2951.rs
deleted file mode 100644
index 11ff7ab2476..00000000000
--- a/src/test/compile-fail/issue-2951.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn foo<T, U>(x: T, y: U) {
-    let mut xx = x;
-    xx = y;
-    //~^  ERROR mismatched types
-    //~| expected type `T`
-    //~| found type `U`
-    //~| expected type parameter, found a different type parameter
-}
-
-fn main() {
-}
diff --git a/src/test/compile-fail/issue-29857.rs b/src/test/compile-fail/issue-29857.rs
deleted file mode 100644
index 661579f52b6..00000000000
--- a/src/test/compile-fail/issue-29857.rs
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-
-#![feature(rustc_attrs)]
-
-use std::marker::PhantomData;
-
-pub trait Foo<P> {}
-
-impl <P, T: Foo<P>> Foo<P> for Option<T> {}
-
-pub struct Qux<T> (PhantomData<*mut T>);
-
-impl<T> Foo<*mut T> for Option<Qux<T>> {}
-
-pub trait Bar {
-    type Output: 'static;
-}
-
-impl<T: 'static, W: Bar<Output = T>> Foo<*mut T> for W {}
-
-#[rustc_error]
-fn main() {} //~ ERROR compilation successful
diff --git a/src/test/compile-fail/issue-29861.rs b/src/test/compile-fail/issue-29861.rs
deleted file mode 100644
index 79514ad376b..00000000000
--- a/src/test/compile-fail/issue-29861.rs
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-pub trait MakeRef<'a> {
-    type Ref;
-}
-impl<'a, T: 'a> MakeRef<'a> for T {
-    type Ref = &'a T;
-}
-
-pub trait MakeRef2 {
-    type Ref2;
-}
-impl<'a, T: 'a> MakeRef2 for T {
-//~^ ERROR the lifetime parameter `'a` is not constrained
-    type Ref2 = <T as MakeRef<'a>>::Ref;
-}
-
-fn foo() -> <String as MakeRef2>::Ref2 { &String::from("foo") }
-
-fn main() {
-    println!("{}", foo());
-}
diff --git a/src/test/compile-fail/issue-2995.rs b/src/test/compile-fail/issue-2995.rs
deleted file mode 100644
index d735e184d5c..00000000000
--- a/src/test/compile-fail/issue-2995.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn bad (p: *const isize) {
-    let _q: &isize = p as &isize; //~ ERROR non-primitive cast
-}
-
-fn main() { }
diff --git a/src/test/compile-fail/issue-30079.rs b/src/test/compile-fail/issue-30079.rs
deleted file mode 100644
index 04ae8f6d255..00000000000
--- a/src/test/compile-fail/issue-30079.rs
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-struct SemiPriv;
-
-mod m1 {
-    struct Priv;
-    impl ::SemiPriv {
-        pub fn f(_: Priv) {} //~ WARN private type `m1::Priv` in public interface
-        //~^ WARNING hard error
-    }
-
-    impl Priv {
-        pub fn f(_: Priv) {} // ok
-    }
-}
-
-mod m2 {
-    struct Priv;
-    impl ::std::ops::Deref for ::SemiPriv {
-        type Target = Priv; //~ ERROR private type `m2::Priv` in public interface
-        fn deref(&self) -> &Self::Target { unimplemented!() }
-    }
-
-    impl ::std::ops::Deref for Priv {
-        type Target = Priv; // ok
-        fn deref(&self) -> &Self::Target { unimplemented!() }
-    }
-}
-
-trait SemiPrivTrait {
-    type Assoc;
-}
-
-mod m3 {
-    struct Priv;
-    impl ::SemiPrivTrait for () {
-        type Assoc = Priv; //~ ERROR private type `m3::Priv` in public interface
-    }
-}
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-3008-3.rs b/src/test/compile-fail/issue-3008-3.rs
deleted file mode 100644
index 66bfab003e9..00000000000
--- a/src/test/compile-fail/issue-3008-3.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-use std::marker;
-
-enum E1 { V1(E2<E1>), }
-enum E2<T> { V2(E2<E1>, marker::PhantomData<T>), }
-//~^ ERROR recursive type `E2` has infinite size
-
-impl E1 { fn foo(&self) {} }
-
-fn main() {
-}
diff --git a/src/test/compile-fail/issue-3021-b.rs b/src/test/compile-fail/issue-3021-b.rs
deleted file mode 100644
index 2b0a24cfdb3..00000000000
--- a/src/test/compile-fail/issue-3021-b.rs
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn siphash(k0 : u64) {
-
-    struct siphash {
-        v0: u64,
-    }
-
-    impl siphash {
-        pub fn reset(&mut self) {
-           self.v0 = k0 ^ 0x736f6d6570736575; //~ ERROR can't capture dynamic environment
-        }
-    }
-}
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-3021-c.rs b/src/test/compile-fail/issue-3021-c.rs
deleted file mode 100644
index 55975cc8e86..00000000000
--- a/src/test/compile-fail/issue-3021-c.rs
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn siphash<T>() {
-
-    trait t {
-        fn g(&self, x: T) -> T;  //~ ERROR can't use type parameters from outer function
-        //~^ ERROR can't use type parameters from outer function
-    }
-}
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-3021-d.rs b/src/test/compile-fail/issue-3021-d.rs
deleted file mode 100644
index c23e12e713a..00000000000
--- a/src/test/compile-fail/issue-3021-d.rs
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-trait siphash {
-    fn result(&self) -> u64;
-    fn reset(&self);
-}
-
-fn siphash(k0 : u64, k1 : u64) {
-    struct SipState {
-        v0: u64,
-        v1: u64,
-    }
-
-    fn mk_result(st : &SipState) -> u64 {
-
-        let v0 = st.v0;
-        let v1 = st.v1;
-        return v0 ^ v1;
-    }
-
-   impl siphash for SipState {
-        fn reset(&self) {
-            self.v0 = k0 ^ 0x736f6d6570736575; //~ ERROR can't capture dynamic environment
-            self.v1 = k1 ^ 0x646f72616e646f6d; //~ ERROR can't capture dynamic environment
-        }
-        fn result(&self) -> u64 { return mk_result(self); }
-    }
-}
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-3021.rs b/src/test/compile-fail/issue-3021.rs
deleted file mode 100644
index f93a333d2ae..00000000000
--- a/src/test/compile-fail/issue-3021.rs
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-trait SipHash {
-    fn reset(&self);
-}
-
-fn siphash(k0 : u64) {
-    struct SipState {
-        v0: u64,
-    }
-
-    impl SipHash for SipState {
-        fn reset(&self) {
-           self.v0 = k0 ^ 0x736f6d6570736575; //~ ERROR can't capture dynamic environment
-        }
-    }
-    panic!();
-}
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-30225.rs b/src/test/compile-fail/issue-30225.rs
deleted file mode 100644
index 7acbbfb8826..00000000000
--- a/src/test/compile-fail/issue-30225.rs
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// Regression test for #30225, which was an ICE that would trigger as
-// a result of a poor interaction between trait result caching and
-// type inference. Specifically, at that time, unification could cause
-// unrelated type variables to become instantiated, if subtyping
-// relationships existed. These relationships are now propagated
-// through obligations and hence everything works out fine.
-
-trait Foo<U,V> : Sized {
-    fn foo(self, u: Option<U>, v: Option<V>) {}
-}
-
-struct A;
-struct B;
-
-impl Foo<A, B> for () {}      // impl A
-impl Foo<u32, u32> for u32 {} // impl B, creating ambiguity
-
-fn toxic() {
-    // cache the resolution <() as Foo<$0,$1>> = impl A
-    let u = None;
-    let v = None;
-    Foo::foo((), u, v);
-}
-
-fn bomb() {
-    let mut u = None; // type is Option<$0>
-    let mut v = None; // type is Option<$1>
-    let mut x = None; // type is Option<$2>
-
-    Foo::foo(x.unwrap(),u,v); // register <$2 as Foo<$0, $1>>
-    u = v; // mark $0 and $1 in a subtype relationship
-    //~^ ERROR mismatched types
-    x = Some(()); // set $2 = (), allowing impl selection
-                  // to proceed for <() as Foo<$0, $1>> = impl A.
-                  // kaboom, this *used* to trigge an ICE
-}
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-30236.rs b/src/test/compile-fail/issue-30236.rs
deleted file mode 100644
index 45a5cd09337..00000000000
--- a/src/test/compile-fail/issue-30236.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-type Foo<
-    Unused //~ ERROR type parameter `Unused` is unused
-    > = u8;
-
-fn main() {
-
-}
-
diff --git a/src/test/compile-fail/issue-30240-b.rs b/src/test/compile-fail/issue-30240-b.rs
deleted file mode 100644
index cf6935b9ba6..00000000000
--- a/src/test/compile-fail/issue-30240-b.rs
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![deny(unreachable_patterns)]
-
-fn main() {
-    match "world" {
-        "hello" => {}
-        _ => {},
-    }
-
-    match "world" {
-        ref _x if false => {}
-        "hello" => {}
-        "hello" => {} //~ ERROR unreachable pattern
-        _ => {},
-    }
-}
-
diff --git a/src/test/compile-fail/issue-30240.rs b/src/test/compile-fail/issue-30240.rs
deleted file mode 100644
index 60fb307d4e1..00000000000
--- a/src/test/compile-fail/issue-30240.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn main() {
-    match "world" { //~ ERROR non-exhaustive patterns: `&_`
-        "hello" => {}
-    }
-
-    match "world" { //~ ERROR non-exhaustive patterns: `&_`
-        ref _x if false => {}
-        "hello" => {}
-    }
-}
diff --git a/src/test/compile-fail/issue-30355.rs b/src/test/compile-fail/issue-30355.rs
deleted file mode 100644
index ee19d040318..00000000000
--- a/src/test/compile-fail/issue-30355.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-pub struct X([u8]);
-
-pub static Y: &'static X = {
-    const Y: &'static [u8] = b"";
-    &X(*Y)
-    //~^ ERROR cannot move out
-    //~^^ ERROR cannot move a
-    //~^^^ ERROR cannot move a
-};
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-3038.rs b/src/test/compile-fail/issue-3038.rs
deleted file mode 100644
index 1eec62df788..00000000000
--- a/src/test/compile-fail/issue-3038.rs
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-enum f { g(isize, isize) }
-
-enum h { i(j, k) }
-
-enum j { l(isize, isize) }
-enum k { m(isize, isize) }
-
-fn main()
-{
-
-    let _z = match f::g(1, 2) {
-      f::g(x, x) => { println!("{}", x + x); }
-      //~^ ERROR identifier `x` is bound more than once in the same pattern
-    };
-
-    let _z = match h::i(j::l(1, 2), k::m(3, 4)) {
-      h::i(j::l(x, _), k::m(_, x))
-      //~^ ERROR identifier `x` is bound more than once in the same pattern
-        => { println!("{}", x + x); }
-    };
-
-    let _z = match (1, 2) {
-        (x, x) => { x } //~ ERROR identifier `x` is bound more than once in the same pattern
-    };
-
-}
diff --git a/src/test/compile-fail/issue-30438-a.rs b/src/test/compile-fail/issue-30438-a.rs
deleted file mode 100644
index 441815de81d..00000000000
--- a/src/test/compile-fail/issue-30438-a.rs
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// Original regression test for Issue #30438.
-
-use std::ops::Index;
-
-struct Test<'a> {
-    s: &'a String
-}
-
-impl <'a> Index<usize> for Test<'a> {
-    type Output = Test<'a>;
-    fn index(&self, _: usize) -> &Self::Output {
-        return &Test { s: &self.s};
-        //~^ ERROR: borrowed value does not live long enough
-    }
-}
-
-fn main() {
-    let s = "Hello World".to_string();
-    let test = Test{s: &s};
-    let r = &test[0];
-    println!("{}", test.s); // OK since test is valid
-    println!("{}", r.s); // Segfault since value pointed by r has already been dropped
-}
diff --git a/src/test/compile-fail/issue-30438-b.rs b/src/test/compile-fail/issue-30438-b.rs
deleted file mode 100644
index 981b196c4ae..00000000000
--- a/src/test/compile-fail/issue-30438-b.rs
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// Modified regression test for Issue #30438 that exposed an
-// independent issue (see discussion on ticket).
-
-use std::ops::Index;
-
-struct Test<'a> {
-    s: &'a String
-}
-
-impl <'a> Index<usize> for Test<'a> {
-    type Output = Test<'a>;
-    fn index(&self, _: usize) -> &Self::Output {
-        &Test { s: &self.s}
-        //~^ ERROR: borrowed value does not live long enough
-    }
-}
-
-fn main() {
-    let s = "Hello World".to_string();
-    let test = Test{s: &s};
-    let r = &test[0];
-    println!("{}", test.s); // OK since test is valid
-    println!("{}", r.s); // Segfault since value pointed by r has already been dropped
-}
diff --git a/src/test/compile-fail/issue-30438-c.rs b/src/test/compile-fail/issue-30438-c.rs
deleted file mode 100644
index 2b4d0dc339b..00000000000
--- a/src/test/compile-fail/issue-30438-c.rs
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// Simplified regression test for #30438, inspired by arielb1.
-
-trait Trait { type Out; }
-
-struct Test<'a> { s: &'a str }
-
-fn silly<'y, 'z>(_s: &'y Test<'z>) -> &'y <Test<'z> as Trait>::Out where 'z: 'static {
-    let x = Test { s: "this cannot last" };
-    &x
-    //~^ ERROR: `x` does not live long enough
-}
-
-impl<'b> Trait for Test<'b> { type Out = Test<'b>; }
-
-fn main() {
-    let orig = Test { s: "Hello World" };
-    let r = silly(&orig);
-    println!("{}", orig.s); // OK since `orig` is valid
-    println!("{}", r.s); // Segfault (method does not return a sane value)
-}
diff --git a/src/test/compile-fail/issue-30560.rs b/src/test/compile-fail/issue-30560.rs
deleted file mode 100644
index 0b1afd75ca9..00000000000
--- a/src/test/compile-fail/issue-30560.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-type Alias = ();
-use Alias::*;
-//~^ ERROR unresolved import `Alias` [E0432]
-//~| Not a module `Alias`
-use std::io::Result::*;
-//~^ ERROR unresolved import `std::io::Result` [E0432]
-//~| Not a module `Result`
-
-trait T {}
-use T::*; //~ ERROR items in traits are not importable
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-30589.rs b/src/test/compile-fail/issue-30589.rs
deleted file mode 100644
index 61721fe58b3..00000000000
--- a/src/test/compile-fail/issue-30589.rs
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-use std::fmt;
-
-impl fmt::Display for DecoderError { //~ ERROR cannot find type `DecoderError` in this scope
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "Missing data: {}", self.0)
-    }
-}
-fn main() {
-}
diff --git a/src/test/compile-fail/issue-3080.rs b/src/test/compile-fail/issue-3080.rs
deleted file mode 100644
index fb16dad3960..00000000000
--- a/src/test/compile-fail/issue-3080.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-struct x(());
-impl x {
-    pub unsafe fn with(&self) { }
-}
-
-fn main() {
-    x(()).with(); //~ ERROR requires unsafe function or block
-}
diff --git a/src/test/compile-fail/issue-3096-1.rs b/src/test/compile-fail/issue-3096-1.rs
deleted file mode 100644
index 62c2639836b..00000000000
--- a/src/test/compile-fail/issue-3096-1.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn main() {
-    match () { } //~ ERROR non-exhaustive
-}
diff --git a/src/test/compile-fail/issue-3096-2.rs b/src/test/compile-fail/issue-3096-2.rs
deleted file mode 100644
index 2d1ad9a2692..00000000000
--- a/src/test/compile-fail/issue-3096-2.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-enum bottom { }
-
-fn main() {
-    let x = &() as *const () as *const bottom;
-    match x { } //~ ERROR non-exhaustive patterns
-}
diff --git a/src/test/compile-fail/issue-3099-a.rs b/src/test/compile-fail/issue-3099-a.rs
deleted file mode 100644
index db60d70ca9b..00000000000
--- a/src/test/compile-fail/issue-3099-a.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-enum a { b, c }
-
-enum a { d, e } //~ ERROR the name `a` is defined multiple times
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-3099-b.rs b/src/test/compile-fail/issue-3099-b.rs
deleted file mode 100644
index 956d2186752..00000000000
--- a/src/test/compile-fail/issue-3099-b.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-pub mod a {}
-
-pub mod a {} //~ ERROR the name `a` is defined multiple times
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-3099.rs b/src/test/compile-fail/issue-3099.rs
deleted file mode 100644
index 42766533556..00000000000
--- a/src/test/compile-fail/issue-3099.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn a(x: String) -> String {
-    format!("First function with {}", x)
-}
-
-fn a(x: String, y: String) -> String { //~ ERROR the name `a` is defined multiple times
-    format!("Second function with {} and {}", x, y)
-}
-
-fn main() {
-    println!("Result: ");
-}
diff --git a/src/test/compile-fail/issue-31011.rs b/src/test/compile-fail/issue-31011.rs
deleted file mode 100644
index 716b0bbe772..00000000000
--- a/src/test/compile-fail/issue-31011.rs
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-macro_rules! log {
-    ( $ctx:expr, $( $args:expr),* ) => {
-        if $ctx.trace {
-        //~^ no field `trace` on type `&T`
-            println!( $( $args, )* );
-        }
-    }
-}
-
-// Create a structure.
-struct Foo {
-  trace: bool,
-}
-
-// Generic wrapper calls log! with a structure.
-fn wrap<T>(context: &T) -> ()
-{
-    log!(context, "entered wrapper");
-    //~^ in this expansion of log!
-}
-
-fn main() {
-    // Create a structure.
-    let x = Foo { trace: true };
-    log!(x, "run started");
-    // Apply a closure which accesses internal fields.
-    wrap(&x);
-    log!(x, "run finished");
-}
diff --git a/src/test/compile-fail/issue-31109.rs b/src/test/compile-fail/issue-31109.rs
deleted file mode 100644
index 74121e3a420..00000000000
--- a/src/test/compile-fail/issue-31109.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn main() {
-    // FIXME(#31407) this error should go away, but in the meantime we test that it
-    // is accompanied by a somewhat useful error message.
-    let _: f64 = 1234567890123456789012345678901234567890e-340;
-    //~^ ERROR could not evaluate float literal (see issue #31407)
-}
diff --git a/src/test/compile-fail/issue-31173.rs b/src/test/compile-fail/issue-31173.rs
deleted file mode 100644
index fb1e3cc87e8..00000000000
--- a/src/test/compile-fail/issue-31173.rs
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-use std::vec::IntoIter;
-
-pub fn get_tok(it: &mut IntoIter<u8>) {
-    let mut found_e = false;
-
-    let temp: Vec<u8> = it.take_while(|&x| {
-        found_e = true;
-        false
-    })
-        .cloned()
-        //~^ ERROR type mismatch resolving
-        //~| expected type `u8`
-        //~| found type `&_`
-        .collect(); //~ ERROR no method named `collect`
-}
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-31212.rs b/src/test/compile-fail/issue-31212.rs
deleted file mode 100644
index 8dc58eee5fb..00000000000
--- a/src/test/compile-fail/issue-31212.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// This checks that a path that cannot be resolved because of an indeterminate import
-// does not trigger an ICE.
-
-mod foo {
-    pub use self::*; //~ ERROR unresolved
-}
-
-fn main() {
-    foo::f(); //~ ERROR cannot find function `f` in module `foo`
-}
diff --git a/src/test/compile-fail/issue-31495.rs b/src/test/compile-fail/issue-31495.rs
deleted file mode 100644
index 794b8bb86bb..00000000000
--- a/src/test/compile-fail/issue-31495.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// compile-flags: --cfg foo(bar)
-// error-pattern: invalid predicate in --cfg command line argument: `foo`
-fn main() {}
diff --git a/src/test/compile-fail/issue-31511.rs b/src/test/compile-fail/issue-31511.rs
deleted file mode 100644
index dd1af2f4448..00000000000
--- a/src/test/compile-fail/issue-31511.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn cast_thin_to_fat(x: *const ()) {
-    x as *const [u8];
-    //~^ ERROR: cannot cast thin pointer `*const ()` to fat pointer `*const [u8]`
-}
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-3154.rs b/src/test/compile-fail/issue-3154.rs
deleted file mode 100644
index 519e9d06d1b..00000000000
--- a/src/test/compile-fail/issue-3154.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-struct thing<'a, Q:'a> {
-    x: &'a Q
-}
-
-fn thing<'a,Q>(x: &Q) -> thing<'a,Q> {
-    thing{ x: x } //~ ERROR 16:5: 16:18: explicit lifetime required in the type of `x` [E0621]
-}
-
-fn main() {
-    thing(&());
-}
diff --git a/src/test/compile-fail/issue-31561.rs b/src/test/compile-fail/issue-31561.rs
deleted file mode 100644
index f8645c4d3a7..00000000000
--- a/src/test/compile-fail/issue-31561.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-enum Thing {
-    Foo(u8),
-    Bar,
-    Baz
-}
-
-fn main() {
-    let Thing::Foo(y) = Thing::Foo(1);
-    //~^ ERROR refutable pattern in local binding: `Bar` not covered
-}
diff --git a/src/test/compile-fail/issue-31769.rs b/src/test/compile-fail/issue-31769.rs
deleted file mode 100644
index 2bd45deeab4..00000000000
--- a/src/test/compile-fail/issue-31769.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright 2012-2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn main() {
-    #[inline] struct Foo;  //~ ERROR attribute should be applied to function or closure
-    #[repr(C)] fn foo() {} //~ ERROR attribute should be applied to struct, enum or union
-}
diff --git a/src/test/compile-fail/issue-31804.rs b/src/test/compile-fail/issue-31804.rs
deleted file mode 100644
index cea52b11c5d..00000000000
--- a/src/test/compile-fail/issue-31804.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// Test that error recovery in the parser to an EOF does not give an infinite
-// spew of errors.
-
-fn main() {
-    let
-} //~ ERROR expected pattern, found `}`
diff --git a/src/test/compile-fail/issue-31845.rs b/src/test/compile-fail/issue-31845.rs
deleted file mode 100644
index 514255e4676..00000000000
--- a/src/test/compile-fail/issue-31845.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// Checks lexical scopes cannot see through normal module boundries
-
-fn f() {
-    fn g() {}
-    mod foo {
-        fn h() {
-           g(); //~ ERROR cannot find function `g` in this scope
-        }
-    }
-}
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-31910.rs b/src/test/compile-fail/issue-31910.rs
deleted file mode 100644
index 7524049c5df..00000000000
--- a/src/test/compile-fail/issue-31910.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-
-enum Enum<T: Trait> {
-    X = Trait::Number,
-    //~^ ERROR mismatched types
-    //~| expected isize, found i32
-}
-
-trait Trait {
-    const Number: i32 = 1;
-}
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-31924-non-snake-ffi.rs b/src/test/compile-fail/issue-31924-non-snake-ffi.rs
deleted file mode 100644
index d9ce1159c0e..00000000000
--- a/src/test/compile-fail/issue-31924-non-snake-ffi.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![feature(rustc_attrs)]
-#![deny(non_snake_case)]
-
-#[no_mangle]
-pub extern "C" fn SparklingGenerationForeignFunctionInterface() {}
-
-#[rustc_error]
-fn main() {} //~ ERROR compilation successful
diff --git a/src/test/compile-fail/issue-32004.rs b/src/test/compile-fail/issue-32004.rs
deleted file mode 100644
index 7e1f4c28d21..00000000000
--- a/src/test/compile-fail/issue-32004.rs
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-enum Foo {
-    Bar(i32),
-    Baz
-}
-
-struct S;
-
-fn main() {
-    match Foo::Baz {
-        Foo::Bar => {}
-        //~^ ERROR expected unit struct/variant or constant, found tuple variant `Foo::Bar`
-        _ => {}
-    }
-
-    match S {
-        S(()) => {}
-        //~^ ERROR expected tuple struct/variant, found unit struct `S`
-    }
-}
diff --git a/src/test/compile-fail/issue-32086.rs b/src/test/compile-fail/issue-32086.rs
deleted file mode 100644
index dd236b76a67..00000000000
--- a/src/test/compile-fail/issue-32086.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-struct S(u8);
-const C: S = S(10);
-
-fn main() {
-    let C(a) = S(11); //~ ERROR expected tuple struct/variant, found constant `C`
-    let C(..) = S(11); //~ ERROR expected tuple struct/variant, found constant `C`
-}
diff --git a/src/test/compile-fail/issue-32119.rs b/src/test/compile-fail/issue-32119.rs
deleted file mode 100644
index e630a01a593..00000000000
--- a/src/test/compile-fail/issue-32119.rs
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![feature(rustc_attrs)]
-#![allow(dead_code)]
-
-pub type T = ();
-mod foo { pub use super::T; }
-mod bar { pub use super::T; }
-
-pub use foo::*;
-pub use bar::*;
-
-mod baz {
-    pub type T = ();
-    mod foo { pub use super::T as S; }
-    mod bar { pub use super::foo::S as T; }
-    pub use self::bar::*;
-}
-
-#[rustc_error]
-fn main() {} //~ ERROR compilation successful
diff --git a/src/test/compile-fail/issue-3214.rs b/src/test/compile-fail/issue-3214.rs
deleted file mode 100644
index 9a769c39eca..00000000000
--- a/src/test/compile-fail/issue-3214.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn foo<T>() {
-    struct foo {
-        x: T, //~ ERROR can't use type parameters from outer function
-    }
-
-    impl<T> Drop for foo<T> {
-        //~^ ERROR wrong number of type arguments
-        fn drop(&mut self) {}
-    }
-}
-fn main() { }
diff --git a/src/test/compile-fail/issue-32201.rs b/src/test/compile-fail/issue-32201.rs
deleted file mode 100644
index bf9f8ecbc80..00000000000
--- a/src/test/compile-fail/issue-32201.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-extern {
-    fn foo(a: i32, ...);
-}
-
-fn bar(_: *const u8) {}
-
-fn main() {
-    unsafe {
-        foo(0, bar);
-        //~^ ERROR can't pass `fn(*const u8) {bar}` to variadic function
-        //~| HELP cast the value to `fn(*const u8)`
-    }
-}
diff --git a/src/test/compile-fail/issue-32222.rs b/src/test/compile-fail/issue-32222.rs
deleted file mode 100644
index b3b34f4b0ef..00000000000
--- a/src/test/compile-fail/issue-32222.rs
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![feature(rustc_attrs)]
-#![allow(warnings)]
-
-mod foo {
-    pub fn bar() {}
-}
-
-pub use foo::*;
-use b::bar;
-
-mod foobar {
-    use super::*;
-}
-
-mod a {
-    pub mod bar {}
-}
-
-mod b {
-    pub use a::bar;
-}
-
-#[rustc_error]
-fn main() {} //~ ERROR compilation successful
diff --git a/src/test/compile-fail/issue-32323.rs b/src/test/compile-fail/issue-32323.rs
deleted file mode 100644
index e5cb8130327..00000000000
--- a/src/test/compile-fail/issue-32323.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-pub trait Tr<'a> {
-    type Out;
-}
-
-pub fn f<'a, T: Tr<'a>>() -> <T as Tr<'a>>::Out {}
-//~^ ERROR mismatched types
-
-pub fn main() {}
diff --git a/src/test/compile-fail/issue-32655.rs b/src/test/compile-fail/issue-32655.rs
deleted file mode 100644
index 25ecd5d0862..00000000000
--- a/src/test/compile-fail/issue-32655.rs
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![allow(dead_code)]
-#![feature(rustc_attrs)]
-
-macro_rules! foo (
-    () => (
-        #[derive_Clone] //~ ERROR attributes of the form
-        struct T;
-    );
-);
-
-macro_rules! bar (
-    ($e:item) => ($e)
-);
-
-foo!();
-
-bar!(
-    #[derive_Clone] //~ ERROR attributes of the form
-    struct S;
-);
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-32709.rs b/src/test/compile-fail/issue-32709.rs
deleted file mode 100644
index 09538818dcd..00000000000
--- a/src/test/compile-fail/issue-32709.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// Make sure that the span of try shorthand does not include the trailing
-// semicolon;
-fn a() -> Result<i32, ()> {
-    Err(5)?; //~ ERROR 14:5: 14:12
-    Ok(1)
-}
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-32782.rs b/src/test/compile-fail/issue-32782.rs
deleted file mode 100644
index 696ea0ef547..00000000000
--- a/src/test/compile-fail/issue-32782.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-macro_rules! bar (
-    () => ()
-);
-
-macro_rules! foo (
-    () => (
-        #[allow_internal_unstable] //~ ERROR allow_internal_unstable side-steps
-        bar!();
-    );
-);
-
-foo!();
-fn main() {}
diff --git a/src/test/compile-fail/issue-32797.rs b/src/test/compile-fail/issue-32797.rs
deleted file mode 100644
index 2c54ed3e857..00000000000
--- a/src/test/compile-fail/issue-32797.rs
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![feature(rustc_attrs)]
-
-pub use bar::*;
-mod bar {
-    pub use super::*;
-}
-
-pub use baz::*;
-mod baz {
-    pub use main as f;
-}
-
-#[rustc_error]
-pub fn main() {} //~ ERROR compilation successful
diff --git a/src/test/compile-fail/issue-32829.rs b/src/test/compile-fail/issue-32829.rs
deleted file mode 100644
index 9ac70882ca2..00000000000
--- a/src/test/compile-fail/issue-32829.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// error-pattern: calls in statics are limited
-
-static S : u64 = { { panic!("foo"); 0 } };
-
-fn main() {
-    println!("{:?}", S);
-}
diff --git a/src/test/compile-fail/issue-32833.rs b/src/test/compile-fail/issue-32833.rs
deleted file mode 100644
index 41383e93603..00000000000
--- a/src/test/compile-fail/issue-32833.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-use bar::Foo; //~ ERROR unresolved import `bar::Foo` [E0432]
-              //~^ no `Foo` in `bar`
-mod bar {
-    use Foo;
-}
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-32922.rs b/src/test/compile-fail/issue-32922.rs
deleted file mode 100644
index 317a47156c1..00000000000
--- a/src/test/compile-fail/issue-32922.rs
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![feature(rustc_attrs)]
-#![allow(warnings)]
-
-macro_rules! foo { () => {
-    let x = 1;
-    macro_rules! bar { () => {x} }
-    let _ = bar!();
-}}
-
-macro_rules! m { // test issue #31856
-    ($n:ident) => (
-        let a = 1;
-        let $n = a;
-    )
-}
-
-macro_rules! baz {
-    ($i:ident) => {
-        let mut $i = 2;
-        $i = $i + 1;
-    }
-}
-
-#[rustc_error]
-fn main() { //~ ERROR compilation successful
-    foo! {};
-    bar! {};
-
-    let mut a = true;
-    baz!(a);
-}
diff --git a/src/test/compile-fail/issue-32963.rs b/src/test/compile-fail/issue-32963.rs
deleted file mode 100644
index 24db822f89c..00000000000
--- a/src/test/compile-fail/issue-32963.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-use std::mem;
-
-trait Misc {}
-
-fn size_of_copy<T: Copy+?Sized>() -> usize { mem::size_of::<T>() }
-
-fn main() {
-    size_of_copy::<Misc+Copy>();
-    //~^ ERROR only auto traits can be used as additional traits in a trait object
-    //~| ERROR the trait bound `dyn Misc: std::marker::Copy` is not satisfied
-}
diff --git a/src/test/compile-fail/issue-32995-2.rs b/src/test/compile-fail/issue-32995-2.rs
deleted file mode 100644
index 18424fcc9e0..00000000000
--- a/src/test/compile-fail/issue-32995-2.rs
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![allow(unused)]
-
-fn main() {
-    { fn f<X: ::std::marker()::Send>() {} }
-    //~^ ERROR parenthesized parameters may only be used with a trait
-    //~| WARN previously accepted
-
-    { fn f() -> impl ::std::marker()::Send { } }
-    //~^ ERROR parenthesized parameters may only be used with a trait
-    //~| WARN previously accepted
-}
-
-#[derive(Clone)]
-struct X;
-
-impl ::std::marker()::Copy for X {}
-//~^ ERROR parenthesized parameters may only be used with a trait
-//~| WARN previously accepted
diff --git a/src/test/compile-fail/issue-32995.rs b/src/test/compile-fail/issue-32995.rs
deleted file mode 100644
index ffbd0c0c22a..00000000000
--- a/src/test/compile-fail/issue-32995.rs
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![allow(unused)]
-
-fn main() {
-    let x: usize() = 1;
-    //~^ ERROR parenthesized parameters may only be used with a trait
-    //~| WARN previously accepted
-
-    let b: ::std::boxed()::Box<_> = Box::new(1);
-    //~^ ERROR parenthesized parameters may only be used with a trait
-    //~| WARN previously accepted
-
-    let p = ::std::str::()::from_utf8(b"foo").unwrap();
-    //~^ ERROR parenthesized parameters may only be used with a trait
-    //~| WARN previously accepted
-
-    let p = ::std::str::from_utf8::()(b"foo").unwrap();
-    //~^ ERROR parenthesized parameters may only be used with a trait
-    //~| WARN previously accepted
-
-    let o : Box<::std::marker()::Send> = Box::new(1);
-    //~^ ERROR parenthesized parameters may only be used with a trait
-    //~| WARN previously accepted
-
-    let o : Box<Send + ::std::marker()::Sync> = Box::new(1);
-    //~^ ERROR parenthesized parameters may only be used with a trait
-    //~| WARN previously accepted
-}
-
-fn foo<X:Default>() {
-    let d : X() = Default::default();
-    //~^ ERROR parenthesized parameters may only be used with a trait
-    //~| WARN previously accepted
-}
diff --git a/src/test/compile-fail/issue-33241.rs b/src/test/compile-fail/issue-33241.rs
deleted file mode 100644
index 6a411b4c59c..00000000000
--- a/src/test/compile-fail/issue-33241.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![feature(rustc_attrs)]
-
-use std::fmt;
-
-// CoerceUnsized is not implemented for tuples. You can still create
-// an unsized tuple by transmuting a trait object.
-fn any<T>() -> T { unreachable!() }
-
-#[rustc_error]
-fn main() { //~ ERROR compilation successful
-    let t: &(u8, fmt::Debug) = any();
-    println!("{:?}", &t.1);
-}
diff --git a/src/test/compile-fail/issue-33293.rs b/src/test/compile-fail/issue-33293.rs
deleted file mode 100644
index bed577b8b9d..00000000000
--- a/src/test/compile-fail/issue-33293.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn main() {
-    match 0 {
-        aaa::bbb(_) => ()
-        //~^ ERROR failed to resolve. Use of undeclared type or module `aaa`
-    };
-}
diff --git a/src/test/compile-fail/issue-3344.rs b/src/test/compile-fail/issue-3344.rs
deleted file mode 100644
index 73532cb768a..00000000000
--- a/src/test/compile-fail/issue-3344.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#[derive(PartialEq)]
-struct thing(usize);
-impl PartialOrd for thing { //~ ERROR not all trait items implemented, missing: `partial_cmp`
-    fn le(&self, other: &thing) -> bool { true }
-    fn ge(&self, other: &thing) -> bool { true }
-}
-fn main() {}
diff --git a/src/test/compile-fail/issue-33464.rs b/src/test/compile-fail/issue-33464.rs
deleted file mode 100644
index b7dbaf20eca..00000000000
--- a/src/test/compile-fail/issue-33464.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// Make sure that the spans of import errors are correct.
-
-use abc::one_el;
-//~^ ERROR 13:5: 13:8
-use abc::{a, bbb, cccccc};
-//~^ ERROR 15:5: 15:8
-use a_very_long_name::{el, el2};
-//~^ ERROR 17:5: 17:21
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-33504.rs b/src/test/compile-fail/issue-33504.rs
deleted file mode 100644
index 1e1994357c7..00000000000
--- a/src/test/compile-fail/issue-33504.rs
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// Shadowing a unit-like enum in a closure
-
-struct Test;
-
-fn main() {
-    || {
-        let Test = 1; //~ ERROR mismatched types
-    };
-}
diff --git a/src/test/compile-fail/issue-33571.rs b/src/test/compile-fail/issue-33571.rs
deleted file mode 100644
index 5dfc41c8f4a..00000000000
--- a/src/test/compile-fail/issue-33571.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#[derive(Clone,
-         Sync, //~ ERROR this unsafe trait should be implemented explicitly
-         Copy)]
-enum Foo {}
diff --git a/src/test/compile-fail/issue-33819.rs b/src/test/compile-fail/issue-33819.rs
deleted file mode 100644
index 499e7e54947..00000000000
--- a/src/test/compile-fail/issue-33819.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-fn main() {
-    let mut op = Some(2);
-    match op {
-        Some(ref v) => { let a = &mut v; },
-        //~^ ERROR:cannot borrow immutable
-        //~| cannot borrow mutably
-        None => {},
-    }
-}
diff --git a/src/test/compile-fail/issue-34028.rs b/src/test/compile-fail/issue-34028.rs
deleted file mode 100644
index 117ab18a115..00000000000
--- a/src/test/compile-fail/issue-34028.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![feature(rustc_attrs)]
-
-macro_rules! m {
-    () => { #[cfg(any())] fn f() {} }
-}
-
-trait T {}
-impl T for () { m!(); }
-
-#[rustc_error]
-fn main() {} //~ ERROR compilation successful
diff --git a/src/test/compile-fail/issue-34171.rs b/src/test/compile-fail/issue-34171.rs
deleted file mode 100644
index 30dd34ae9a0..00000000000
--- a/src/test/compile-fail/issue-34171.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![feature(rustc_attrs)]
-
-macro_rules! null { ($i:tt) => {} }
-macro_rules! apply_null {
-    ($i:item) => { null! { $i } }
-}
-
-#[rustc_error]
-fn main() { //~ ERROR compilation successful
-    apply_null!(#[cfg(all())] fn f() {});
-}
diff --git a/src/test/compile-fail/issue-34222-1.rs b/src/test/compile-fail/issue-34222-1.rs
deleted file mode 100644
index 6c85414860f..00000000000
--- a/src/test/compile-fail/issue-34222-1.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn main() {
-    /// comment //~ ERROR found a documentation comment that doesn't document anything
-}
diff --git a/src/test/compile-fail/issue-34334.rs b/src/test/compile-fail/issue-34334.rs
deleted file mode 100644
index a752a36ade2..00000000000
--- a/src/test/compile-fail/issue-34334.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn main () {
-    let sr: Vec<(u32, _, _) = vec![]; //~ ERROR expected one of `,` or `>`, found `=`
-    let sr2: Vec<(u32, _, _)> = sr.iter().map(|(faction, th_sender, th_receiver)| {}).collect();
-}
diff --git a/src/test/compile-fail/issue-34349.rs b/src/test/compile-fail/issue-34349.rs
deleted file mode 100644
index 591753181db..00000000000
--- a/src/test/compile-fail/issue-34349.rs
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// This is a regression test for a problem encountered around upvar
-// inference and trait caching: in particular, we were entering a
-// temporary closure kind during inference, and then caching results
-// based on that temporary kind, which led to no error being reported
-// in this particular test.
-
-fn main() {
-    let inc = || {};
-    inc();
-
-    fn apply<F>(f: F) where F: Fn() {
-        f()
-    }
-
-    let mut farewell = "goodbye".to_owned();
-    let diary = || { //~ ERROR E0525
-        farewell.push_str("!!!");
-        println!("Then I screamed {}.", farewell);
-    };
-
-    apply(diary);
-}
diff --git a/src/test/compile-fail/issue-34373.rs b/src/test/compile-fail/issue-34373.rs
deleted file mode 100644
index 4d7238ad76f..00000000000
--- a/src/test/compile-fail/issue-34373.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![allow(warnings)]
-
-trait Trait<T> {
-    fn foo(_: T) {}
-}
-
-pub struct Foo<T = Box<Trait<DefaultFoo>>>;  //~ ERROR cycle detected
-type DefaultFoo = Foo;
-
-fn main() {
-}
diff --git a/src/test/compile-fail/issue-34418.rs b/src/test/compile-fail/issue-34418.rs
deleted file mode 100644
index 6bc0add2205..00000000000
--- a/src/test/compile-fail/issue-34418.rs
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![feature(rustc_attrs)]
-#![allow(unused)]
-
-macro_rules! make_item {
-    () => { fn f() {} }
-}
-
-macro_rules! make_stmt {
-    () => { let x = 0; }
-}
-
-fn f() {
-    make_item! {}
-}
-
-fn g() {
-    make_stmt! {}
-}
-
-#[rustc_error]
-fn main() {} //~ ERROR compilation successful
diff --git a/src/test/compile-fail/issue-3477.rs b/src/test/compile-fail/issue-3477.rs
deleted file mode 100644
index 0bad7372a12..00000000000
--- a/src/test/compile-fail/issue-3477.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn main() {
-    let _p: char = 100;
-    //~^ ERROR mismatched types
-    //~| expected char, found u8
-}
diff --git a/src/test/compile-fail/issue-34839.rs b/src/test/compile-fail/issue-34839.rs
deleted file mode 100644
index be7e7820020..00000000000
--- a/src/test/compile-fail/issue-34839.rs
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![feature(rustc_attrs)]
-#![allow(dead_code)]
-
-trait RegularExpression: Sized {
-    type Text;
-}
-
-struct ExecNoSyncStr<'a>(&'a u8);
-
-impl<'c> RegularExpression for ExecNoSyncStr<'c> {
-    type Text = u8;
-}
-
-struct FindCaptures<'t, R>(&'t R::Text) where R: RegularExpression, R::Text: 't;
-
-enum FindCapturesInner<'r, 't> {
-    Dynamic(FindCaptures<'t, ExecNoSyncStr<'r>>),
-}
-
-#[rustc_error]
-fn main() {}    //~ ERROR compilation successful
diff --git a/src/test/compile-fail/issue-35075.rs b/src/test/compile-fail/issue-35075.rs
deleted file mode 100644
index 9943cfb9bca..00000000000
--- a/src/test/compile-fail/issue-35075.rs
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-struct Bar<T> {
-    inner: Foo<T> //~ ERROR cannot find type `Foo` in this scope
-}
-
-enum Baz<T> {
-    Foo(Foo<T>) //~ ERROR cannot find type `Foo` in this scope
-}
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-3521-2.rs b/src/test/compile-fail/issue-3521-2.rs
deleted file mode 100644
index 1742cb4fb72..00000000000
--- a/src/test/compile-fail/issue-3521-2.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn main() {
-    let foo = 100;
-
-    static y: isize = foo + 1;
-    //~^ ERROR can't capture dynamic environment
-
-    println!("{}", y);
-}
diff --git a/src/test/compile-fail/issue-3521.rs b/src/test/compile-fail/issue-3521.rs
deleted file mode 100644
index 78af11a0b58..00000000000
--- a/src/test/compile-fail/issue-3521.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn main() {
-    let foo = 100;
-
-    #[derive(Debug)]
-    enum Stuff {
-        Bar = foo
-        //~^ ERROR attempt to use a non-constant value in a constant
-    }
-
-    println!("{:?}", Stuff::Bar);
-}
diff --git a/src/test/compile-fail/issue-35450.rs b/src/test/compile-fail/issue-35450.rs
deleted file mode 100644
index 5f54f269c6c..00000000000
--- a/src/test/compile-fail/issue-35450.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-macro_rules! m { ($($t:tt)*) => { $($t)* } }
-
-fn main() {
-    m!($t); //~ ERROR expected expression
-}
diff --git a/src/test/compile-fail/issue-35570.rs b/src/test/compile-fail/issue-35570.rs
deleted file mode 100644
index 092bf00ddd6..00000000000
--- a/src/test/compile-fail/issue-35570.rs
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![feature(rustc_attrs)]
-
-use std::mem;
-
-trait Trait1<T> {}
-trait Trait2<'a> {
-  type Ty;
-}
-
-fn _ice(param: Box<for <'a> Trait1<<() as Trait2<'a>>::Ty>>) {
-    let _e: (usize, usize) = unsafe{mem::transmute(param)};
-}
-
-trait Lifetime<'a> {
-    type Out;
-}
-impl<'a> Lifetime<'a> for () {
-    type Out = &'a ();
-}
-fn foo<'a>(x: &'a ()) -> <() as Lifetime<'a>>::Out {
-    x
-}
-
-fn takes_lifetime(_f: for<'a> fn(&'a ()) -> <() as Lifetime<'a>>::Out) {
-}
-
-#[rustc_error]
-fn main() { //~ ERROR compilation successful
-    takes_lifetime(foo);
-}
diff --git a/src/test/compile-fail/issue-35668.rs b/src/test/compile-fail/issue-35668.rs
deleted file mode 100644
index 17fd77b6df3..00000000000
--- a/src/test/compile-fail/issue-35668.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn func<'a, T>(a: &'a [T]) -> impl Iterator<Item=&'a T> {
-    a.iter().map(|a| a*a)
-    //~^ ERROR binary operation `*` cannot be applied to type `&T`
-}
-
-fn main() {
-    let a = (0..30).collect::<Vec<_>>();
-
-    for k in func(&a) {
-        println!("{}", k);
-    }
-}
diff --git a/src/test/compile-fail/issue-35988.rs b/src/test/compile-fail/issue-35988.rs
deleted file mode 100644
index 5909322ff1f..00000000000
--- a/src/test/compile-fail/issue-35988.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-enum E {
-    V([Box<E>]),
-    //~^ ERROR the size for values of type
-}
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-3601.rs b/src/test/compile-fail/issue-3601.rs
deleted file mode 100644
index cc69a76e043..00000000000
--- a/src/test/compile-fail/issue-3601.rs
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright 2012-2013 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![feature(box_patterns)]
-#![feature(box_syntax)]
-
-struct HTMLImageData {
-    image: Option<String>
-}
-
-struct ElementData {
-    kind: Box<ElementKind>
-}
-
-enum ElementKind {
-    HTMLImageElement(HTMLImageData)
-}
-
-enum NodeKind {
-    Element(ElementData)
-}
-
-struct NodeData {
-    kind: Box<NodeKind>,
-}
-
-fn main() {
-    let mut id = HTMLImageData { image: None };
-    let ed = ElementData { kind: box ElementKind::HTMLImageElement(id) };
-    let n = NodeData {kind : box NodeKind::Element(ed)};
-    // n.b. span could be better
-    match n.kind {
-        box NodeKind::Element(ed) => match ed.kind { //~ ERROR non-exhaustive patterns
-            box ElementKind::HTMLImageElement(ref d) if d.image.is_some() => { true }
-        },
-    };
-}
diff --git a/src/test/compile-fail/issue-36082.rs b/src/test/compile-fail/issue-36082.rs
deleted file mode 100644
index ed6a2f85fbe..00000000000
--- a/src/test/compile-fail/issue-36082.rs
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// revisions: ast mir
-//[mir]compile-flags: -Z borrowck=mir
-
-// FIXME(#49821) -- No tip about using a let binding
-
-use std::cell::RefCell;
-
-fn main() {
-    let mut r = 0;
-    let s = 0;
-    let x = RefCell::new((&mut r,s));
-
-    let val: &_ = x.borrow().0;
-    //[ast]~^ ERROR borrowed value does not live long enough [E0597]
-    //[ast]~| NOTE temporary value dropped here while still borrowed
-    //[ast]~| NOTE temporary value does not live long enough
-    //[ast]~| NOTE consider using a `let` binding to increase its lifetime
-    //[mir]~^^^^^ ERROR borrowed value does not live long enough [E0597]
-    //[mir]~| NOTE temporary value does not live long enough
-    //[mir]~| NOTE temporary value only lives until here
-    println!("{}", val);
-    //[mir]~^ borrow later used here
-}
-//[ast]~^ NOTE temporary value needs to live until here
diff --git a/src/test/compile-fail/issue-36116.rs b/src/test/compile-fail/issue-36116.rs
deleted file mode 100644
index 3afbfa61984..00000000000
--- a/src/test/compile-fail/issue-36116.rs
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// Unnecessary path disambiguator is ok
-
-#![feature(rustc_attrs)]
-#![allow(unused)]
-
-macro_rules! m {
-    ($p: path) => {
-        let _ = $p(0);
-        let _: $p;
-    }
-}
-
-struct Foo<T> {
-    _a: T,
-}
-
-struct S<T>(T);
-
-fn f() {
-    let f = Some(Foo { _a: 42 }).map(|a| a as Foo::<i32>); //~ WARN unnecessary path disambiguator
-    let g: Foo::<i32> = Foo { _a: 42 }; //~ WARN unnecessary path disambiguator
-
-    m!(S::<u8>); // OK, no warning
-}
-
-#[rustc_error]
-fn main() {} //~ ERROR compilation successful
diff --git a/src/test/compile-fail/issue-36299.rs b/src/test/compile-fail/issue-36299.rs
deleted file mode 100644
index 88ac74cb09e..00000000000
--- a/src/test/compile-fail/issue-36299.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-struct Foo<'a, A> {}
-//~^ ERROR parameter `'a` is never used
-//~| ERROR parameter `A` is never used
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-36379.rs b/src/test/compile-fail/issue-36379.rs
deleted file mode 100644
index b20765815e0..00000000000
--- a/src/test/compile-fail/issue-36379.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![feature(rustc_attrs)]
-
-fn _test() -> impl Default { }
-
-#[rustc_error]
-fn main() { } //~ ERROR compilation successful
diff --git a/src/test/compile-fail/issue-36617.rs b/src/test/compile-fail/issue-36617.rs
deleted file mode 100644
index 9f5eeb1a45d..00000000000
--- a/src/test/compile-fail/issue-36617.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![derive(Copy)] //~ ERROR `derive` may only be applied to structs, enums and unions
diff --git a/src/test/compile-fail/issue-36638.rs b/src/test/compile-fail/issue-36638.rs
deleted file mode 100644
index 5e43536ef3f..00000000000
--- a/src/test/compile-fail/issue-36638.rs
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// compile-flags: -Z continue-parse-after-error
-
-struct Foo<Self>(Self);
-//~^ ERROR expected identifier, found keyword `Self`
-
-trait Bar<Self> {}
-//~^ ERROR expected identifier, found keyword `Self`
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-3668-2.rs b/src/test/compile-fail/issue-3668-2.rs
deleted file mode 100644
index fe46877e8d3..00000000000
--- a/src/test/compile-fail/issue-3668-2.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn f(x:isize) {
-    static child: isize = x + 1;
-    //~^ ERROR can't capture dynamic environment
-}
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-3668.rs b/src/test/compile-fail/issue-3668.rs
deleted file mode 100644
index 00f64414a9e..00000000000
--- a/src/test/compile-fail/issue-3668.rs
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-struct P { child: Option<Box<P>> }
-trait PTrait {
-   fn getChildOption(&self) -> Option<Box<P>>;
-}
-
-impl PTrait for P {
-   fn getChildOption(&self) -> Option<Box<P>> {
-       static childVal: Box<P> = self.child.get();
-       //~^ ERROR can't capture dynamic environment
-       panic!();
-   }
-}
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-3680.rs b/src/test/compile-fail/issue-3680.rs
deleted file mode 100644
index e698e6da529..00000000000
--- a/src/test/compile-fail/issue-3680.rs
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn main() {
-    match None {
-        Err(_) => ()
-        //~^ ERROR mismatched types
-        //~| expected type `std::option::Option<_>`
-        //~| found type `std::result::Result<_, _>`
-        //~| expected enum `std::option::Option`, found enum `std::result::Result`
-    }
-}
diff --git a/src/test/compile-fail/issue-36839.rs b/src/test/compile-fail/issue-36839.rs
deleted file mode 100644
index 3e34b250672..00000000000
--- a/src/test/compile-fail/issue-36839.rs
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![feature(rustc_attrs)]
-
-pub trait Foo {
-    type Bar;
-}
-
-pub trait Broken {
-    type Assoc;
-    fn broken(&self) where Self::Assoc: Foo;
-}
-
-impl<T> Broken for T {
-    type Assoc = ();
-    fn broken(&self) where Self::Assoc: Foo {
-        let _x: <Self::Assoc as Foo>::Bar;
-    }
-}
-
-#[rustc_error]
-fn main() { //~ ERROR compilation successful
-    let _m: &Broken<Assoc=()> = &();
-}
diff --git a/src/test/compile-fail/issue-3702-2.rs b/src/test/compile-fail/issue-3702-2.rs
deleted file mode 100644
index 325f05841f4..00000000000
--- a/src/test/compile-fail/issue-3702-2.rs
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-pub trait ToPrimitive {
-    fn to_int(&self) -> isize { 0 }
-}
-
-impl ToPrimitive for i32 {}
-impl ToPrimitive for isize {}
-
-trait Add {
-    fn to_int(&self) -> isize;
-    fn add_dynamic(&self, other: &Add) -> isize;
-}
-
-impl Add for isize {
-    fn to_int(&self) -> isize { *self }
-    fn add_dynamic(&self, other: &Add) -> isize {
-        self.to_int() + other.to_int() //~ ERROR multiple applicable items in scope
-    }
-}
-
-fn main() { }
diff --git a/src/test/compile-fail/issue-37026.rs b/src/test/compile-fail/issue-37026.rs
deleted file mode 100644
index 95fd5d1222e..00000000000
--- a/src/test/compile-fail/issue-37026.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// aux-build:empty-struct.rs
-
-extern crate empty_struct;
-
-fn main() {
-    let empty_struct::XEmpty2 = (); //~ ERROR mismatched types
-    let empty_struct::XEmpty6(..) = (); //~ ERROR mismatched types
-}
diff --git a/src/test/compile-fail/issue-37051.rs b/src/test/compile-fail/issue-37051.rs
deleted file mode 100644
index ab08e1899a0..00000000000
--- a/src/test/compile-fail/issue-37051.rs
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![feature(rustc_attrs, associated_type_defaults)]
-#![allow(warnings)]
-
-trait State: Sized {
-    type NextState: State = StateMachineEnded;
-    fn execute(self) -> Option<Self::NextState>;
-}
-
-struct StateMachineEnded;
-
-impl State for StateMachineEnded {
-    fn execute(self) -> Option<Self::NextState> {
-        None
-    }
-}
-
-#[rustc_error]
-fn main() { //~ ERROR compilation successful
-}
diff --git a/src/test/compile-fail/issue-3707.rs b/src/test/compile-fail/issue-3707.rs
deleted file mode 100644
index ad56b125b08..00000000000
--- a/src/test/compile-fail/issue-3707.rs
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-struct Obj {
-    member: usize
-}
-
-impl Obj {
-    pub fn boom() -> bool {
-        return 1+1 == 2
-    }
-    pub fn chirp(&self) {
-        self.boom(); //~ ERROR no method named `boom` found for type `&Obj` in the current scope
-    }
-}
-
-fn main() {
-    let o = Obj { member: 0 };
-    o.chirp();
-    1 + 1;
-}
diff --git a/src/test/compile-fail/issue-37323.rs b/src/test/compile-fail/issue-37323.rs
deleted file mode 100644
index 98806cdd1b9..00000000000
--- a/src/test/compile-fail/issue-37323.rs
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![feature(rustc_attrs)]
-#![allow(warnings)]
-
-#[derive(Debug)]
-struct Point {
-}
-
-struct NestedA<'a, 'b> {
-    x: &'a NestedB<'b>
-    //~^ ERROR E0491
-}
-
-struct NestedB<'a> {
-    x: &'a i32,
-}
-
-fn main() {
-}
diff --git a/src/test/compile-fail/issue-37366.rs b/src/test/compile-fail/issue-37366.rs
deleted file mode 100644
index 2a4808fb186..00000000000
--- a/src/test/compile-fail/issue-37366.rs
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// ignore-emscripten
-
-#![feature(rustc_attrs, asm)]
-
-macro_rules! interrupt_handler {
-    () => {
-        unsafe fn _interrupt_handler() {
-            asm!("pop  eax" :::: "intel");
-        }
-    }
-}
-interrupt_handler!{}
-
-#[rustc_error]
-fn main() { //~ ERROR compilation successful
-}
diff --git a/src/test/compile-fail/issue-37510.rs b/src/test/compile-fail/issue-37510.rs
deleted file mode 100644
index 53c91f323d0..00000000000
--- a/src/test/compile-fail/issue-37510.rs
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![feature(rustc_attrs)]
-
-fn foo(_: &mut i32) -> bool { true }
-
-#[rustc_error]
-fn main() { //~ ERROR compilation successful
-    let opt = Some(92);
-    let mut x = 62;
-
-    if let Some(_) = opt {
-
-    } else if foo(&mut x) {
-
-    }
-}
diff --git a/src/test/compile-fail/issue-37515.rs b/src/test/compile-fail/issue-37515.rs
deleted file mode 100644
index d5733f98193..00000000000
--- a/src/test/compile-fail/issue-37515.rs
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![feature(rustc_attrs)]
-#![warn(unused)]
-
-type Z = for<'x> Send;
-//~^ WARN type alias is never used
-
-#[rustc_error]
-fn main() { //~ ERROR compilation successful
-}
diff --git a/src/test/compile-fail/issue-37534.rs b/src/test/compile-fail/issue-37534.rs
deleted file mode 100644
index 70c8f92de63..00000000000
--- a/src/test/compile-fail/issue-37534.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-struct Foo<T: ?Hash> { }
-//~^ ERROR cannot find trait `Hash` in this scope
-//~^^ ERROR parameter `T` is never used
-//~^^^ WARN default bound relaxed for a type parameter, but this does nothing
-
-fn main() { }
diff --git a/src/test/compile-fail/issue-37550.rs b/src/test/compile-fail/issue-37550.rs
deleted file mode 100644
index af1f6ef5ed4..00000000000
--- a/src/test/compile-fail/issue-37550.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![feature(const_fn)]
-
-const fn x() {
-    let t = true;
-    //~^ ERROR let bindings in constant functions are unstable
-    //~| ERROR statements in constant functions are unstable
-    let x = || t;
-    //~^ ERROR let bindings in constant functions are unstable
-    //~| ERROR statements in constant functions are unstable
-}
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-37576.rs b/src/test/compile-fail/issue-37576.rs
deleted file mode 100644
index e3c1ada878d..00000000000
--- a/src/test/compile-fail/issue-37576.rs
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn main() {
-    'test_1: while break 'test_1 {}
-    while break {}
-    //~^ ERROR `break` or `continue` with no label
-
-    'test_2: while let true = break 'test_2 {}
-    while let true = break {}
-    //~^ ERROR `break` or `continue` with no label
-
-    loop { 'test_3: while break 'test_3 {} }
-    loop { while break {} }
-    //~^ ERROR `break` or `continue` with no label
-
-    loop {
-        'test_4: while break 'test_4 {}
-        break;
-    }
-    loop {
-        while break {}
-        //~^ ERROR `break` or `continue` with no label
-        break;
-    }
-
-    'test_5: while continue 'test_5 {}
-    while continue {}
-    //~^ ERROR `break` or `continue` with no label
-
-    'test_6: while let true = continue 'test_6 {}
-    while let true = continue {}
-    //~^ ERROR `break` or `continue` with no label
-
-    loop { 'test_7: while continue 'test_7 {} }
-    loop { while continue {} }
-    //~^ ERROR `break` or `continue` with no label
-
-    loop {
-        'test_8: while continue 'test_8 {}
-        continue;
-    }
-    loop {
-        while continue {}
-        //~^ ERROR `break` or `continue` with no label
-        continue;
-    }
-}
diff --git a/src/test/compile-fail/issue-3763.rs b/src/test/compile-fail/issue-3763.rs
deleted file mode 100644
index 851f5dfeabe..00000000000
--- a/src/test/compile-fail/issue-3763.rs
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-mod my_mod {
-    pub struct MyStruct {
-        priv_field: isize
-    }
-    pub fn MyStruct () -> MyStruct {
-        MyStruct {priv_field: 4}
-    }
-    impl MyStruct {
-        fn happyfun(&self) {}
-    }
-}
-
-fn main() {
-    let my_struct = my_mod::MyStruct();
-    let _woohoo = (&my_struct).priv_field;
-    //~^ ERROR field `priv_field` of struct `my_mod::MyStruct` is private
-
-    let _woohoo = (Box::new(my_struct)).priv_field;
-    //~^ ERROR field `priv_field` of struct `my_mod::MyStruct` is private
-
-    (&my_struct).happyfun();               //~ ERROR method `happyfun` is private
-
-    (Box::new(my_struct)).happyfun();          //~ ERROR method `happyfun` is private
-    let nope = my_struct.priv_field;
-    //~^ ERROR field `priv_field` of struct `my_mod::MyStruct` is private
-}
diff --git a/src/test/compile-fail/issue-37665.rs b/src/test/compile-fail/issue-37665.rs
deleted file mode 100644
index 81ed4375e77..00000000000
--- a/src/test/compile-fail/issue-37665.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// compile-flags: -Z unpretty=mir
-// ignore-cloudabi no std::path
-
-use std::path::MAIN_SEPARATOR;
-
-fn main() {
-    let mut foo : String = "hello".to_string();
-    foo.push(MAIN_SEPARATOR);
-    println!("{}", foo);
-    let x: () = 0; //~ ERROR: mismatched types
-}
diff --git a/src/test/compile-fail/issue-37887.rs b/src/test/compile-fail/issue-37887.rs
deleted file mode 100644
index f120bbbfc9f..00000000000
--- a/src/test/compile-fail/issue-37887.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn main() {
-    extern crate libc; //~ ERROR use of unstable
-    use libc::*; //~ ERROR unresolved import
-}
diff --git a/src/test/compile-fail/issue-38160.rs b/src/test/compile-fail/issue-38160.rs
deleted file mode 100644
index 311d0ceb4d3..00000000000
--- a/src/test/compile-fail/issue-38160.rs
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![feature(associated_consts, rustc_attrs)]
-#![allow(warnings)]
-
-trait MyTrait {
-    const MY_CONST: &'static str;
-}
-
-macro_rules! my_macro {
-    () => {
-        struct MyStruct;
-
-        impl MyTrait for MyStruct {
-            const MY_CONST: &'static str = stringify!(abc);
-        }
-    }
-}
-
-my_macro!();
-
-#[rustc_error]
-fn main() {} //~ ERROR compilation successful
diff --git a/src/test/compile-fail/issue-3820.rs b/src/test/compile-fail/issue-3820.rs
deleted file mode 100644
index 28de76f18da..00000000000
--- a/src/test/compile-fail/issue-3820.rs
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-struct Thing {
-    x: isize
-}
-
-impl Thing {
-    fn mul(&self, c: &isize) -> Thing {
-        Thing {x: self.x * *c}
-    }
-}
-
-fn main() {
-    let u = Thing {x: 2};
-    let _v = u.mul(&3); // This is ok
-    let w = u * 3; //~ ERROR binary operation `*` cannot be applied to type `Thing`
-}
diff --git a/src/test/compile-fail/issue-38293.rs b/src/test/compile-fail/issue-38293.rs
deleted file mode 100644
index 1867bafa7e3..00000000000
--- a/src/test/compile-fail/issue-38293.rs
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// Test that `fn foo::bar::{self}` only imports `bar` in the type namespace.
-
-mod foo {
-    pub fn f() { }
-}
-use foo::f::{self}; //~ ERROR unresolved import `foo::f`
-
-mod bar {
-    pub fn baz() {}
-    pub mod baz {}
-}
-use bar::baz::{self};
-
-fn main() {
-    baz(); //~ ERROR expected function, found module `baz`
-}
diff --git a/src/test/compile-fail/issue-38381.rs b/src/test/compile-fail/issue-38381.rs
deleted file mode 100644
index 6b7dde117df..00000000000
--- a/src/test/compile-fail/issue-38381.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![feature(rustc_attrs)]
-
-use std::ops::Deref;
-
-#[rustc_error]
-fn main() { //~ ERROR compilation successful
-    let _x: fn(&i32) -> <&i32 as Deref>::Target = unimplemented!();
-}
diff --git a/src/test/compile-fail/issue-38404.rs b/src/test/compile-fail/issue-38404.rs
deleted file mode 100644
index a2b0d0a60c0..00000000000
--- a/src/test/compile-fail/issue-38404.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-trait A<T>: std::ops::Add<Self> + Sized {}
-trait B<T>: A<T> {}
-trait C<T>: A<B<T, Output=usize>> {}
-//~^ ERROR the trait `B` cannot be made into an object
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-38412.rs b/src/test/compile-fail/issue-38412.rs
deleted file mode 100644
index b4feadbacf7..00000000000
--- a/src/test/compile-fail/issue-38412.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn main() {
-    let Box(a) = loop { };
-    //~^ ERROR expected tuple struct/variant, found struct `Box`
-
-    // (The below is a trick to allow compiler to infer a type for
-    // variable `a` without attempting to ascribe a type to the
-    // pattern or otherwise attempting to name the Box type, which
-    // would run afoul of issue #22207)
-    let _b: *mut i32 = *a;
-}
diff --git a/src/test/compile-fail/issue-38458.rs b/src/test/compile-fail/issue-38458.rs
deleted file mode 100644
index 56eb5f874cd..00000000000
--- a/src/test/compile-fail/issue-38458.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-const x: () = {
-    return; //~ ERROR return statement outside of function body
-};
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-38604.rs b/src/test/compile-fail/issue-38604.rs
deleted file mode 100644
index c1939a7707f..00000000000
--- a/src/test/compile-fail/issue-38604.rs
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-trait Q<T:?Sized> {}
-trait Foo where u32: Q<Self> {
-    fn foo(&self);
-}
-
-impl Q<()> for u32 {}
-impl Foo for () {
-    fn foo(&self) {
-        println!("foo!");
-    }
-}
-
-fn main() {
-    let _f: Box<Foo> = //~ ERROR `Foo` cannot be made into an object
-        Box::new(()); //~ ERROR `Foo` cannot be made into an object
-}
diff --git a/src/test/compile-fail/issue-38857.rs b/src/test/compile-fail/issue-38857.rs
deleted file mode 100644
index b38b1b9fdc6..00000000000
--- a/src/test/compile-fail/issue-38857.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn main() {
-    let a = std::sys::imp::process::process_common::StdioPipes { ..panic!() };
-    //~^ ERROR failed to resolve. Could not find `imp` in `sys` [E0433]
-    //~^^ ERROR module `sys` is private [E0603]
-}
diff --git a/src/test/compile-fail/issue-38868.rs b/src/test/compile-fail/issue-38868.rs
deleted file mode 100644
index c7e1da7094f..00000000000
--- a/src/test/compile-fail/issue-38868.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-pub struct List<T> {
-    head: T,
-}
-
-impl Drop for List<i32> { //~ ERROR E0366
-    fn drop(&mut self) {
-        panic!()
-    }
-}
-
-fn main() {
-    List { head: 0 };
-}
diff --git a/src/test/compile-fail/issue-38919.rs b/src/test/compile-fail/issue-38919.rs
deleted file mode 100644
index e6cee4afd59..00000000000
--- a/src/test/compile-fail/issue-38919.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn foo<T: Iterator>() {
-    T::Item; //~ ERROR no associated item named `Item` found for type `T` in the current scope
-}
-
-fn main() { }
diff --git a/src/test/compile-fail/issue-38954.rs b/src/test/compile-fail/issue-38954.rs
deleted file mode 100644
index 7f01ed3f820..00000000000
--- a/src/test/compile-fail/issue-38954.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn _test(ref _p: str) {}
-//~^ ERROR the size for values of type
-
-fn main() { }
diff --git a/src/test/compile-fail/issue-39211.rs b/src/test/compile-fail/issue-39211.rs
deleted file mode 100644
index 96ba1c83997..00000000000
--- a/src/test/compile-fail/issue-39211.rs
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![feature(associated_consts)]
-
-trait VecN {
-    const DIM: usize;
-}
-trait Mat {
-    type Row: VecN;
-}
-
-fn m<M: Mat>() {
-    let a = [3; M::Row::DIM]; //~ ERROR associated type `Row` not found for `M`
-}
-fn main() {
-}
diff --git a/src/test/compile-fail/issue-39362.rs b/src/test/compile-fail/issue-39362.rs
deleted file mode 100644
index 9d8abbfc65d..00000000000
--- a/src/test/compile-fail/issue-39362.rs
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-enum Foo {
-    Bar { bar: Bar, id: usize }
-}
-
-enum Bar {
-    A, B, C, D, E, F
-}
-
-fn test(f: Foo) {
-    match f {
-        //~^ ERROR non-exhaustive patterns
-        //~| patterns
-        Foo::Bar { bar: Bar::A, .. } => (),
-        Foo::Bar { bar: Bar::B, .. } => (),
-    }
-}
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-39388.rs b/src/test/compile-fail/issue-39388.rs
deleted file mode 100644
index 6da04937408..00000000000
--- a/src/test/compile-fail/issue-39388.rs
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![allow(unused_macros)]
-
-macro_rules! assign {
-    (($($a:tt)*) = ($($b:tt))*) => { //~ ERROR expected one of: `*`, `+`, or `?`
-        $($a)* = $($b)*
-    }
-}
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-39404.rs b/src/test/compile-fail/issue-39404.rs
deleted file mode 100644
index 56bfe27a4ff..00000000000
--- a/src/test/compile-fail/issue-39404.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![allow(unused)]
-
-macro_rules! m { ($i) => {} }
-//~^ ERROR missing fragment specifier
-//~| WARN previously accepted
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-39559-2.rs b/src/test/compile-fail/issue-39559-2.rs
deleted file mode 100644
index f01fd1fd8f1..00000000000
--- a/src/test/compile-fail/issue-39559-2.rs
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-trait Dim {
-    fn dim() -> usize;
-}
-
-enum Dim3 {}
-
-impl Dim for Dim3 {
-    fn dim() -> usize {
-        3
-    }
-}
-
-fn main() {
-    let array: [usize; Dim3::dim()]
-    //~^ ERROR E0015
-    //~| ERROR E0080
-        = [0; Dim3::dim()];
-        //~^ ERROR E0015
-        //~| ERROR E0080
-}
diff --git a/src/test/compile-fail/issue-39559.rs b/src/test/compile-fail/issue-39559.rs
deleted file mode 100644
index 2da21fb14bd..00000000000
--- a/src/test/compile-fail/issue-39559.rs
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-trait Dim {
-    fn dim() -> usize;
-}
-
-enum Dim3 {}
-
-impl Dim for Dim3 {
-    fn dim() -> usize {
-        3
-    }
-}
-
-pub struct Vector<T, D: Dim> {
-    entries: [T; D::dim()],
-    //~^ ERROR no function or associated item named `dim` found for type `D` in the current scope
-    _dummy: D,
-}
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-39616.rs b/src/test/compile-fail/issue-39616.rs
deleted file mode 100644
index 13b4c0896e7..00000000000
--- a/src/test/compile-fail/issue-39616.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn foo(a: [0; 1]) {} //~ ERROR expected type, found `0`
-//~| ERROR expected one of `)`, `,`, `->`, `where`, or `{`, found `]`
-// FIXME(jseyfried): avoid emitting the second error (preexisting)
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-39687.rs b/src/test/compile-fail/issue-39687.rs
deleted file mode 100644
index 404465e6a0f..00000000000
--- a/src/test/compile-fail/issue-39687.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![feature(fn_traits)]
-
-fn main() {
-    <fn() as Fn()>::call;
-    //~^ ERROR associated type bindings are not allowed here [E0229]
-}
diff --git a/src/test/compile-fail/issue-3973.rs b/src/test/compile-fail/issue-3973.rs
deleted file mode 100644
index 67a934fccce..00000000000
--- a/src/test/compile-fail/issue-3973.rs
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright 2012-2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-struct Point {
-    x: f64,
-    y: f64,
-}
-
-trait ToString_ {
-    fn to_string(&self) -> String;
-}
-
-impl ToString_ for Point {
-    fn new(x: f64, y: f64) -> Point {
-    //~^ ERROR method `new` is not a member of trait `ToString_`
-        Point { x: x, y: y }
-    }
-
-    fn to_string(&self) -> String {
-        format!("({}, {})", self.x, self.y)
-    }
-}
-
-fn main() {
-    let p = Point::new(0.0, 0.0);
-    //~^ ERROR no function or associated item named `new` found for type `Point`
-    println!("{}", p.to_string());
-}
diff --git a/src/test/compile-fail/issue-39848.rs b/src/test/compile-fail/issue-39848.rs
deleted file mode 100644
index d5ca009d310..00000000000
--- a/src/test/compile-fail/issue-39848.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-macro_rules! get_opt {
-    ($tgt:expr, $field:ident) => {
-        if $tgt.has_$field() {}
-    }
-}
-
-fn main() {
-    get_opt!(bar, foo);
-    //~^ ERROR expected `{`, found `foo`
-}
diff --git a/src/test/compile-fail/issue-3993.rs b/src/test/compile-fail/issue-3993.rs
deleted file mode 100644
index fae5eb51272..00000000000
--- a/src/test/compile-fail/issue-3993.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-use zoo::fly; //~ ERROR: function `fly` is private
-
-mod zoo {
-    fn fly() {}
-}
-
-
-fn main() {
-    fly();
-}
diff --git a/src/test/compile-fail/issue-39970.rs b/src/test/compile-fail/issue-39970.rs
deleted file mode 100644
index 65ea1baa4a1..00000000000
--- a/src/test/compile-fail/issue-39970.rs
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-trait Array<'a> {
-    type Element: 'a;
-}
-
-trait Visit {
-    fn visit() {}
-}
-
-impl<'a> Array<'a> for () {
-    type Element = &'a ();
-}
-
-impl Visit for () where
-    //(): for<'a> Array<'a, Element=&'a ()>, // No ICE
-    (): for<'a> Array<'a, Element=()>, // ICE
-{}
-
-fn main() {
-    <() as Visit>::visit();
-    //~^ ERROR type mismatch resolving `for<'a> <() as Array<'a>>::Element == ()`
-}
diff --git a/src/test/compile-fail/issue-39974.rs b/src/test/compile-fail/issue-39974.rs
deleted file mode 100644
index 6f6b775a2a3..00000000000
--- a/src/test/compile-fail/issue-39974.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-const LENGTH: f64 = 2;
-
-struct Thing {
-    f: [[f64; 2]; LENGTH],
-    //~^ ERROR mismatched types
-    //~| expected usize, found f64
-}
-
-fn main() {
-    let _t = Thing { f: [[0.0, 0.0], [0.0, 0.0], [0.0, 0.0], [0.0, 0.0]] };
-}
diff --git a/src/test/compile-fail/issue-40000.rs b/src/test/compile-fail/issue-40000.rs
deleted file mode 100644
index 7daf4bcbaa4..00000000000
--- a/src/test/compile-fail/issue-40000.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn main() {
-    let bar: fn(&mut u32) = |_| {};
-
-    fn foo(x: Box<Fn(&i32)>) {}
-    let bar = Box::new(|x: &i32| {}) as Box<Fn(_)>;
-    foo(bar); //~ ERROR mismatched types
-    //~| expected concrete lifetime, found bound lifetime parameter
-}
diff --git a/src/test/compile-fail/issue-40288-2.rs b/src/test/compile-fail/issue-40288-2.rs
deleted file mode 100644
index e16a7ecf6b9..00000000000
--- a/src/test/compile-fail/issue-40288-2.rs
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn prove_static<T: 'static + ?Sized>(_: &'static T) {}
-
-fn lifetime_transmute_slice<'a, T: ?Sized>(x: &'a T, y: &T) -> &'a T {
-    let mut out = [x];
-    {
-        let slice: &mut [_] = &mut out;
-        slice[0] = y;
-    }
-    out[0]
-    //~^ ERROR 19:5: 19:11: explicit lifetime required in the type of `y` [E0621]
-}
-
-struct Struct<T, U: ?Sized> {
-    head: T,
-    _tail: U
-}
-
-fn lifetime_transmute_struct<'a, T: ?Sized>(x: &'a T, y: &T) -> &'a T {
-    let mut out = Struct { head: x, _tail: [()] };
-    {
-        let dst: &mut Struct<_, [()]> = &mut out;
-        dst.head = y;
-    }
-    out.head
-    //~^ ERROR 34:5: 34:13: explicit lifetime required in the type of `y` [E0621]
-}
-
-fn main() {
-    prove_static(lifetime_transmute_slice("", &String::from("foo")));
-    prove_static(lifetime_transmute_struct("", &String::from("bar")));
-}
diff --git a/src/test/compile-fail/issue-40288.rs b/src/test/compile-fail/issue-40288.rs
deleted file mode 100644
index b5418e85bec..00000000000
--- a/src/test/compile-fail/issue-40288.rs
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn save_ref<'a>(refr: &'a i32, to: &mut [&'a i32]) {
-    for val in &mut *to {
-        *val = refr;
-    }
-}
-
-fn main() {
-    let ref init = 0i32;
-    let ref mut refr = 1i32;
-
-    let mut out = [init];
-
-    save_ref(&*refr, &mut out);
-
-    // This shouldn't be allowed as `refr` is borrowed
-    *refr = 3; //~ ERROR cannot assign to `*refr` because it is borrowed
-
-    // Prints 3?!
-    println!("{:?}", out[0]);
-}
diff --git a/src/test/compile-fail/issue-40350.rs b/src/test/compile-fail/issue-40350.rs
deleted file mode 100644
index 39249ee4718..00000000000
--- a/src/test/compile-fail/issue-40350.rs
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![feature(rustc_attrs)]
-#![allow(warnings)]
-
-enum E {
-    A = {
-        enum F { B }
-        0
-    }
-}
-
-#[rustc_error]
-fn main() {}
-//~^ ERROR compilation successful
-
diff --git a/src/test/compile-fail/issue-40510-1.rs b/src/test/compile-fail/issue-40510-1.rs
deleted file mode 100644
index 142092ff41e..00000000000
--- a/src/test/compile-fail/issue-40510-1.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![feature(rustc_attrs)]
-#![allow(unused)]
-
-fn f() {
-    let mut x: Box<()> = Box::new(());
-
-    || {
-        &mut x
-    };
-}
-
-#[rustc_error]
-fn main() {} //~ ERROR compilation successful
diff --git a/src/test/compile-fail/issue-40510-2.rs b/src/test/compile-fail/issue-40510-2.rs
deleted file mode 100644
index 0fe56584822..00000000000
--- a/src/test/compile-fail/issue-40510-2.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![feature(rustc_attrs)]
-#![allow(unused)]
-
-fn f() {
-    let x: Box<()> = Box::new(());
-
-    || {
-        &x
-    };
-}
-
-#[rustc_error]
-fn main() {} //~ ERROR compilation successful
diff --git a/src/test/compile-fail/issue-40510-3.rs b/src/test/compile-fail/issue-40510-3.rs
deleted file mode 100644
index afa8f15ee57..00000000000
--- a/src/test/compile-fail/issue-40510-3.rs
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![feature(rustc_attrs)]
-#![allow(unused)]
-
-fn f() {
-    let mut x: Vec<()> = Vec::new();
-
-    || {
-        || {
-            x.push(())
-        }
-    };
-}
-
-#[rustc_error]
-fn main() {} //~ ERROR compilation successful
diff --git a/src/test/compile-fail/issue-40510-4.rs b/src/test/compile-fail/issue-40510-4.rs
deleted file mode 100644
index a39c500225b..00000000000
--- a/src/test/compile-fail/issue-40510-4.rs
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![feature(rustc_attrs)]
-#![allow(unused)]
-
-fn f() {
-    let x: Vec<()> = Vec::new();
-
-    || {
-        || {
-            x.len()
-        }
-    };
-}
-
-#[rustc_error]
-fn main() {} //~ ERROR compilation successful
diff --git a/src/test/compile-fail/issue-40610.rs b/src/test/compile-fail/issue-40610.rs
deleted file mode 100644
index aec20b4ad87..00000000000
--- a/src/test/compile-fail/issue-40610.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn f(_: &[f32]) {}
-
-fn main() {
-    () + f(&[1.0]);
-    //~^ ERROR binary operation `+` cannot be applied to type `()`
-}
diff --git a/src/test/compile-fail/issue-40749.rs b/src/test/compile-fail/issue-40749.rs
deleted file mode 100644
index 261ed49d10c..00000000000
--- a/src/test/compile-fail/issue-40749.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn main() {
-    [0; ..10];
-    //~^ ERROR mismatched types
-    //~| expected type `usize`
-    //~| found type `std::ops::RangeTo<{integer}>`
-}
diff --git a/src/test/compile-fail/issue-40845.rs b/src/test/compile-fail/issue-40845.rs
deleted file mode 100644
index c5604a0427b..00000000000
--- a/src/test/compile-fail/issue-40845.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-trait T { m!(); } //~ ERROR cannot find macro `m!` in this scope
-
-struct S;
-impl S { m!(); } //~ ERROR cannot find macro `m!` in this scope
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-40861.rs b/src/test/compile-fail/issue-40861.rs
deleted file mode 100644
index 75d58c58538..00000000000
--- a/src/test/compile-fail/issue-40861.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn f(_: &[f32]) {}
-
-fn main() {
-    ()[f(&[1.0])];
-    //~^ ERROR cannot index into a value of type `()`
-}
diff --git a/src/test/compile-fail/issue-41139.rs b/src/test/compile-fail/issue-41139.rs
deleted file mode 100644
index 0509a4387ba..00000000000
--- a/src/test/compile-fail/issue-41139.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-trait Trait {}
-
-fn get_function<'a>() -> &'a Fn() -> Trait { panic!("") }
-
-fn main() {
-    let t : &Trait = &get_function()();
-    //~^ ERROR cannot move a value of type (dyn Trait + 'static)
-}
diff --git a/src/test/compile-fail/issue-41229-ref-str.rs b/src/test/compile-fail/issue-41229-ref-str.rs
deleted file mode 100644
index 5d7546e1bc4..00000000000
--- a/src/test/compile-fail/issue-41229-ref-str.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-pub fn example(ref s: str) {}
-//~^ ERROR the size for values of type
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-41255.rs b/src/test/compile-fail/issue-41255.rs
deleted file mode 100644
index 29912de37eb..00000000000
--- a/src/test/compile-fail/issue-41255.rs
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// Matching against float literals should result in a linter error
-
-#![feature(exclusive_range_pattern)]
-#![allow(unused)]
-#![forbid(illegal_floating_point_literal_pattern)]
-
-fn main() {
-    let x = 42.0;
-    match x {
-        5.0 => {}, //~ ERROR floating-point types cannot be used in patterns
-                   //~| WARNING hard error
-        5.0f32 => {}, //~ ERROR floating-point types cannot be used in patterns
-                      //~| WARNING hard error
-        -5.0 => {}, //~ ERROR floating-point types cannot be used in patterns
-                    //~| WARNING hard error
-        1.0 .. 33.0 => {}, //~ ERROR floating-point types cannot be used in patterns
-                           //~| WARNING hard error
-                           //~| ERROR floating-point types cannot be used in patterns
-                           //~| WARNING hard error
-        39.0 ..= 70.0 => {}, //~ ERROR floating-point types cannot be used in patterns
-                             //~| WARNING hard error
-                             //~| ERROR floating-point types cannot be used in patterns
-                             //~| WARNING hard error
-        _ => {},
-    };
-    let y = 5.0;
-    // Same for tuples
-    match (x, 5) {
-        (3.14, 1) => {}, //~ ERROR floating-point types cannot be used
-                         //~| WARNING hard error
-        _ => {},
-    }
-    // Or structs
-    struct Foo { x: f32 };
-    match (Foo { x }) {
-        Foo { x: 2.0 } => {}, //~ ERROR floating-point types cannot be used
-                              //~| WARNING hard error
-        _ => {},
-    }
-}
diff --git a/src/test/compile-fail/issue-41394.rs b/src/test/compile-fail/issue-41394.rs
deleted file mode 100644
index 89f11edaec8..00000000000
--- a/src/test/compile-fail/issue-41394.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-enum Foo {
-    A = "" + 1
-    //~^ ERROR binary operation `+` cannot be applied to type `&str`
-}
-
-enum Bar {
-    A = Foo::A as isize
-}
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-41726.rs b/src/test/compile-fail/issue-41726.rs
deleted file mode 100644
index c8cd9209bce..00000000000
--- a/src/test/compile-fail/issue-41726.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-use std::collections::HashMap;
-fn main() {
-    let things: HashMap<String, Vec<String>> = HashMap::new();
-    for src in things.keys() {
-        things[src.as_str()].sort(); //~ ERROR cannot borrow immutable
-    }
-}
diff --git a/src/test/compile-fail/issue-41742.rs b/src/test/compile-fail/issue-41742.rs
deleted file mode 100644
index 067531e036a..00000000000
--- a/src/test/compile-fail/issue-41742.rs
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-use std::ops::{Index, IndexMut};
-
-struct S;
-struct H;
-
-impl S {
-    fn f(&mut self) {}
-}
-
-impl Index<u32> for H {
-    type Output = S;
-    fn index(&self, index: u32) -> &S {
-        unimplemented!()
-    }
-}
-
-impl IndexMut<u32> for H {
-    fn index_mut(&mut self, index: u32) -> &mut S {
-        unimplemented!()
-    }
-}
-
-fn main() {
-    H["?"].f(); //~ ERROR mismatched types
-}
diff --git a/src/test/compile-fail/issue-41776.rs b/src/test/compile-fail/issue-41776.rs
deleted file mode 100644
index 5f108e0a1ed..00000000000
--- a/src/test/compile-fail/issue-41776.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn main() {
-    include!(line!()); //~ ERROR argument must be a string literal
-}
diff --git a/src/test/compile-fail/issue-41880.rs b/src/test/compile-fail/issue-41880.rs
deleted file mode 100644
index 23a2b78a769..00000000000
--- a/src/test/compile-fail/issue-41880.rs
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn iterate<T, F>(initial: T, f: F) -> Iterate<T, F> {
-    Iterate {
-        state: initial,
-        f: f,
-    }
-}
-
-pub struct Iterate<T, F> {
-    state: T,
-    f: F
-}
-
-impl<T: Clone, F> Iterator for Iterate<T, F> where F: Fn(&T) -> T {
-    type Item = T;
-
-    #[inline]
-    fn next(&mut self) -> Option<Self::Item> {
-        self.state = (self.f)(&self.state);
-        Some(self.state.clone())
-    }
-    #[inline]
-    fn size_hint(&self) -> (usize, Option<usize>) { (std::usize::MAX, None) }
-}
-
-fn main() {
-    let a = iterate(0, |x| x+1);
-    println!("{:?}", a.iter().take(10).collect::<Vec<usize>>());
-    //~^ ERROR no method named `iter` found for type `Iterate<{integer}
-}
diff --git a/src/test/compile-fail/issue-41974.rs b/src/test/compile-fail/issue-41974.rs
deleted file mode 100644
index 5c9077783c7..00000000000
--- a/src/test/compile-fail/issue-41974.rs
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#[derive(Copy, Clone)]
-struct Flags;
-
-trait A {
-}
-
-impl<T> Drop for T where T: A { //~ ERROR E0119
-                                //~^ ERROR E0120
-                                //~| ERROR E0210
-    fn drop(&mut self) {
-    }
-}
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-41998.rs b/src/test/compile-fail/issue-41998.rs
deleted file mode 100644
index 406aadcd212..00000000000
--- a/src/test/compile-fail/issue-41998.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![feature(rustc_attrs)]
-
-#[rustc_error]
-fn main() { //~ ERROR compilation successful
-    if ('x' as char) < ('y' as char) {
-        print!("x");
-    } else {
-        print!("y");
-    }
-}
diff --git a/src/test/compile-fail/issue-4201.rs b/src/test/compile-fail/issue-4201.rs
deleted file mode 100644
index b1f668d9c5e..00000000000
--- a/src/test/compile-fail/issue-4201.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn main() {
-    let a = if true {
-        0
-    } else if false {
-//~^ ERROR if may be missing an else clause
-//~| expected type `()`
-//~| found type `{integer}`
-//~| expected (), found integral variable
-        1
-    };
-}
diff --git a/src/test/compile-fail/issue-42312.rs b/src/test/compile-fail/issue-42312.rs
deleted file mode 100644
index f7705297dfd..00000000000
--- a/src/test/compile-fail/issue-42312.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-use std::ops::Deref;
-
-pub trait Foo {
-    fn baz(_: Self::Target) where Self: Deref {}
-    //~^ ERROR the size for values of type
-}
-
-pub fn f(_: ToString) {}
-//~^ ERROR the size for values of type
-
-fn main() { }
diff --git a/src/test/compile-fail/issue-42344.rs b/src/test/compile-fail/issue-42344.rs
deleted file mode 100644
index 2f11ff402be..00000000000
--- a/src/test/compile-fail/issue-42344.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-static TAB: [&mut [u8]; 0] = [];
-
-pub unsafe fn test() {
-    TAB[0].iter_mut(); //~ ERROR cannot borrow data mutably in a `&` reference [E0389]
-}
-
-pub fn main() {}
diff --git a/src/test/compile-fail/issue-4265.rs b/src/test/compile-fail/issue-4265.rs
deleted file mode 100644
index 62db68dcbb2..00000000000
--- a/src/test/compile-fail/issue-4265.rs
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-struct Foo {
-      baz: usize
-}
-
-impl Foo {
-    fn bar() {
-        Foo { baz: 0 }.bar();
-    }
-
-    fn bar() { //~ ERROR duplicate definitions
-    }
-}
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-42755.rs b/src/test/compile-fail/issue-42755.rs
deleted file mode 100644
index 7547c4a17be..00000000000
--- a/src/test/compile-fail/issue-42755.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![feature(macro_vis_matcher)]
-
-macro_rules! foo {
-    ($($p:vis)*) => {} //~ ERROR repetition matches empty token tree
-}
-
-foo!(a);
diff --git a/src/test/compile-fail/issue-42796.rs b/src/test/compile-fail/issue-42796.rs
deleted file mode 100644
index b07c23c3fc7..00000000000
--- a/src/test/compile-fail/issue-42796.rs
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-pub trait Mirror<Smoke> {
-    type Image;
-}
-
-impl<T, Smoke> Mirror<Smoke> for T {
-    type Image = T;
-}
-
-pub fn poison<S>(victim: String) where <String as Mirror<S>>::Image: Copy {
-    loop { drop(victim); }
-}
-
-fn main() {
-    let s = "Hello!".to_owned();
-    let mut s_copy = s;
-    s_copy.push_str("World!");
-    "0wned!".to_owned();
-    println!("{}", s); //~ ERROR use of moved value
-}
diff --git a/src/test/compile-fail/issue-42880.rs b/src/test/compile-fail/issue-42880.rs
deleted file mode 100644
index ebb1ec425d1..00000000000
--- a/src/test/compile-fail/issue-42880.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-type Value = String;
-
-fn main() {
-    let f = |&Value::String(_)| (); //~ ERROR no associated item named
-
-    let vec: Vec<Value> = Vec::new();
-    vec.last().map(f);
-}
diff --git a/src/test/compile-fail/issue-43023.rs b/src/test/compile-fail/issue-43023.rs
deleted file mode 100644
index 6a5f7a1136a..00000000000
--- a/src/test/compile-fail/issue-43023.rs
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-struct S;
-
-impl S {
-    #[derive(Debug)] //~ ERROR `derive` may only be applied to structs, enums and unions
-    fn f() {
-        file!();
-    }
-}
-
-trait Tr1 {
-    #[derive(Debug)] //~ ERROR `derive` may only be applied to structs, enums and unions
-    fn f();
-}
-
-trait Tr2 {
-    #[derive(Debug)] //~ ERROR `derive` may only be applied to structs, enums and unions
-    type F;
-}
diff --git a/src/test/compile-fail/issue-43105.rs b/src/test/compile-fail/issue-43105.rs
deleted file mode 100644
index 8a0471135af..00000000000
--- a/src/test/compile-fail/issue-43105.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn xyz() -> u8 { 42 }
-
-const NUM: u8 = xyz();
-//~^ ERROR calls in constants are limited to constant functions, tuple structs and tuple variants
-
-fn main() {
-    match 1 {
-        NUM => unimplemented!(),
-        //~^ ERROR could not evaluate constant pattern
-        _ => unimplemented!(),
-    }
-}
diff --git a/src/test/compile-fail/issue-43162.rs b/src/test/compile-fail/issue-43162.rs
deleted file mode 100644
index b236283f757..00000000000
--- a/src/test/compile-fail/issue-43162.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn foo() -> bool {
-    //~^ ERROR E0308
-    break true; //~ ERROR E0268
-}
-
-fn main() {
-    break {}; //~ ERROR E0268
-}
diff --git a/src/test/compile-fail/issue-4321.rs b/src/test/compile-fail/issue-4321.rs
deleted file mode 100644
index d589680b0ec..00000000000
--- a/src/test/compile-fail/issue-4321.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn main() {
-    let tup = (true, true);
-    println!("foo {:}", match tup { //~ ERROR non-exhaustive patterns: `(true, false)` not covered
-        (false, false) => "foo",
-        (false, true) => "bar",
-        (true, true) => "baz"
-    });
-}
diff --git a/src/test/compile-fail/issue-43250.rs b/src/test/compile-fail/issue-43250.rs
deleted file mode 100644
index e1d34f339dc..00000000000
--- a/src/test/compile-fail/issue-43250.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn main() {
-    let mut y;
-    const C: u32 = 0;
-    macro_rules! m {
-        ($a:expr) => {
-            let $a = 0;
-        }
-    }
-    m!(y);
-    //~^ ERROR arbitrary expressions aren't allowed in patterns
-    m!(C);
-    //~^ ERROR arbitrary expressions aren't allowed in patterns
-}
diff --git a/src/test/compile-fail/issue-43355.rs b/src/test/compile-fail/issue-43355.rs
deleted file mode 100644
index d793a78799a..00000000000
--- a/src/test/compile-fail/issue-43355.rs
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-pub trait Trait1<X> {
-    type Output;
-}
-
-pub trait Trait2<X> {}
-
-pub struct A;
-
-impl<X, T> Trait1<X> for T where T: Trait2<X> {
-    type Output = ();
-}
-
-impl<X> Trait1<Box<X>> for A {
-//~^ ERROR conflicting implementations of trait
-//~| hard error
-//~| downstream crates may implement trait `Trait2<std::boxed::Box<_>>` for type `A`
-    type Output = i32;
-}
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-43424.rs b/src/test/compile-fail/issue-43424.rs
deleted file mode 100644
index 431fc8a5aa2..00000000000
--- a/src/test/compile-fail/issue-43424.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![allow(unused)]
-
-macro_rules! m {
-    ($attr_path: path) => {
-        #[$attr_path]
-        fn f() {}
-    }
-}
-
-m!(inline<u8>); //~ ERROR: unexpected generic arguments in path
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-43431.rs b/src/test/compile-fail/issue-43431.rs
deleted file mode 100644
index 1e6366e068a..00000000000
--- a/src/test/compile-fail/issue-43431.rs
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![feature(fn_traits)]
-
-trait CallSingle<A, B> {
-    fn call(&self, a: A) -> B where Self: Sized, Self: Fn(A) -> B;
-}
-
-impl<A, B, F: Fn(A) -> B> CallSingle<A, B> for F {
-    fn call(&self, a: A) -> B {
-        <Self as Fn(A) -> B>::call(self, (a,))
-        //~^ ERROR associated type bindings are not allowed here
-    }
-}
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-4366-2.rs b/src/test/compile-fail/issue-4366-2.rs
deleted file mode 100644
index 33abc196a6b..00000000000
--- a/src/test/compile-fail/issue-4366-2.rs
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// ensures that 'use foo:*' doesn't import non-public item
-
-use m1::*;
-
-mod foo {
-    pub fn foo() {}
-}
-mod a {
-    pub mod b {
-        use foo::foo;
-        type bar = isize;
-    }
-    pub mod sub {
-        use a::b::*;
-        fn sub() -> bar { 1 }
-        //~^ ERROR cannot find type `bar` in this scope
-    }
-}
-
-mod m1 {
-    fn foo() {}
-}
-
-fn main() {
-    foo(); //~ ERROR expected function, found module `foo`
-}
diff --git a/src/test/compile-fail/issue-4366.rs b/src/test/compile-fail/issue-4366.rs
deleted file mode 100644
index 47fd426592c..00000000000
--- a/src/test/compile-fail/issue-4366.rs
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// regression test for issue 4366
-
-// ensures that 'use foo:*' doesn't import non-public 'use' statements in the
-// module 'foo'
-
-use m1::*;
-
-mod foo {
-    pub fn foo() {}
-}
-mod a {
-    pub mod b {
-        use foo::foo;
-        type bar = isize;
-    }
-    pub mod sub {
-        use a::b::*;
-        fn sub() -> isize { foo(); 1 } //~ ERROR cannot find function `foo` in this scope
-    }
-}
-
-mod m1 {
-    fn foo() {}
-}
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-43733.rs b/src/test/compile-fail/issue-43733.rs
deleted file mode 100644
index 7b1364ff41c..00000000000
--- a/src/test/compile-fail/issue-43733.rs
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![feature(const_fn)]
-#![feature(thread_local)]
-#![feature(cfg_target_thread_local, thread_local_internals)]
-
-type Foo = std::cell::RefCell<String>;
-
-#[cfg(target_thread_local)]
-#[thread_local]
-static __KEY: std::thread::__FastLocalKeyInner<Foo> =
-    std::thread::__FastLocalKeyInner::new();
-
-#[cfg(not(target_thread_local))]
-static __KEY: std::thread::__OsLocalKeyInner<Foo> =
-    std::thread::__OsLocalKeyInner::new();
-
-fn __getit() -> std::option::Option<
-    &'static std::cell::UnsafeCell<
-        std::option::Option<Foo>>>
-{
-    __KEY.get() //~ ERROR call to unsafe function is unsafe
-}
-
-static FOO: std::thread::LocalKey<Foo> =
-    std::thread::LocalKey::new(__getit, Default::default);
-//~^ ERROR call to unsafe function is unsafe
-
-fn main() {
-    FOO.with(|foo| println!("{}", foo.borrow()));
-    std::thread::spawn(|| {
-        FOO.with(|foo| *foo.borrow_mut() += "foo");
-    }).join().unwrap();
-    FOO.with(|foo| println!("{}", foo.borrow()));
-}
diff --git a/src/test/compile-fail/issue-43784-associated-type.rs b/src/test/compile-fail/issue-43784-associated-type.rs
deleted file mode 100644
index 94b5c0034a7..00000000000
--- a/src/test/compile-fail/issue-43784-associated-type.rs
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-pub trait Partial<X: ?Sized>: Copy {
-}
-
-pub trait Complete {
-    type Assoc: Partial<Self>;
-}
-
-impl<T> Partial<T> for T::Assoc where
-    T: Complete
-{
-}
-
-impl<T> Complete for T { //~ ERROR the trait bound `T: std::marker::Copy` is not satisfied
-    type Assoc = T;
-}
diff --git a/src/test/compile-fail/issue-43784-supertrait.rs b/src/test/compile-fail/issue-43784-supertrait.rs
deleted file mode 100644
index e70df113da3..00000000000
--- a/src/test/compile-fail/issue-43784-supertrait.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-pub trait Partial: Copy {
-}
-
-pub trait Complete: Partial {
-}
-
-impl<T> Partial for T where T: Complete {}
-impl<T> Complete for T {} //~ ERROR the trait bound `T: std::marker::Copy` is not satisfied
diff --git a/src/test/compile-fail/issue-43925.rs b/src/test/compile-fail/issue-43925.rs
deleted file mode 100644
index 8ad57647290..00000000000
--- a/src/test/compile-fail/issue-43925.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![feature(attr_literals)]
-
-#[link(name="foo", cfg("rlib"))] //~ ERROR invalid argument for `cfg(..)`
-extern {}
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-43926.rs b/src/test/compile-fail/issue-43926.rs
deleted file mode 100644
index 5d510b643a3..00000000000
--- a/src/test/compile-fail/issue-43926.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#[link(name="foo", cfg())] //~ ERROR `cfg()` must have an argument
-extern {}
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-43988.rs b/src/test/compile-fail/issue-43988.rs
deleted file mode 100644
index 6361af76482..00000000000
--- a/src/test/compile-fail/issue-43988.rs
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![feature(stmt_expr_attributes)]
-
-fn main() {
-
-    #[inline]
-    let _a = 4;
-    //~^^ ERROR attribute should be applied to function or closure
-
-
-    #[inline(XYZ)]
-    let _b = 4;
-    //~^^ ERROR attribute should be applied to function or closure
-
-    #[repr(nothing)]
-    let _x = 0;
-    //~^^ ERROR attribute should not be applied to a statement
-
-    #[repr(something_not_real)]
-    loop {
-        ()
-    };
-    //~^^^^ ERROR attribute should not be applied to an expression
-
-    #[repr]
-    let _y = "123";
-    //~^^ ERROR attribute should not be applied to a statement
-    //~| WARN `repr` attribute must have a hint
-
-
-    fn foo() {}
-
-    #[inline(ABC)]
-    foo();
-    //~^^ ERROR attribute should be applied to function or closure
-
-    let _z = #[repr] 1;
-    //~^ ERROR attribute should not be applied to an expression
-    //~| WARN `repr` attribute must have a hint
-}
diff --git a/src/test/compile-fail/issue-44021.rs b/src/test/compile-fail/issue-44021.rs
deleted file mode 100644
index b6ec21b94c7..00000000000
--- a/src/test/compile-fail/issue-44021.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-struct MyStruct;
-impl MyStruct {
-    fn f() {|x, y} //~ ERROR expected one of `:`, `@`, or `|`, found `}`
-}
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-44239.rs b/src/test/compile-fail/issue-44239.rs
deleted file mode 100644
index 131c6526642..00000000000
--- a/src/test/compile-fail/issue-44239.rs
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn main() {
-    let n = 0;
-
-    struct Foo;
-    impl Foo {
-        const N: usize = n;
-        //~^ ERROR attempt to use a non-constant value
-    }
-}
diff --git a/src/test/compile-fail/issue-44373.rs b/src/test/compile-fail/issue-44373.rs
deleted file mode 100644
index d744ad11c5c..00000000000
--- a/src/test/compile-fail/issue-44373.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-
-static FOO: u32 = 50;
-
-fn main() {
-    let _val: &'static [&'static u32] = &[&FOO]; //~ ERROR borrowed value does not live long enough
-}
diff --git a/src/test/compile-fail/issue-44415.rs b/src/test/compile-fail/issue-44415.rs
deleted file mode 100644
index ecaf326b050..00000000000
--- a/src/test/compile-fail/issue-44415.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// error-pattern: cycle detected when computing layout of
-
-#![feature(const_fn)]
-#![feature(core_intrinsics)]
-
-use std::intrinsics;
-
-struct Foo {
-    bytes: [u8; unsafe { intrinsics::size_of::<Foo>() }],
-    x: usize,
-}
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-45087-unreachable-unsafe.rs b/src/test/compile-fail/issue-45087-unreachable-unsafe.rs
deleted file mode 100644
index 5af0bf6be56..00000000000
--- a/src/test/compile-fail/issue-45087-unreachable-unsafe.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn main() {
-    return;
-    *(1 as *mut u32) = 42;
-    //~^ ERROR dereference of raw pointer is unsafe
-}
diff --git a/src/test/compile-fail/issue-4517.rs b/src/test/compile-fail/issue-4517.rs
deleted file mode 100644
index fbd8972cbfa..00000000000
--- a/src/test/compile-fail/issue-4517.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn bar(int_param: usize) {}
-
-fn main() {
-    let foo: [u8; 4] = [1; 4];
-    bar(foo);
-    //~^ ERROR mismatched types
-    //~| expected type `usize`
-    //~| found type `[u8; 4]`
-    //~| expected usize, found array of 4 elements
-}
diff --git a/src/test/compile-fail/issue-45199.rs b/src/test/compile-fail/issue-45199.rs
deleted file mode 100644
index 61e19ffc0d2..00000000000
--- a/src/test/compile-fail/issue-45199.rs
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// revisions: ast mir
-//[mir]compile-flags: -Zborrowck=mir
-
-fn test_drop_replace() {
-    let b: Box<isize>;
-    //[mir]~^ NOTE consider changing this to `mut b`
-    b = Box::new(1);    //[ast]~ NOTE first assignment
-                        //[mir]~^ NOTE first assignment
-    b = Box::new(2);    //[ast]~ ERROR cannot assign twice to immutable variable
-                        //[mir]~^ ERROR cannot assign twice to immutable variable `b`
-                        //[ast]~| NOTE cannot assign twice to immutable
-                        //[mir]~| NOTE cannot assign twice to immutable
-}
-
-fn test_call() {
-    let b = Box::new(1);    //[ast]~ NOTE first assignment
-                            //[mir]~^ NOTE first assignment
-                            //[mir]~| NOTE consider changing this to `mut b`
-    b = Box::new(2);        //[ast]~ ERROR cannot assign twice to immutable variable
-                            //[mir]~^ ERROR cannot assign twice to immutable variable `b`
-                            //[ast]~| NOTE cannot assign twice to immutable
-                            //[mir]~| NOTE cannot assign twice to immutable
-}
-
-fn test_args(b: Box<i32>) {  //[ast]~ NOTE first assignment
-                                //[mir]~^ NOTE consider changing this to `mut b`
-    b = Box::new(2);            //[ast]~ ERROR cannot assign twice to immutable variable
-                                //[mir]~^ ERROR cannot assign to immutable argument `b`
-                                //[ast]~| NOTE cannot assign twice to immutable
-                                //[mir]~| NOTE cannot assign to immutable argument
-}
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-45729-unsafe-in-generator.rs b/src/test/compile-fail/issue-45729-unsafe-in-generator.rs
deleted file mode 100644
index b42ced07583..00000000000
--- a/src/test/compile-fail/issue-45729-unsafe-in-generator.rs
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![feature(generators)]
-
-fn main() {
-    let _ = || {
-        *(1 as *mut u32) = 42;
-        //~^ ERROR dereference of raw pointer is unsafe
-        yield;
-    };
-}
diff --git a/src/test/compile-fail/issue-45801.rs b/src/test/compile-fail/issue-45801.rs
deleted file mode 100644
index 7823a7d6ba8..00000000000
--- a/src/test/compile-fail/issue-45801.rs
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-struct Params;
-
-pub trait Plugin<E: ?Sized> {
-    type Error;
-}
-
-pub trait Pluggable {
-    fn get_ref<P: Plugin<Self>>(&mut self) -> Option<P::Error> {
-        None
-    }
-}
-
-struct Foo;
-impl Plugin<Foo> for Params {
-    type Error = ();
-}
-
-impl<T: Copy> Pluggable for T {}
-
-fn handle(req: &mut i32) {
-    req.get_ref::<Params>();
-    //~^ ERROR the trait bound `Params: Plugin<i32>` is not satisfied
-}
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-45965.rs b/src/test/compile-fail/issue-45965.rs
deleted file mode 100644
index 0b82f2b32ff..00000000000
--- a/src/test/compile-fail/issue-45965.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn main() {
-    let a = |r: f64| if r != 0.0(r != 0.0) { 1.0 } else { 0.0 };
-    //~^ ERROR expected function, found `{float}`
-}
diff --git a/src/test/compile-fail/issue-46023.rs b/src/test/compile-fail/issue-46023.rs
deleted file mode 100644
index d51d92570fd..00000000000
--- a/src/test/compile-fail/issue-46023.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// revisions: ast mir
-//[mir]compile-flags: -Z emit-end-regions -Z borrowck=mir
-
-fn main() {
-    let x = 0;
-
-    (move || {
-        x = 1;
-        //[mir]~^ ERROR cannot assign to immutable item `x` [E0594]
-        //[ast]~^^ ERROR cannot assign to captured outer variable in an `FnMut` closure [E0594]
-    })()
-}
diff --git a/src/test/compile-fail/issue-46036.rs b/src/test/compile-fail/issue-46036.rs
deleted file mode 100644
index b5cdded4d30..00000000000
--- a/src/test/compile-fail/issue-46036.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// Issue 46036: [NLL] false edges on infinite loops
-// Infinite loops should create false edges to the cleanup block.
-#![feature(nll)]
-
-struct Foo { x: &'static u32 }
-
-fn foo() {
-    let a = 3;
-    let foo = Foo { x: &a }; //~ ERROR E0597
-    loop { }
-}
-
-fn main() { }
diff --git a/src/test/compile-fail/issue-46311.rs b/src/test/compile-fail/issue-46311.rs
deleted file mode 100644
index 82f55f2c142..00000000000
--- a/src/test/compile-fail/issue-46311.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright 2012-2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn main() {
-    'break: loop { //~ ERROR invalid label name `'break`
-    }
-}
diff --git a/src/test/compile-fail/issue-46438.rs b/src/test/compile-fail/issue-46438.rs
deleted file mode 100644
index d84b5813385..00000000000
--- a/src/test/compile-fail/issue-46438.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-macro_rules! m {
-    ($my_type: ty) => {
-        impl $my_type for u8 {}
-    }
-}
-
-trait Trait {}
-
-m!(Tr);
-
-m!(&'static u8); //~ ERROR expected a trait, found type
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-46604.rs b/src/test/compile-fail/issue-46604.rs
deleted file mode 100644
index dc14eca1e67..00000000000
--- a/src/test/compile-fail/issue-46604.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// revisions: ast mir
-//[mir]compile-flags: -Z borrowck=mir
-
-static buf: &mut [u8] = &mut [1u8,2,3,4,5,7];   //[ast]~ ERROR E0017
-                                                //[mir]~^ ERROR E0017
-fn write<T: AsRef<[u8]>>(buffer: T) { }
-
-fn main() {
-    write(&buf);
-    buf[0]=2;                                   //[ast]~ ERROR E0389
-                                                //[mir]~^ ERROR E0594
-}
diff --git a/src/test/compile-fail/issue-46771.rs b/src/test/compile-fail/issue-46771.rs
deleted file mode 100644
index f8bcd8861f3..00000000000
--- a/src/test/compile-fail/issue-46771.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn main() {
-    struct Foo;
-    (1 .. 2).find(|_| Foo(0) == 0); //~ ERROR expected function, found `main::Foo`
-}
diff --git a/src/test/compile-fail/issue-46843.rs b/src/test/compile-fail/issue-46843.rs
deleted file mode 100644
index d88b4e568b0..00000000000
--- a/src/test/compile-fail/issue-46843.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-enum Thing { This, That }
-
-fn non_const() -> Thing {
-    Thing::This
-}
-
-pub const Q: i32 = match non_const() { //~ ERROR E0015
-    Thing::This => 1, //~ ERROR unimplemented expression type
-    Thing::That => 0
-};
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-47309.rs b/src/test/compile-fail/issue-47309.rs
deleted file mode 100644
index 1b9ff36f714..00000000000
--- a/src/test/compile-fail/issue-47309.rs
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// Make sure that the mono-item collector does not crash when trying to
-// instantiate a default impl of a method with lifetime parameters.
-// See https://github.com/rust-lang/rust/issues/47309
-
-// compile-flags:-Clink-dead-code
-// compile-pass
-
-#![crate_type="rlib"]
-
-pub trait EnvFuture {
-    type Item;
-
-    fn boxed_result<'a>(self) where Self: Sized, Self::Item: 'a, {
-    }
-}
-
-struct Foo;
-
-impl<'a> EnvFuture for &'a Foo {
-    type Item = ();
-}
diff --git a/src/test/compile-fail/issue-4736.rs b/src/test/compile-fail/issue-4736.rs
deleted file mode 100644
index 19803079d02..00000000000
--- a/src/test/compile-fail/issue-4736.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-struct NonCopyable(());
-
-fn main() {
-    let z = NonCopyable{ p: () }; //~ ERROR struct `NonCopyable` has no field named `p`
-}
diff --git a/src/test/compile-fail/issue-47412.rs b/src/test/compile-fail/issue-47412.rs
deleted file mode 100644
index 683ef876f4e..00000000000
--- a/src/test/compile-fail/issue-47412.rs
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#[derive(Copy, Clone)]
-enum Void {}
-
-// Tests that we detect unsafe places (specifically, union fields and
-// raw pointer dereferences), even when they're matched on while having
-// an uninhabited type (equivalent to `std::intrinsics::unreachable()`).
-
-fn union_field() {
-    union Union { unit: (), void: Void }
-    let u = Union { unit: () };
-    match u.void {}
-    //~^ ERROR access to union field is unsafe
-}
-
-fn raw_ptr_deref() {
-    let ptr = std::ptr::null::<Void>();
-    match *ptr {}
-    //~^ ERROR dereference of raw pointer is unsafe
-}
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-47715.rs b/src/test/compile-fail/issue-47715.rs
deleted file mode 100644
index b6b720f088a..00000000000
--- a/src/test/compile-fail/issue-47715.rs
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-trait Foo {}
-
-trait Bar<T> {}
-
-trait Iterable {
-    type Item;
-}
-
-struct Container<T: Iterable<Item = impl Foo>> {
-    //~^ ERROR `impl Trait` not allowed
-    field: T
-}
-
-enum Enum<T: Iterable<Item = impl Foo>> {
-    //~^ ERROR `impl Trait` not allowed
-    A(T),
-}
-
-union Union<T: Iterable<Item = impl Foo> + Copy> {
-    //~^ ERROR `impl Trait` not allowed
-    x: T,
-}
-
-type Type<T: Iterable<Item = impl Foo>> = T;
-//~^ ERROR `impl Trait` not allowed
-
-fn main() {
-}
diff --git a/src/test/compile-fail/issue-48131.rs b/src/test/compile-fail/issue-48131.rs
deleted file mode 100644
index 9eb567a5d3e..00000000000
--- a/src/test/compile-fail/issue-48131.rs
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// This note is annotated because the purpose of the test
-// is to ensure that certain other notes are not generated.
-#![deny(unused_unsafe)] //~ NOTE
-
-// (test that no note is generated on this unsafe fn)
-pub unsafe fn a() {
-    fn inner() {
-        unsafe { /* unnecessary */ } //~ ERROR unnecessary `unsafe`
-                                     //~^ NOTE
-    }
-
-    inner()
-}
-
-pub fn b() {
-    // (test that no note is generated on this unsafe block)
-    unsafe {
-        fn inner() {
-            unsafe { /* unnecessary */ } //~ ERROR unnecessary `unsafe`
-                                         //~^ NOTE
-        }
-
-        let () = ::std::mem::uninitialized();
-
-        inner()
-    }
-}
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-48838.rs b/src/test/compile-fail/issue-48838.rs
deleted file mode 100644
index ab52a32869f..00000000000
--- a/src/test/compile-fail/issue-48838.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-enum Functions {
-    Square = |x| x, //~ ERROR mismatched types
-}
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-4968.rs b/src/test/compile-fail/issue-4968.rs
deleted file mode 100644
index 77588e5c221..00000000000
--- a/src/test/compile-fail/issue-4968.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// Regression test for issue #4968
-
-const A: (isize,isize) = (4,2);
-fn main() {
-    match 42 { A => () }
-    //~^ ERROR mismatched types
-    //~| expected type `{integer}`
-    //~| found type `(isize, isize)`
-    //~| expected integral variable, found tuple
-}
diff --git a/src/test/compile-fail/issue-4972.rs b/src/test/compile-fail/issue-4972.rs
deleted file mode 100644
index f384dba7c9e..00000000000
--- a/src/test/compile-fail/issue-4972.rs
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![feature(box_patterns)]
-#![feature(box_syntax)]
-
-trait MyTrait {
-    fn dummy(&self) {}
-}
-
-pub enum TraitWrapper {
-    A(Box<MyTrait+'static>),
-}
-
-fn get_tw_map(tw: &TraitWrapper) -> &MyTrait {
-    match *tw {
-        TraitWrapper::A(box ref map) => map, //~ ERROR cannot be dereferenced
-    }
-}
-
-pub fn main() {}
diff --git a/src/test/compile-fail/issue-50471.rs b/src/test/compile-fail/issue-50471.rs
deleted file mode 100644
index ce2947144af..00000000000
--- a/src/test/compile-fail/issue-50471.rs
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// compile-pass
-
-fn main() {
-    assert!({false});
-
-    assert!(r"\u{41}" == "A");
-
-    assert!(r"\u{".is_empty());
-}
diff --git a/src/test/compile-fail/issue-50600.rs b/src/test/compile-fail/issue-50600.rs
deleted file mode 100644
index 6169a7770bf..00000000000
--- a/src/test/compile-fail/issue-50600.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-struct Foo (
-    fn([u8; |x: u8| {}]), //~ ERROR mismatched types
-);
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-5062.rs b/src/test/compile-fail/issue-5062.rs
deleted file mode 100644
index ebfa4975d4d..00000000000
--- a/src/test/compile-fail/issue-5062.rs
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright 2013-2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn main() { format!("{:?}", None); }
-    //~^ ERROR type annotations needed [E0282]
diff --git a/src/test/compile-fail/issue-5067.rs b/src/test/compile-fail/issue-5067.rs
deleted file mode 100644
index 267362f902d..00000000000
--- a/src/test/compile-fail/issue-5067.rs
+++ /dev/null
@@ -1,64 +0,0 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![allow(unused_macros)]
-
-macro_rules! foo {
-    ( $()* ) => {};
-    //~^ ERROR repetition matches empty token tree
-    ( $()+ ) => {};
-    //~^ ERROR repetition matches empty token tree
-
-    ( $(),* ) => {}; // PASS
-    ( $(),+ ) => {}; // PASS
-
-    ( [$()*] ) => {};
-    //~^ ERROR repetition matches empty token tree
-    ( [$()+] ) => {};
-    //~^ ERROR repetition matches empty token tree
-
-    ( [$(),*] ) => {}; // PASS
-    ( [$(),+] ) => {}; // PASS
-
-    ( $($()* $(),* $(a)* $(a),* )* ) => {};
-    //~^ ERROR repetition matches empty token tree
-    ( $($()* $(),* $(a)* $(a),* )+ ) => {};
-    //~^ ERROR repetition matches empty token tree
-
-    ( $(a     $(),* $(a)* $(a),* )* ) => {}; // PASS
-    ( $($(a)+ $(),* $(a)* $(a),* )+ ) => {}; // PASS
-
-    ( $(a $()+)* ) => {};
-    //~^ ERROR repetition matches empty token tree
-    ( $(a $()*)+ ) => {};
-    //~^ ERROR repetition matches empty token tree
-}
-
-
-// --- Original Issue --- //
-
-macro_rules! make_vec {
-    (a $e1:expr $($(, a $e2:expr)*)*) => ([$e1 $($(, $e2)*)*]);
-    //~^ ERROR repetition matches empty token tree
-}
-
-fn main() {
-    let _ = make_vec![a 1, a 2, a 3];
-}
-
-
-// --- Minified Issue --- //
-
-macro_rules! m {
-    ( $()* ) => {}
-    //~^ ERROR repetition matches empty token tree
-}
-
-m!();
diff --git a/src/test/compile-fail/issue-50688.rs b/src/test/compile-fail/issue-50688.rs
deleted file mode 100644
index ff45cf639de..00000000000
--- a/src/test/compile-fail/issue-50688.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn main() {
-    [1; || {}]; //~ ERROR mismatched types
-}
diff --git a/src/test/compile-fail/issue-5099.rs b/src/test/compile-fail/issue-5099.rs
deleted file mode 100644
index 1bb6f34b8e9..00000000000
--- a/src/test/compile-fail/issue-5099.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-
-trait B < A > { fn a() -> A { this.a } } //~ ERROR cannot find value `this` in this scope
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-5100.rs b/src/test/compile-fail/issue-5100.rs
deleted file mode 100644
index 9ef780aac8e..00000000000
--- a/src/test/compile-fail/issue-5100.rs
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![feature(box_patterns)]
-#![feature(box_syntax)]
-
-enum A { B, C }
-
-fn main() {
-    match (true, false) {
-        A::B => (),
-//~^ ERROR mismatched types
-//~| expected type `(bool, bool)`
-//~| found type `A`
-//~| expected tuple, found enum `A`
-        _ => ()
-    }
-
-    match (true, false) {
-        (true, false, false) => ()
-//~^ ERROR mismatched types
-//~| expected type `(bool, bool)`
-//~| found type `(_, _, _)`
-//~| expected a tuple with 2 elements, found one with 3 elements
-    }
-
-    match (true, false) {
-        (true, false, false) => ()
-//~^ ERROR mismatched types
-//~| expected type `(bool, bool)`
-//~| found type `(_, _, _)`
-//~| expected a tuple with 2 elements, found one with 3 elements
-    }
-
-    match (true, false) {
-        box (true, false) => ()
-//~^ ERROR mismatched types
-//~| expected type `(bool, bool)`
-//~| found type `std::boxed::Box<_>`
-    }
-
-    match (true, false) {
-        &(true, false) => ()
-//~^ ERROR mismatched types
-//~| expected type `(bool, bool)`
-//~| found type `&_`
-//~| expected tuple, found reference
-    }
-
-
-    let v = [('a', 'b')   //~ ERROR expected function, found `(char, char)`
-             ('c', 'd'),
-             ('e', 'f')];
-
-    for &(x,y) in &v {} // should be OK
-
-    // Make sure none of the errors above were fatal
-    let x: char = true; //~  ERROR mismatched types
-                        //~| expected char, found bool
-}
diff --git a/src/test/compile-fail/issue-5153.rs b/src/test/compile-fail/issue-5153.rs
deleted file mode 100644
index 9b49886961d..00000000000
--- a/src/test/compile-fail/issue-5153.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-trait Foo {
-    fn foo(self: Box<Self>);
-}
-
-impl Foo for isize {
-    fn foo(self: Box<isize>) { }
-}
-
-fn main() {
-    (&5isize as &Foo).foo();
-    //~^ ERROR: no method named `foo` found for type `&dyn Foo` in the current scope
-}
diff --git a/src/test/compile-fail/issue-5216.rs b/src/test/compile-fail/issue-5216.rs
deleted file mode 100644
index 81424577d49..00000000000
--- a/src/test/compile-fail/issue-5216.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn f() { }
-struct S(Box<FnMut()>);
-pub static C: S = S(f); //~ ERROR mismatched types
-
-
-fn g() { }
-type T = Box<FnMut()>;
-pub static D: T = g; //~ ERROR mismatched types
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-52213.rs b/src/test/compile-fail/issue-52213.rs
deleted file mode 100644
index 810379c63d3..00000000000
--- a/src/test/compile-fail/issue-52213.rs
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn transmute_lifetime<'a, 'b, T>(t: &'a (T,)) -> &'b T {
-    match (&t,) { //~ ERROR cannot infer an appropriate lifetime
-        ((u,),) => u,
-    }
-}
-
-fn main() {
-    let x = {
-        let y = Box::new((42,));
-        transmute_lifetime(&y)
-    };
-
-    println!("{}", x);
-}
diff --git a/src/test/compile-fail/issue-5358-1.rs b/src/test/compile-fail/issue-5358-1.rs
deleted file mode 100644
index d8aad54fd3e..00000000000
--- a/src/test/compile-fail/issue-5358-1.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-enum Either<T, U> { Left(T), Right(U) }
-struct S(Either<usize, usize>);
-
-fn main() {
-    match S(Either::Left(5)) {
-        Either::Right(_) => {}
-        //~^ ERROR mismatched types
-        //~| expected type `S`
-        //~| found type `Either<_, _>`
-        //~| expected struct `S`, found enum `Either`
-        _ => {}
-    }
-}
diff --git a/src/test/compile-fail/issue-5439.rs b/src/test/compile-fail/issue-5439.rs
deleted file mode 100644
index 4e618f3d858..00000000000
--- a/src/test/compile-fail/issue-5439.rs
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![feature(box_syntax)]
-
-struct Foo {
-    foo: isize,
-}
-
-struct Bar {
-    bar: isize,
-}
-
-impl Bar {
-    fn make_foo (&self, i: isize) -> Box<Foo> {
-        return box Foo { nonexistent: self, foo: i }; //~ ERROR: no field named
-    }
-}
-
-fn main () {
-    let bar = Bar { bar: 1 };
-    let foo = bar.make_foo(2);
-    println!("{}", foo.foo);
-}
diff --git a/src/test/compile-fail/issue-5883.rs b/src/test/compile-fail/issue-5883.rs
deleted file mode 100644
index a91f5d281dd..00000000000
--- a/src/test/compile-fail/issue-5883.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-trait A {}
-
-struct Struct {
-    r: A+'static
-}
-
-fn new_struct(r: A+'static)
-    -> Struct { //~^ ERROR the size for values of type
-    //~^ ERROR the size for values of type
-    Struct { r: r }
-}
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-5927.rs b/src/test/compile-fail/issue-5927.rs
deleted file mode 100644
index bb802f353af..00000000000
--- a/src/test/compile-fail/issue-5927.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2013-2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-
-fn main() {
-    let z = match 3 {
-        x(1) => x(1) //~ ERROR cannot find tuple struct/variant `x` in this scope
-        //~^ ERROR cannot find function `x` in this scope
-    };
-    assert!(z == 3);
-}
diff --git a/src/test/compile-fail/issue-5997-enum.rs b/src/test/compile-fail/issue-5997-enum.rs
deleted file mode 100644
index 463fdaa1069..00000000000
--- a/src/test/compile-fail/issue-5997-enum.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn f<Z>() -> bool {
-    enum E { V(Z) }
-    //~^ ERROR can't use type parameters from outer function
-    true
-}
-
-fn main() {
-    let b = f::<isize>();
-    assert!(b);
-}
diff --git a/src/test/compile-fail/issue-5997-struct.rs b/src/test/compile-fail/issue-5997-struct.rs
deleted file mode 100644
index af9e66b770b..00000000000
--- a/src/test/compile-fail/issue-5997-struct.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn f<T>() -> bool {
-    struct S(T); //~ ERROR can't use type parameters from outer function
-
-    true
-}
-
-fn main() {
-    let b = f::<isize>();
-    assert!(b);
-}
diff --git a/src/test/compile-fail/issue-6458-2.rs b/src/test/compile-fail/issue-6458-2.rs
deleted file mode 100644
index 87cf2b3f740..00000000000
--- a/src/test/compile-fail/issue-6458-2.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2013-2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn main() {
-    // Unconstrained type:
-    format!("{:?}", None);
-    //~^ ERROR type annotations needed [E0282]
-}
diff --git a/src/test/compile-fail/issue-6596-1.rs b/src/test/compile-fail/issue-6596-1.rs
deleted file mode 100644
index e988f404c3c..00000000000
--- a/src/test/compile-fail/issue-6596-1.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// error-pattern: unknown macro variable `nonexistent`
-
-macro_rules! e {
-    ($inp:ident) => (
-        $nonexistent
-    );
-}
-
-fn main() {
-    e!(foo);
-}
diff --git a/src/test/compile-fail/issue-6596-2.rs b/src/test/compile-fail/issue-6596-2.rs
deleted file mode 100644
index 0158ad4ba4e..00000000000
--- a/src/test/compile-fail/issue-6596-2.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![feature(macro_rules)]
-
-// error-pattern: unknown macro variable `nonexistent`
-
-macro_rules! g {
-    ($inp:ident) => (
-        { $inp $nonexistent }
-    );
-}
-
-fn main() {
-    g!(foo);
-}
diff --git a/src/test/compile-fail/issue-6642.rs b/src/test/compile-fail/issue-6642.rs
deleted file mode 100644
index 1fe10ba7a27..00000000000
--- a/src/test/compile-fail/issue-6642.rs
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2013-2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-struct A;
-impl A {
-    fn m(&self) {
-        fn x() {
-            self.m() //~ ERROR can't capture dynamic environment in a fn item
-        }
-    }
-}
-fn main() {}
diff --git a/src/test/compile-fail/issue-6738.rs b/src/test/compile-fail/issue-6738.rs
deleted file mode 100644
index 447d0e061ee..00000000000
--- a/src/test/compile-fail/issue-6738.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-struct Foo<T> {
-    x: T,
-}
-impl<T> Foo<T> {
-    fn add(&mut self, v: Foo<T>){
-        self.x += v.x;
-        //~^ ERROR: binary assignment operation `+=` cannot be applied
-    }
-}
-fn main() {}
diff --git a/src/test/compile-fail/issue-6801.rs b/src/test/compile-fail/issue-6801.rs
deleted file mode 100644
index 792d27c179b..00000000000
--- a/src/test/compile-fail/issue-6801.rs
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// Creating a stack closure which references a box and then
-// transferring ownership of the box before invoking the stack
-// closure results in a crash.
-
-#![feature(box_syntax)]
-
-fn twice(x: Box<usize>) -> usize {
-     *x * 2
-}
-
-fn invoke<F>(f: F) where F: FnOnce() -> usize {
-     f();
-}
-
-fn main() {
-      let x  : Box<usize>  = box 9;
-      let sq =  || { *x * *x };
-
-      twice(x); //~ ERROR: cannot move out of
-      invoke(sq);
-}
diff --git a/src/test/compile-fail/issue-6804.rs b/src/test/compile-fail/issue-6804.rs
deleted file mode 100644
index fffa27ab842..00000000000
--- a/src/test/compile-fail/issue-6804.rs
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// Matching against NaN should result in a warning
-
-#![allow(unused)]
-#![deny(illegal_floating_point_literal_pattern)]
-
-use std::f64::NAN;
-
-fn main() {
-    let x = NAN;
-    match x {
-        NAN => {}, //~ ERROR floating-point types cannot be used
-        //~^ WARN this was previously accepted by the compiler but is being phased out
-        _ => {},
-    };
-
-    match [x, 1.0] {
-        [NAN, _] => {}, //~ ERROR floating-point types cannot be used
-        //~^ WARN this was previously accepted by the compiler but is being phased out
-        _ => {},
-    };
-}
diff --git a/src/test/compile-fail/issue-6936.rs b/src/test/compile-fail/issue-6936.rs
deleted file mode 100644
index 8eb16edcbd3..00000000000
--- a/src/test/compile-fail/issue-6936.rs
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-struct T;
-
-mod t1 {
-    type Foo = ::T;
-    mod Foo {} //~ ERROR the name `Foo` is defined multiple times
-}
-
-mod t2 {
-    type Foo = ::T;
-    struct Foo; //~ ERROR the name `Foo` is defined multiple times
-}
-
-mod t3 {
-    type Foo = ::T;
-    enum Foo {} //~ ERROR the name `Foo` is defined multiple times
-}
-
-mod t4 {
-    type Foo = ::T;
-    fn Foo() {} // ok
-}
-
-mod t5 {
-    type Bar<T> = T;
-    mod Bar {} //~ ERROR the name `Bar` is defined multiple times
-}
-
-mod t6 {
-    type Foo = ::T;
-    impl Foo {} // ok
-}
-
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-7013.rs b/src/test/compile-fail/issue-7013.rs
deleted file mode 100644
index 0c19780bcb4..00000000000
--- a/src/test/compile-fail/issue-7013.rs
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![feature(box_syntax)]
-
-use std::cell::RefCell;
-use std::rc::Rc;
-
-trait Foo {
-    fn set(&mut self, v: Rc<RefCell<A>>);
-}
-
-struct B {
-    v: Option<Rc<RefCell<A>>>
-}
-
-impl Foo for B {
-    fn set(&mut self, v: Rc<RefCell<A>>)
-    {
-        self.v = Some(v);
-    }
-}
-
-struct A {
-    v: Box<Foo + Send>,
-}
-
-fn main() {
-    let a = A {v: box B{v: None} as Box<Foo+Send>};
-    //~^ ERROR `std::rc::Rc<std::cell::RefCell<A>>` cannot be sent between threads safely
-}
diff --git a/src/test/compile-fail/issue-7044.rs b/src/test/compile-fail/issue-7044.rs
deleted file mode 100644
index 9b72c249356..00000000000
--- a/src/test/compile-fail/issue-7044.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-static X: isize = 0;
-struct X; //~ ERROR the name `X` is defined multiple times
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-7061.rs b/src/test/compile-fail/issue-7061.rs
deleted file mode 100644
index b99f5b707ee..00000000000
--- a/src/test/compile-fail/issue-7061.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-struct BarStruct;
-
-impl<'a> BarStruct {
-    fn foo(&'a mut self) -> Box<BarStruct> { self }
-    //~^ ERROR mismatched types
-    //~| expected type `std::boxed::Box<BarStruct>`
-    //~| found type `&'a mut BarStruct`
-}
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-7092.rs b/src/test/compile-fail/issue-7092.rs
deleted file mode 100644
index 26e1597b1db..00000000000
--- a/src/test/compile-fail/issue-7092.rs
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-enum Whatever {
-}
-
-fn foo(x: Whatever) {
-    match x {
-        Some(field) =>
-//~^ ERROR mismatched types
-//~| expected type `Whatever`
-//~| found type `std::option::Option<_>`
-//~| expected enum `Whatever`, found enum `std::option::Option`
-            field.access(),
-    }
-}
-
-fn main(){}
diff --git a/src/test/compile-fail/issue-7246.rs b/src/test/compile-fail/issue-7246.rs
deleted file mode 100644
index 7e8d431bf19..00000000000
--- a/src/test/compile-fail/issue-7246.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![deny(unreachable_code)]
-#![allow(dead_code)]
-
-use std::ptr;
-pub unsafe fn g() {
-    return;
-    if *ptr::null() {}; //~ ERROR unreachable
-}
-
-pub fn main() {}
diff --git a/src/test/compile-fail/issue-7364.rs b/src/test/compile-fail/issue-7364.rs
deleted file mode 100644
index 801a1301ad7..00000000000
--- a/src/test/compile-fail/issue-7364.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![feature(box_syntax)]
-
-use std::cell::RefCell;
-
-// Regression test for issue 7364
-static boxed: Box<RefCell<isize>> = box RefCell::new(0);
-//~^ ERROR allocations are not allowed in statics
-//~| ERROR `std::cell::RefCell<isize>` cannot be shared between threads safely [E0277]
-
-fn main() { }
diff --git a/src/test/compile-fail/issue-7607-1.rs b/src/test/compile-fail/issue-7607-1.rs
deleted file mode 100644
index 9bcdd690187..00000000000
--- a/src/test/compile-fail/issue-7607-1.rs
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-struct Foo {
-    x: isize
-}
-
-impl Fo { //~ ERROR cannot find type `Fo` in this scope
-    fn foo() {}
-}
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-7867.rs b/src/test/compile-fail/issue-7867.rs
deleted file mode 100644
index 016df6cb6ef..00000000000
--- a/src/test/compile-fail/issue-7867.rs
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-enum A { B, C }
-
-mod foo { pub fn bar() {} }
-
-fn main() {
-    match (true, false) {
-        A::B => (),
-        //~^ ERROR mismatched types
-        //~| expected type `(bool, bool)`
-        //~| found type `A`
-        //~| expected tuple, found enum `A`
-        _ => ()
-    }
-}
diff --git a/src/test/compile-fail/issue-7950.rs b/src/test/compile-fail/issue-7950.rs
deleted file mode 100644
index dd3a48cb155..00000000000
--- a/src/test/compile-fail/issue-7950.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// tests the good error message, not "missing module Foo" or something else unexpected
-
-struct Foo;
-
-fn main() {
-    Foo::bar();
-    //~^ ERROR no function or associated item named `bar` found for type `Foo`
-}
diff --git a/src/test/compile-fail/issue-7970a.rs b/src/test/compile-fail/issue-7970a.rs
deleted file mode 100644
index b97c3037770..00000000000
--- a/src/test/compile-fail/issue-7970a.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-macro_rules! one_arg_macro {
-    ($fmt:expr) => (print!(concat!($fmt, "\n")));
-}
-
-fn main() {
-    one_arg_macro!();
-    //~^ ERROR unexpected end of macro invocation
-}
diff --git a/src/test/compile-fail/issue-7970b.rs b/src/test/compile-fail/issue-7970b.rs
deleted file mode 100644
index 0cff90f281b..00000000000
--- a/src/test/compile-fail/issue-7970b.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-fn main() {}
-
-macro_rules! test {}
-//~^ ERROR unexpected end of macro invocation
diff --git a/src/test/compile-fail/issue-8153.rs b/src/test/compile-fail/issue-8153.rs
deleted file mode 100644
index 457918b54d4..00000000000
--- a/src/test/compile-fail/issue-8153.rs
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// Test that duplicate methods in impls are not allowed
-
-struct Foo;
-
-trait Bar {
-    fn bar(&self) -> isize;
-}
-
-impl Bar for Foo {
-    fn bar(&self) -> isize {1}
-    fn bar(&self) -> isize {2} //~ ERROR duplicate definitions
-}
-
-fn main() {
-    println!("{}", Foo.bar());
-}
diff --git a/src/test/compile-fail/issue-8208.rs b/src/test/compile-fail/issue-8208.rs
deleted file mode 100644
index 670b6bd46e7..00000000000
--- a/src/test/compile-fail/issue-8208.rs
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-use self::*; //~ ERROR: unresolved import `self::*` [E0432]
-             //~^ Cannot glob-import a module into itself.
-
-mod foo {
-    use foo::*; //~ ERROR: unresolved import `foo::*` [E0432]
-                //~^ Cannot glob-import a module into itself.
-
-    mod bar {
-        use super::bar::*;
-        //~^ ERROR: unresolved import `super::bar::*` [E0432]
-        //~| Cannot glob-import a module into itself.
-    }
-
-}
-
-fn main() {
-}
diff --git a/src/test/compile-fail/issue-8460-const.rs b/src/test/compile-fail/issue-8460-const.rs
deleted file mode 100644
index b0d6cb5df87..00000000000
--- a/src/test/compile-fail/issue-8460-const.rs
+++ /dev/null
@@ -1,77 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![deny(const_err)]
-
-use std::{isize, i8, i16, i32, i64};
-use std::thread;
-
-fn main() {
-    assert!(thread::spawn(move|| { isize::MIN / -1; }).join().is_err());
-    //~^ ERROR attempt to divide with overflow
-    //~| ERROR this expression will panic at runtime
-    assert!(thread::spawn(move|| { i8::MIN / -1; }).join().is_err());
-    //~^ ERROR attempt to divide with overflow
-    //~| ERROR this expression will panic at runtime
-    assert!(thread::spawn(move|| { i16::MIN / -1; }).join().is_err());
-    //~^ ERROR attempt to divide with overflow
-    //~| ERROR this expression will panic at runtime
-    assert!(thread::spawn(move|| { i32::MIN / -1; }).join().is_err());
-    //~^ ERROR attempt to divide with overflow
-    //~| ERROR this expression will panic at runtime
-    assert!(thread::spawn(move|| { i64::MIN / -1; }).join().is_err());
-    //~^ ERROR attempt to divide with overflow
-    //~| ERROR this expression will panic at runtime
-    assert!(thread::spawn(move|| { 1isize / 0; }).join().is_err());
-    //~^ ERROR attempt to divide by zero
-    //~| ERROR this expression will panic at runtime
-    assert!(thread::spawn(move|| { 1i8 / 0; }).join().is_err());
-    //~^ ERROR attempt to divide by zero
-    //~| ERROR this expression will panic at runtime
-    assert!(thread::spawn(move|| { 1i16 / 0; }).join().is_err());
-    //~^ ERROR attempt to divide by zero
-    //~| ERROR this expression will panic at runtime
-    assert!(thread::spawn(move|| { 1i32 / 0; }).join().is_err());
-    //~^ ERROR attempt to divide by zero
-    //~| ERROR this expression will panic at runtime
-    assert!(thread::spawn(move|| { 1i64 / 0; }).join().is_err());
-    //~^ ERROR attempt to divide by zero
-    //~| ERROR this expression will panic at runtime
-    assert!(thread::spawn(move|| { isize::MIN % -1; }).join().is_err());
-    //~^ ERROR attempt to calculate the remainder with overflow
-    //~| ERROR this expression will panic at runtime
-    assert!(thread::spawn(move|| { i8::MIN % -1; }).join().is_err());
-    //~^ ERROR attempt to calculate the remainder with overflow
-    //~| ERROR this expression will panic at runtime
-    assert!(thread::spawn(move|| { i16::MIN % -1; }).join().is_err());
-    //~^ ERROR attempt to calculate the remainder with overflow
-    //~| ERROR this expression will panic at runtime
-    assert!(thread::spawn(move|| { i32::MIN % -1; }).join().is_err());
-    //~^ ERROR attempt to calculate the remainder with overflow
-    //~| ERROR this expression will panic at runtime
-    assert!(thread::spawn(move|| { i64::MIN % -1; }).join().is_err());
-    //~^ ERROR attempt to calculate the remainder with overflow
-    //~| ERROR this expression will panic at runtime
-    assert!(thread::spawn(move|| { 1isize % 0; }).join().is_err());
-    //~^ ERROR attempt to calculate the remainder with a divisor of zero
-    //~| ERROR this expression will panic at runtime
-    assert!(thread::spawn(move|| { 1i8 % 0; }).join().is_err());
-    //~^ ERROR attempt to calculate the remainder with a divisor of zero
-    //~| ERROR this expression will panic at runtime
-    assert!(thread::spawn(move|| { 1i16 % 0; }).join().is_err());
-    //~^ ERROR attempt to calculate the remainder with a divisor of zero
-    //~| ERROR this expression will panic at runtime
-    assert!(thread::spawn(move|| { 1i32 % 0; }).join().is_err());
-    //~^ ERROR attempt to calculate the remainder with a divisor of zero
-    //~| ERROR this expression will panic at runtime
-    assert!(thread::spawn(move|| { 1i64 % 0; }).join().is_err());
-    //~^ ERROR attempt to calculate the remainder with a divisor of zero
-    //~| ERROR this expression will panic at runtime
-}
diff --git a/src/test/compile-fail/issue-8640.rs b/src/test/compile-fail/issue-8640.rs
deleted file mode 100644
index c4ca3acf080..00000000000
--- a/src/test/compile-fail/issue-8640.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#[allow(unused_imports)]
-
-mod foo {
-    use baz::bar;
-    mod bar {}
-    //~^ ERROR the name `bar` is defined multiple times
-}
-mod baz { pub mod bar {} }
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-8727.rs b/src/test/compile-fail/issue-8727.rs
deleted file mode 100644
index 18b7948c46c..00000000000
--- a/src/test/compile-fail/issue-8727.rs
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// error-pattern:reached the recursion limit while instantiating `generic::<std::option::Option<
-
-// Verify the compiler fails with an error on infinite function
-// recursions.
-
-fn generic<T>() {
-    generic::<Option<T>>();
-}
-
-
-fn main () {
-    // Use generic<T> at least once to trigger instantiation.
-    generic::<i32>();
-}
diff --git a/src/test/compile-fail/issue-8761.rs b/src/test/compile-fail/issue-8761.rs
deleted file mode 100644
index f8424ea64ef..00000000000
--- a/src/test/compile-fail/issue-8761.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-enum Foo {
-    A = 1i64,
-    //~^ ERROR mismatched types
-    //~| expected isize, found i64
-    B = 2u8
-    //~^ ERROR mismatched types
-    //~| expected isize, found u8
-}
-
-fn main() {}
diff --git a/src/test/compile-fail/issue-8767.rs b/src/test/compile-fail/issue-8767.rs
deleted file mode 100644
index 926cae788aa..00000000000
--- a/src/test/compile-fail/issue-8767.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-impl B { //~ ERROR cannot find type `B` in this scope
-}
-
-fn main() {
-}
diff --git a/src/test/compile-fail/issue-9575.rs b/src/test/compile-fail/issue-9575.rs
deleted file mode 100644
index 9295eeb1779..00000000000
--- a/src/test/compile-fail/issue-9575.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![feature(start)]
-
-#[start]
-fn start(argc: isize, argv: *const *const u8, crate_map: *const u8) -> isize {
-    //~^ start function has wrong type
-   0
-}
diff --git a/src/test/compile-fail/issue-9725.rs b/src/test/compile-fail/issue-9725.rs
deleted file mode 100644
index f53122d19c1..00000000000
--- a/src/test/compile-fail/issue-9725.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-struct A { foo: isize }
-
-fn main() {
-    let A { foo, foo } = A { foo: 3 };
-    //~^ ERROR: identifier `foo` is bound more than once in the same pattern
-    //~^^ ERROR: field `foo` bound multiple times
-}
diff --git a/src/test/compile-fail/issue-9814.rs b/src/test/compile-fail/issue-9814.rs
deleted file mode 100644
index 226734b84d6..00000000000
--- a/src/test/compile-fail/issue-9814.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// Verify that single-variant enums can't be de-referenced
-// Regression test for issue #9814
-
-enum Foo { Bar(isize) }
-
-fn main() {
-    let _ = *Foo::Bar(2); //~ ERROR type `Foo` cannot be dereferenced
-}
diff --git a/src/test/compile-fail/issue-pr29383.rs b/src/test/compile-fail/issue-pr29383.rs
deleted file mode 100644
index b60c537e1e6..00000000000
--- a/src/test/compile-fail/issue-pr29383.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-enum E {
-    A,
-    B,
-}
-
-fn main() {
-    match None {
-        None => {}
-        Some(E::A(..)) => {} //~ ERROR expected tuple struct/variant, found unit variant `E::A`
-        Some(E::B(..)) => {} //~ ERROR expected tuple struct/variant, found unit variant `E::B`
-    }
-}