---

yaml
---
r: 32191
b: refs/heads/dist-snap
c: 6d78819
h: refs/heads/master
i:
  32189: 5a47b76
  32187: 9cdc853
  32183: acdd71b
  32175: 924b8d1
  32159: cc636ce
  32127: 9020d16
v: v3

Author: nikomatsakis

[refs]

@@ -7,6 +7,6 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
-refs/heads/dist-snap: 3e6ddf72baefb1db2909061ed96abcb85bd4d6f1
+refs/heads/dist-snap: 6d788198d784c126ca75475f5a0178722db82d56
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/dist-snap/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: &region) -> 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
     }
 }
 

branches/dist-snap/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,