---

yaml
---
r: 2839
b: refs/heads/master
c: c7e3f88
h: refs/heads/master
i:
  2837: ea47f06
  2835: c067d50
  2831: 547f67a
v: v3

Author: brson

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 973b93ee2a58f80b9f1f0e1fd707348c75c0137f
+refs/heads/master: c7e3f88c93883ecbb27dcdfb7d8ec6e263b126b0

trunk/src/comp/middle/typeck.rs

@@ -1171,10 +1171,20 @@ mod pushdown {
                 let ty_param_substs_and_ty res_t = demand::full(scx, pat.span,
                       expected, tt, tps, NO_AUTODEREF);
 
-                // TODO: push down type from "expected".
-                write::ty_fixup(scx, ann.id,
-                    ty::ann_to_ty_param_substs_opt_and_ty
-                        (scx.fcx.ccx.tcx.node_types, ann));
+                auto ty_params_subst = ty::ann_to_ty_param_substs_opt_and_ty
+                    (scx.fcx.ccx.tcx.node_types, ann);
+
+                auto ty_params_opt;
+                alt (ty_params_subst._0) {
+                    case (none[vec[ty::t]]) {
+                        ty_params_opt = none[vec[ty::t]];
+                    }
+                    case (some[vec[ty::t]](?tps)) {
+                        ty_params_opt = some[vec[ty::t]](tag_tps);
+                    }
+                }
+
+                write::ty_fixup(scx, ann.id, tup(ty_params_opt, tt));
             }
         }
     }

trunk/src/test/run-pass/alt-pattern-no-type-params.rs

@@ -0,0 +1,15 @@
+// xfail-stage0
+
+tag maybe[T] {
+  nothing;
+  just(T);
+}
+
+fn foo(maybe[int] x) {
+  alt (x) {
+    case (nothing) {log_err "A";}
+    case (just(?a)) {log_err "B";}
+  }
+}
+
+fn main() {}