Move some UI tests into subdirectories

to avoid going over the existing limit now that the ui-fulldeps tests have
been moved to ui.

2 files changed, 34 insertions, 0 deletions

diff --git a/tests/ui/resolve/disambiguate-identical-names.rs b/tests/ui/resolve/disambiguate-identical-names.rs
new file mode 100644
index 00000000000..708d2cd76a1
--- /dev/null
+++ b/tests/ui/resolve/disambiguate-identical-names.rs
@@ -0,0 +1,15 @@
+pub mod submod {
+    // Create ambiguity with the std::vec::Vec item:
+    pub struct Vec;
+}
+
+fn test(_v: &Vec<Vec<u32>>) {
+}
+
+fn main() {
+    let v = std::collections::HashMap::new();
+    v.insert(3u8, 1u8);
+
+    test(&v);
+    //~^ ERROR mismatched types
+}
diff --git a/tests/ui/resolve/disambiguate-identical-names.stderr b/tests/ui/resolve/disambiguate-identical-names.stderr
new file mode 100644
index 00000000000..7d8293018d2
--- /dev/null
+++ b/tests/ui/resolve/disambiguate-identical-names.stderr
@@ -0,0 +1,19 @@
+error[E0308]: mismatched types
+  --> $DIR/disambiguate-identical-names.rs:13:10
+   |
+LL |     test(&v);
+   |     ---- ^^ expected `&Vec<Vec<u32>>`, found `&HashMap<u8, u8>`
+   |     |
+   |     arguments to this function are incorrect
+   |
+   = note: expected reference `&std::vec::Vec<std::vec::Vec<u32>>`
+              found reference `&HashMap<u8, u8>`
+note: function defined here
+  --> $DIR/disambiguate-identical-names.rs:6:4
+   |
+LL | fn test(_v: &Vec<Vec<u32>>) {
+   |    ^^^^ ------------------
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0308`.