Skip to content

Commit 5338222

Browse files
committed
rustc: don't allow(non_camel_case_types) in resolve.
1 parent 1c2df5c commit 5338222

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

src/librustc/middle/resolve.rs

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
#![allow(non_camel_case_types)]
12-
1311
pub use self::PrivateDep::*;
1412
pub use self::ImportUse::*;
1513
pub use self::TraitItemKind::*;
@@ -90,13 +88,13 @@ use std::uint;
9088
pub type DefMap = RefCell<NodeMap<Def>>;
9189

9290
#[deriving(Copy)]
93-
struct binding_info {
91+
struct BindingInfo {
9492
span: Span,
9593
binding_mode: BindingMode,
9694
}
9795

9896
// Map from the name in a pattern to its binding mode.
99-
type BindingMap = HashMap<Name,binding_info>;
97+
type BindingMap = HashMap<Name, BindingInfo>;
10098

10199
// Trait method resolution
102100
pub type TraitMap = NodeMap<Vec<DefId> >;
@@ -4809,9 +4807,10 @@ impl<'a> Resolver<'a> {
48094807
let mut result = HashMap::new();
48104808
pat_bindings(&self.def_map, pat, |binding_mode, _id, sp, path1| {
48114809
let name = mtwt::resolve(path1.node);
4812-
result.insert(name,
4813-
binding_info {span: sp,
4814-
binding_mode: binding_mode});
4810+
result.insert(name, BindingInfo {
4811+
span: sp,
4812+
binding_mode: binding_mode
4813+
});
48154814
});
48164815
return result;
48174816
}

0 commit comments

Comments
 (0)