diff options
Diffstat (limited to 'src/rustc')
| -rw-r--r-- | src/rustc/middle/ty.rs | 4 | ||||
| -rw-r--r-- | src/rustc/middle/typeck/check.rs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/rustc/middle/ty.rs b/src/rustc/middle/ty.rs index a3d388d10fa..b336a85ad9e 100644 --- a/src/rustc/middle/ty.rs +++ b/src/rustc/middle/ty.rs @@ -1035,7 +1035,7 @@ fn fold_regions_and_ty( ty_trait(def_id, ref substs, vst) => { ty::mk_trait(cx, def_id, fold_substs(substs, fldr, fldt), vst) } - ref sty @ ty_fn(f) => { + ty_fn(f) => { let new_proto; match f.proto { proto_bare => @@ -2229,7 +2229,7 @@ pure fn hash_region(r: ®ion) -> uint { (hash_bound_region(&br)) << 2u | 1u, re_scope(id) => ((id as uint) << 2u) | 2u, re_var(id) => (id.to_uint() << 2u) | 3u, - re_bot => 4u + re_static => 4u } } diff --git a/src/rustc/middle/typeck/check.rs b/src/rustc/middle/typeck/check.rs index 012e384edb1..68b10624103 100644 --- a/src/rustc/middle/typeck/check.rs +++ b/src/rustc/middle/typeck/check.rs @@ -892,7 +892,7 @@ fn check_expr_with_unifier(fcx: @fn_ctxt, // functions. Therefore, we match one level of structure. let fn_ty = match structure_of(fcx, sp, in_fty) { - sty @ ty::ty_fn(ref fn_ty) => { + ty::ty_fn(ref fn_ty) => { replace_bound_regions_in_fn_ty( fcx.ccx.tcx, @nil, None, fn_ty, |_br| fcx.infcx.next_region_var(sp, |
