diff options
| author | Luqman Aden <laden@csclub.uwaterloo.ca> | 2014-06-12 06:14:15 -0400 |
|---|---|---|
| committer | Luqman Aden <me@luqman.ca> | 2014-07-09 15:51:58 -0700 |
| commit | f61472d743cd13fe0a449cf1a25ddc97f74229a5 (patch) | |
| tree | b691b214cd2bd03bdb6bff53738e461f31abe9b8 | |
| parent | 9e123c40568f5ca79a0826fe2b45933fb0d36eaf (diff) | |
| download | rust-f61472d743cd13fe0a449cf1a25ddc97f74229a5.tar.gz rust-f61472d743cd13fe0a449cf1a25ddc97f74229a5.zip | |
librustc: Remove uses of advance.
| -rw-r--r-- | src/librustc/middle/graph.rs | 4 | ||||
| -rw-r--r-- | src/librustc/middle/resolve.rs | 2 | ||||
| -rw-r--r-- | src/librustc/middle/ty.rs | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/librustc/middle/graph.rs b/src/librustc/middle/graph.rs index b1f9b0bff9f..78eeb26997d 100644 --- a/src/librustc/middle/graph.rs +++ b/src/librustc/middle/graph.rs @@ -207,12 +207,12 @@ impl<N,E> Graph<N,E> { pub fn each_node<'a>(&'a self, f: |NodeIndex, &'a Node<N>| -> bool) -> bool { //! Iterates over all edges defined in the graph. - self.nodes.iter().enumerate().advance(|(i, node)| f(NodeIndex(i), node)) + self.nodes.iter().enumerate().all(|(i, node)| f(NodeIndex(i), node)) } pub fn each_edge<'a>(&'a self, f: |EdgeIndex, &'a Edge<E>| -> bool) -> bool { //! Iterates over all edges defined in the graph - self.edges.iter().enumerate().advance(|(i, edge)| f(EdgeIndex(i), edge)) + self.edges.iter().enumerate().all(|(i, edge)| f(EdgeIndex(i), edge)) } pub fn each_outgoing_edge<'a>(&'a self, diff --git a/src/librustc/middle/resolve.rs b/src/librustc/middle/resolve.rs index 129a5b7c6be..4655507f5d1 100644 --- a/src/librustc/middle/resolve.rs +++ b/src/librustc/middle/resolve.rs @@ -5149,7 +5149,7 @@ impl<'a> Resolver<'a> { } _ => { let mut method_scope = false; - self.value_ribs.borrow().iter().rev().advance(|rib| { + self.value_ribs.borrow().iter().rev().all(|rib| { let res = match *rib { Rib { bindings: _, kind: MethodRibKind(_, _) } => true, Rib { bindings: _, kind: ItemRibKind } => false, diff --git a/src/librustc/middle/ty.rs b/src/librustc/middle/ty.rs index f9eda70d16e..eee53b79763 100644 --- a/src/librustc/middle/ty.rs +++ b/src/librustc/middle/ty.rs @@ -3887,13 +3887,13 @@ pub fn lookup_trait_def(cx: &ctxt, did: ast::DefId) -> Rc<ty::TraitDef> { pub fn each_attr(tcx: &ctxt, did: DefId, f: |&ast::Attribute| -> bool) -> bool { if is_local(did) { let item = tcx.map.expect_item(did.node); - item.attrs.iter().advance(|attr| f(attr)) + item.attrs.iter().all(|attr| f(attr)) } else { info!("getting foreign attrs"); let mut cont = true; csearch::get_item_attrs(&tcx.sess.cstore, did, |attrs| { if cont { - cont = attrs.iter().advance(|attr| f(attr)); + cont = attrs.iter().all(|attr| f(attr)); } }); info!("done"); |
