---

yaml
---
r: 23528
b: refs/heads/master
c: 3e6ddf7
h: refs/heads/master
v: v3

Author: erickt

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: ad19609dbce8bae2dcbb7debb0ed4a7d9b490d31
+refs/heads/master: 3e6ddf72baefb1db2909061ed96abcb85bd4d6f1
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/src/rustc/middle/resolve3.rs

@@ -33,7 +33,7 @@ import syntax::ast::{local, local_crate, lt, method, mul, ne, neg, node_id};
 import syntax::ast::{pat, pat_enum, pat_ident, path, prim_ty, pat_box};
 import syntax::ast::{pat_lit, pat_range, pat_rec, pat_struct, pat_tup};
 import syntax::ast::{pat_uniq, pat_wild, private, provided, public, required};
-import syntax::ast::{rem, self_ty_, shl, stmt_decl, struct_field};
+import syntax::ast::{rem, self_ty_, shl, shr, stmt_decl, struct_field};
 import syntax::ast::{struct_variant_kind, sty_static, subtract, trait_ref};
 import syntax::ast::{tuple_variant_kind, ty, ty_bool, ty_char, ty_f, ty_f32};
 import syntax::ast::{ty_f64, ty_float, ty_i, ty_i16, ty_i32, ty_i64, ty_i8};