user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fallout from collection conventions

Browse source
This commit is contained in:
Alexis Beingessner 2014-11-06 12:25:16 -05:00
parent cf3b2e4fe6
commit eec145be3f
101 changed files with 418 additions and 417 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libsyntax/ext/base.rs
View file

@ -768,7 +768,7 @@ impl SyntaxEnv {
pub fn find(&self, k: &Name) -> Option<Rc<SyntaxExtension>> {
for frame in self.chain.iter().rev() {
match frame.map.find(k) {
match frame.map.get(k) {
Some(v) => return Some(v.clone()),
None => {}
}

8
src/libsyntax/ext/format.rs
View file

@ -252,7 +252,7 @@ impl<'a, 'b> Context<'a, 'b> {
}
Named(name) => {
let span = match self.names.find(&name) {
let span = match self.names.get(&name) {
Some(e) => e.span,
None => {
let msg = format!("there is no argument named `{}`", name);
@ -260,7 +260,7 @@ impl<'a, 'b> Context<'a, 'b> {
return;
}
};
self.verify_same(span, &ty, self.name_types.find(&name));
self.verify_same(span, &ty, self.name_types.get(&name));
if !self.name_types.contains_key(&name) {
self.name_types.insert(name.clone(), ty);
}
@ -555,11 +555,11 @@ impl<'a, 'b> Context<'a, 'b> {
heads.push(self.ecx.expr_addr_of(e.span, e));
}
for name in self.name_ordering.iter() {
let e = match self.names.pop(name) {
let e = match self.names.remove(name) {
Some(e) => e,
None => continue
};
let arg_ty = match self.name_types.find(name) {
let arg_ty = match self.name_types.get(name) {
Some(ty) => ty,
None => continue
};

2
src/libsyntax/ext/mtwt.rs
View file

@ -182,7 +182,7 @@ fn resolve_internal(id: Ident,
resolve_table: &mut ResolveTable) -> Name {
let key = (id.name, id.ctxt);
match resolve_table.find(&key) {
match resolve_table.get(&key) {
Some(&name) => return name,
None => {}
}