---

yaml
---
r: 163687
b: refs/heads/snap-stage3
c: 5338222
h: refs/heads/master
i:
  163685: 3771b90
  163683: bd81f1b
  163679: 77db970
v: v3

Author: eddyb

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 9146a919b616e39e528e4d7100d16eef52f1f852
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 1c2df5cc3cfc0c9e80adf9fa6504d55056741c5a
+refs/heads/snap-stage3: 533822207fd3f34a3d45d99a0eece0112880a845
 refs/heads/try: 20cbbffeefc1f35e2ea63afce7b42fbd79611d42
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d

branches/snap-stage3/src/librustc/middle/resolve.rs

@@ -8,8 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![allow(non_camel_case_types)]
-
 pub use self::PrivateDep::*;
 pub use self::ImportUse::*;
 pub use self::TraitItemKind::*;
@@ -90,13 +88,13 @@ use std::uint;
 pub type DefMap = RefCell<NodeMap<Def>>;
 
 #[deriving(Copy)]
-struct binding_info {
+struct BindingInfo {
     span: Span,
     binding_mode: BindingMode,
 }
 
 // Map from the name in a pattern to its binding mode.
-type BindingMap = HashMap<Name,binding_info>;
+type BindingMap = HashMap<Name, BindingInfo>;
 
 // Trait method resolution
 pub type TraitMap = NodeMap<Vec<DefId> >;
@@ -4809,9 +4807,10 @@ impl<'a> Resolver<'a> {
         let mut result = HashMap::new();
         pat_bindings(&self.def_map, pat, |binding_mode, _id, sp, path1| {
             let name = mtwt::resolve(path1.node);
-            result.insert(name,
-                          binding_info {span: sp,
-                                        binding_mode: binding_mode});
+            result.insert(name, BindingInfo {
+                span: sp,
+                binding_mode: binding_mode
+            });
         });
         return result;
     }