---

yaml
---
r: 4931
b: refs/heads/master
c: 608f7cc
h: refs/heads/master
i:
  4929: 0d5d5ef
  4927: 706fd60
v: v3

Author: brson

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4d92cb5c63469003903a87574e30308f512314cc
+refs/heads/master: 608f7ccded67fd65d5e12ef2c0601170fb3345ed

trunk/src/comp/middle/trans_alt.rs

@@ -69,7 +69,7 @@ type match_branch =
       bound: bind_map,
       data: @{body: BasicBlockRef,
               guard: option::t<@ast::expr>,
-              id_map: ast::pat_id_map}};
+              id_map: ast_util::pat_id_map}};
 type match = [match_branch];
 
 fn matches_always(p: &@ast::pat) -> bool {
@@ -464,7 +464,7 @@ fn compile_submatch(bcx: @block_ctxt, m: &match, vals: [ValueRef],
 
 // Returns false for unreachable blocks
 fn make_phi_bindings(bcx: &@block_ctxt, map: &[exit_node],
-                     ids: &ast::pat_id_map) -> bool {
+                     ids: &ast_util::pat_id_map) -> bool {
     let our_block = bcx.llbb as uint;
     let success = true;
     for each item: @{key: ast::ident, val: ast::node_id} in ids.items() {

trunk/src/comp/middle/typeck.rs

@@ -1305,7 +1305,7 @@ fn check_lit(ccx: @crate_ctxt, lit: &@ast::lit) -> ty::t {
 
 // Pattern checking is top-down rather than bottom-up so that bindings get
 // their types immediately.
-fn check_pat(fcx: &@fn_ctxt, map: &ast::pat_id_map, pat: &@ast::pat,
+fn check_pat(fcx: &@fn_ctxt, map: &ast_util::pat_id_map, pat: &@ast::pat,
              expected: ty::t) {
     alt pat.node {
       ast::pat_wild. { write::ty_only_fixup(fcx, pat.id, expected); }

trunk/src/comp/syntax/ast.rs

@@ -98,8 +98,6 @@ tag pat_ {
     pat_box(@pat);
 }
 
-type pat_id_map = std::map::hashmap<str, ast::node_id>;
-
 tag mutability { mut; imm; maybe_mut; }
 
 tag kind { kind_pinned; kind_shared; kind_unique; }

trunk/src/comp/syntax/ast_util.rs

@@ -43,6 +43,8 @@ fn def_id_of_def(d: def) -> def_id {
     }
 }
 
+type pat_id_map = std::map::hashmap<str, ast::node_id>;
+
 // This is used because same-named variables in alternative patterns need to
 // use the node_id of their namesake in the first pattern.
 fn pat_id_map(pat: &@pat) -> pat_id_map {