Merge from rustc

1 files changed, 12 insertions, 0 deletions

diff --git a/tests/ui/array-slice-vec/array-not-vector.rs b/tests/ui/array-slice-vec/array-not-vector.rs
new file mode 100644
index 00000000000..5e46f015baf
--- /dev/null
+++ b/tests/ui/array-slice-vec/array-not-vector.rs
@@ -0,0 +1,12 @@
+fn main() {
+    let _x: i32 = [1, 2, 3];
+    //~^ ERROR mismatched types
+    //~| expected `i32`, found array
+
+    let x: &[i32] = &[1, 2, 3];
+    let _y: &i32 = x;
+    //~^ ERROR mismatched types
+    //~| expected reference `&i32`
+    //~| found reference `&[i32]`
+    //~| expected `i32`, found slice
+}