Move some compile-fail tests into UI directory

rust-lang · Dec 26, 2016 · 3fb676a · 3fb676a
1 parent 5752eae
commit 3fb676a
Show file tree

Hide file tree

Showing 63 changed files with 1,285 additions and 323 deletions.
diff --git a/src/test/compile-fail/issue-14254.rs b/src/test/compile-fail/issue-14254.rs
diff --git a/src/test/compile-fail/issue-2356.rs b/src/test/compile-fail/issue-2356.rs
diff --git a/...t/compile-fail/auxiliary/issue-21221-3.rs → ...est/ui/resolve/auxiliary/issue-21221-3.rs b/...t/compile-fail/auxiliary/issue-21221-3.rs → ...est/ui/resolve/auxiliary/issue-21221-3.rs
diff --git a/...t/compile-fail/auxiliary/issue-21221-4.rs → ...est/ui/resolve/auxiliary/issue-21221-4.rs b/...t/compile-fail/auxiliary/issue-21221-4.rs → ...est/ui/resolve/auxiliary/issue-21221-4.rs
diff --git a/...compile-fail/auxiliary/issue_19452_aux.rs → ...t/ui/resolve/auxiliary/issue_19452_aux.rs b/...compile-fail/auxiliary/issue_19452_aux.rs → ...t/ui/resolve/auxiliary/issue_19452_aux.rs
diff --git a/...test/compile-fail/auxiliary/issue_3907.rs → src/test/ui/resolve/auxiliary/issue_3907.rs b/...test/compile-fail/auxiliary/issue_3907.rs → src/test/ui/resolve/auxiliary/issue_3907.rs
diff --git a/...nboxed-closure-sugar-nonexistent-trait.rs → .../ui/resolve/auxiliary/namespaced_enums.rs b/...nboxed-closure-sugar-nonexistent-trait.rs → .../ui/resolve/auxiliary/namespaced_enums.rs
@@ -8,10 +8,13 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-fn f<F:Nonexist(isize) -> isize>(x: F) {} //~ ERROR trait `Nonexist` is not in scope
+pub enum Foo {
+    A,
+    B(isize),
+    C { a: isize },
+}
 
-type Typedef = isize;
-
-fn g<F:Typedef(isize) -> isize>(x: F) {} //~ ERROR `Typedef` is not a trait
-
-fn main() {}
+impl Foo {
+    pub fn foo() {}
+    pub fn bar(&self) {}
+}
diff --git a/...t/compile-fail/enums-are-namespaced-xc.rs → ...est/ui/resolve/enums-are-namespaced-xc.rs b/...t/compile-fail/enums-are-namespaced-xc.rs → ...est/ui/resolve/enums-are-namespaced-xc.rs
@@ -12,8 +12,13 @@
 extern crate namespaced_enums;
 
 fn main() {
-    let _ = namespaced_enums::A; //~ ERROR unresolved name
-    let _ = namespaced_enums::B(10); //~ ERROR unresolved name
+    let _ = namespaced_enums::A;
+    //~^ ERROR unresolved value `namespaced_enums::A`
+    //~| HELP you can import it into scope: `use namespaced_enums::Foo::A;`
+    let _ = namespaced_enums::B(10);
+    //~^ ERROR unresolved function `namespaced_enums::B`
+    //~| HELP you can import it into scope: `use namespaced_enums::Foo::B;`
     let _ = namespaced_enums::C { a: 10 };
     //~^ ERROR unresolved struct, variant or union type `namespaced_enums::C`
+    //~| HELP you can import it into scope: `use namespaced_enums::Foo::C;`
 }
diff --git a/src/test/ui/resolve/enums-are-namespaced-xc.stderr b/src/test/ui/resolve/enums-are-namespaced-xc.stderr
@@ -0,0 +1,20 @@
+error[E0425]: unresolved name `namespaced_enums::A`
+  --> $DIR/enums-are-namespaced-xc.rs:15:13
+   |
+15 |     let _ = namespaced_enums::A;
+   |             ^^^^^^^^^^^^^^^^^^^ unresolved name
+
+error[E0425]: unresolved name `namespaced_enums::B`
+  --> $DIR/enums-are-namespaced-xc.rs:18:13
+   |
+18 |     let _ = namespaced_enums::B(10);
+   |             ^^^^^^^^^^^^^^^^^^^ unresolved name
+
+error[E0531]: unresolved struct, variant or union type `namespaced_enums::C`
+  --> $DIR/enums-are-namespaced-xc.rs:21:13
+   |
+21 |     let _ = namespaced_enums::C { a: 10 };
+   |             ^^^^^^^^^^^^^^^^^^^
+
+error: aborting due to 3 previous errors
+