1 files changed, 20 insertions, 0 deletions

diff --git a/src/test/ui/issues/issue-13466.rs b/src/test/ui/issues/issue-13466.rs
new file mode 100644
index 000000000..a420c7704
--- /dev/null
+++ b/src/test/ui/issues/issue-13466.rs
@@ -0,0 +1,20 @@
+// 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 enum `Option<{integer}>`
+        //~| found enum `Result<_, _>`
+        //~| expected enum `Option`, found enum `Result`
+
+        Err(e) => panic!(e)
+        //~^ ERROR mismatched types
+        //~| expected enum `Option<{integer}>`
+        //~| found enum `Result<_, _>`
+        //~| expected enum `Option`, found enum `Result`
+    };
+}