---

yaml
---
r: 13567
b: refs/heads/master
c: 26bd186
h: refs/heads/master
i:
  13565: bbff109
  13563: e7e651b
  13559: bdb38d7
  13551: b7ed888
  13535: 74ef21d
  13503: cb66784
  13439: accb9a9
  13311: b93da12
v: v3

Author: lkuper

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 3e281439a0d9fd67f3ad08976d0b60535112b303
+refs/heads/master: 26bd186726124e76714b98d1e28afe477bd99353
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/rustc/middle/typeck.rs

@@ -203,6 +203,23 @@ fn require_same_types(
     }
 }
 
+fn require_same_types_in_infcx(
+    infcx: infer::infer_ctxt,
+    span: span,
+    t1: ty::t,
+    t2: ty::t,
+    msg: fn() -> str) -> bool {
+
+    alt infer::compare_tys_in_infcx(infcx, t1, t2) {
+      result::ok(()) { true }
+      result::err(terr) {
+        infcx.tcx.sess.span_err(span, msg() + ": " +
+            ty::type_err_to_str(infcx.tcx, terr));
+        false
+      }
+    }
+}
+
 fn arg_is_argv_ty(_tcx: ty::ctxt, a: ty::arg) -> bool {
     alt ty::get(a.ty).struct {
       ty::ty_vec(mt) {

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

@@ -137,9 +137,12 @@ fn check_pat(pcx: pat_ctxt, pat: @ast::pat, expected: ty::t) {
         check_expr_with(fcx, end, expected);
         let b_ty =
             fcx.infcx.resolve_type_vars_if_possible(fcx.expr_ty(begin));
-        if !require_same_types(
-            tcx, pat.span, b_ty,
-            fcx.infcx.resolve_type_vars_if_possible(fcx.expr_ty(end)),
+        let e_ty =
+            fcx.infcx.resolve_type_vars_if_possible(fcx.expr_ty(end));
+        #debug["pat_range beginning type: %?", b_ty];
+        #debug["pat_range ending type: %?", e_ty];
+        if !require_same_types_in_infcx(
+            fcx.infcx, pat.span, b_ty, e_ty,
             {|| "mismatched types in range" }) {
             // no-op
         } else if !ty::type_is_numeric(b_ty) {

trunk/src/rustc/middle/typeck/infer.rs

@@ -172,6 +172,7 @@ export resolve_deep_var;
 export methods; // for infer_ctxt
 export unify_methods; // for infer_ctxt
 export compare_tys;
+export compare_tys_in_infcx;
 export fixup_err, fixup_err_to_str;
 export assignment;
 export root, to_str;
@@ -381,6 +382,10 @@ fn compare_tys(tcx: ty::ctxt, a: ty::t, b: ty::t) -> ures {
     mk_eqty(infcx, a, b)
 }
 
+fn compare_tys_in_infcx(infcx: infer_ctxt, a: ty::t, b: ty::t) -> ures {
+    mk_eqty(infcx, a, b)
+}
+
 // See comment on the type `resolve_state` below
 fn resolve_shallow(cx: infer_ctxt, a: ty::t,
                    force_vars: force_level) -> fres<ty::t> {