Skip to content

Commit

Permalink
rustc: don't allow(non_camel_case_types) in resolve.
Browse files Browse the repository at this point in the history
  • Loading branch information
eddyb committed Dec 20, 2014
1 parent 1c2df5c commit 5338222
Showing 1 changed file with 6 additions and 7 deletions.
13 changes: 6 additions & 7 deletions src/librustc/middle/resolve.rs
Expand Up @@ -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::*;
Expand Down Expand Up @@ -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> >;
Expand Down Expand Up @@ -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;
}
Expand Down

0 comments on commit 5338222

Please sign in to comment.