Skip to content

Commit 9e123c4

Browse files
committed
libsyntax: Remove uses of advance.
1 parent bb9552e commit 9e123c4

File tree

2 files changed

+6
-21
lines changed

2 files changed

+6
-21
lines changed

src/libsyntax/abi.rs

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -87,24 +87,9 @@ static AbiDatas: &'static [AbiData] = &[
8787
AbiData {abi: RustIntrinsic, name: "rust-intrinsic", abi_arch: RustArch},
8888
];
8989

90-
/// Iterates through each of the defined ABIs.
91-
fn each_abi(op: |abi: Abi| -> bool) -> bool {
92-
AbiDatas.iter().advance(|abi_data| op(abi_data.abi))
93-
}
94-
9590
/// Returns the ABI with the given name (if any).
9691
pub fn lookup(name: &str) -> Option<Abi> {
97-
let mut res = None;
98-
99-
each_abi(|abi| {
100-
if name == abi.data().name {
101-
res = Some(abi);
102-
false
103-
} else {
104-
true
105-
}
106-
});
107-
res
92+
AbiDatas.iter().find(|abi_data| name == abi_data.name).map(|&x| x.abi)
10893
}
10994

11095
pub fn all_names() -> Vec<&'static str> {

src/libsyntax/ast_util.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -611,18 +611,18 @@ pub fn walk_pat(pat: &Pat, it: |&Pat| -> bool) -> bool {
611611
match pat.node {
612612
PatIdent(_, _, Some(ref p)) => walk_pat(&**p, it),
613613
PatStruct(_, ref fields, _) => {
614-
fields.iter().advance(|f| walk_pat(&*f.pat, |p| it(p)))
614+
fields.iter().all(|field| walk_pat(&*field.pat, |p| it(p)))
615615
}
616616
PatEnum(_, Some(ref s)) | PatTup(ref s) => {
617-
s.iter().advance(|p| walk_pat(&**p, |p| it(p)))
617+
s.iter().all(|p| walk_pat(&**p, |p| it(p)))
618618
}
619619
PatBox(ref s) | PatRegion(ref s) => {
620620
walk_pat(&**s, it)
621621
}
622622
PatVec(ref before, ref slice, ref after) => {
623-
before.iter().advance(|p| walk_pat(&**p, |p| it(p))) &&
624-
slice.iter().advance(|p| walk_pat(&**p, |p| it(p))) &&
625-
after.iter().advance(|p| walk_pat(&**p, |p| it(p)))
623+
before.iter().all(|p| walk_pat(&**p, |p| it(p))) &&
624+
slice.iter().all(|p| walk_pat(&**p, |p| it(p))) &&
625+
after.iter().all(|p| walk_pat(&**p, |p| it(p)))
626626
}
627627
PatMac(_) => fail!("attempted to analyze unexpanded pattern"),
628628
PatWild | PatWildMulti | PatLit(_) | PatRange(_, _) | PatIdent(_, _, _) |

0 commit comments

Comments
 (0)