---

yaml
---
r: 35478
b: refs/heads/master
c: 6439f2d
h: refs/heads/master
v: v3

Author: catamorphism

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 35209cb9ec1ed743dfbee9854d6a53500e6bf0ff
+refs/heads/master: 6439f2d54645915ce57f4c229811719e8e498151
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
 refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024

trunk/src/librustc/middle/typeck/check/alt.rs

@@ -95,7 +95,16 @@ fn check_pat_variant(pcx: pat_ctxt, pat: @ast::pat, path: @ast::path,
                 let vinfo =
                     ty::enum_variant_with_id(
                         tcx, v_def_ids.enm, v_def_ids.var);
-                vinfo.args.map(|t| { ty::subst(tcx, expected_substs, *t) })
+                let var_tpt = ty::lookup_item_type(tcx, v_def_ids.var);
+                vinfo.args.map(|t| {
+                    if var_tpt.bounds.len() == expected_substs.tps.len() {
+                        ty::subst(tcx, expected_substs, *t)
+                    }
+                    else {
+                        *t // In this case, an error was already signaled
+                           // anyway
+                    }
+                })
             };
 
             kind_name = "variant";

trunk/src/test/compile-fail/issue-3680.rs

@@ -8,8 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-test
-fn f() {
+fn main() {
     match None {
             Err(_) => () //~ ERROR expected `core::result
     }