---

yaml
---
r: 42476
b: refs/heads/try
c: 532c94d
h: refs/heads/master
v: v3

Author: nikomatsakis

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 19dfec2aaf746535de1521f68421f9980dbf25de
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 2f46b763da2c098913884f101b6d71d69af41b49
-refs/heads/try: 9fed56ed9035912a2657b07ab1b7671706bd9576
+refs/heads/try: 532c94d0f12cb2c56870c283947aa12ce2c9b9b6
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278

branches/try/src/librustc/middle/typeck/check/_match.rs

@@ -14,7 +14,7 @@ use middle::pat_util::{PatIdMap, pat_id_map, pat_is_binding, pat_is_const};
 use middle::pat_util::{pat_is_variant_or_struct};
 use middle::ty;
 use middle::typeck::check::demand;
-use middle::typeck::check::{check_block, check_expr_with, fn_ctxt};
+use middle::typeck::check::{check_block, check_expr_has_type, fn_ctxt};
 use middle::typeck::check::{instantiate_path, lookup_def, lookup_local};
 use middle::typeck::check::{structure_of, valid_range_bounds};
 use middle::typeck::require_same_types;
@@ -35,7 +35,7 @@ fn check_match(fcx: @fn_ctxt,
     let mut bot;
 
     let pattern_ty = fcx.infcx().next_ty_var();
-    bot = check_expr_with(fcx, discrim, pattern_ty);
+    bot = check_expr_has_type(fcx, discrim, pattern_ty);
 
     // Typecheck the patterns first, so that we get types for all the
     // bindings.
@@ -55,7 +55,7 @@ fn check_match(fcx: @fn_ctxt,
     let mut arm_non_bot = false;
     for arms.each |arm| {
         match arm.guard {
-          Some(e) => { check_expr_with(fcx, e, ty::mk_bool(tcx)); },
+          Some(e) => { check_expr_has_type(fcx, e, ty::mk_bool(tcx)); },
           None => ()
         }
         if !check_block(fcx, arm.body) { arm_non_bot = true; }
@@ -334,12 +334,12 @@ fn check_pat(pcx: pat_ctxt, pat: @ast::pat, expected: ty::t) {
         fcx.write_ty(pat.id, expected);
       }
       ast::pat_lit(lt) => {
-        check_expr_with(fcx, lt, expected);
+        check_expr_has_type(fcx, lt, expected);
         fcx.write_ty(pat.id, fcx.expr_ty(lt));
       }
       ast::pat_range(begin, end) => {
-        check_expr_with(fcx, begin, expected);
-        check_expr_with(fcx, end, expected);
+        check_expr_has_type(fcx, begin, expected);
+        check_expr_has_type(fcx, end, expected);
         let b_ty =
             fcx.infcx().resolve_type_vars_if_possible(fcx.expr_ty(begin));
         let e_ty =