std: Fix for-range loops that can use iterators
Fix inappropriate for-range loops to use for-iterator constructs (or other appropriate solution) instead.
This commit is contained in:
parent
026c1ae311
commit
40bdbf0f5d
8 changed files with 31 additions and 44 deletions
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
use clone::Clone;
|
||||
use container::Container;
|
||||
use iterator::{Iterator, range};
|
||||
use iterator::Iterator;
|
||||
use option::{Option, Some, None};
|
||||
use sys;
|
||||
use unstable::raw::Repr;
|
||||
|
|
@ -92,8 +92,8 @@ pub fn append<T:Clone>(lhs: @[T], rhs: &[T]) -> @[T] {
|
|||
for x in lhs.iter() {
|
||||
push((*x).clone());
|
||||
}
|
||||
for i in range(0u, rhs.len()) {
|
||||
push(rhs[i].clone());
|
||||
for elt in rhs.iter() {
|
||||
push(elt.clone());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ use container::{Container, Mutable, Map, MutableMap, Set, MutableSet};
|
|||
use clone::Clone;
|
||||
use cmp::{Eq, Equiv};
|
||||
use hash::Hash;
|
||||
use iterator::{Iterator, IteratorUtil, FromIterator, Extendable, range};
|
||||
use iterator::{Iterator, IteratorUtil, FromIterator, Extendable};
|
||||
use iterator::{FilterMap, Chain, Repeat, Zip};
|
||||
use num;
|
||||
use option::{None, Option, Some};
|
||||
|
|
@ -265,8 +265,8 @@ impl<K:Hash + Eq,V> Container for HashMap<K, V> {
|
|||
impl<K:Hash + Eq,V> Mutable for HashMap<K, V> {
|
||||
/// Clear the map, removing all key-value pairs.
|
||||
fn clear(&mut self) {
|
||||
for idx in range(0u, self.buckets.len()) {
|
||||
self.buckets[idx] = None;
|
||||
for bkt in self.buckets.mut_iter() {
|
||||
*bkt = None;
|
||||
}
|
||||
self.size = 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -271,8 +271,8 @@ impl<T> TrieNode<T> {
|
|||
|
||||
impl<T> TrieNode<T> {
|
||||
fn each<'a>(&'a self, f: &fn(&uint, &'a T) -> bool) -> bool {
|
||||
for idx in range(0u, self.children.len()) {
|
||||
match self.children[idx] {
|
||||
for elt in self.children.iter() {
|
||||
match *elt {
|
||||
Internal(ref x) => if !x.each(|i,t| f(i,t)) { return false },
|
||||
External(k, ref v) => if !f(&k, v) { return false },
|
||||
Nothing => ()
|
||||
|
|
|
|||
|
|
@ -1602,8 +1602,8 @@ impl<T:Clone> OwnedCopyableVector<T> for ~[T] {
|
|||
let new_len = self.len() + rhs.len();
|
||||
self.reserve(new_len);
|
||||
|
||||
for i in range(0u, rhs.len()) {
|
||||
self.push(unsafe { raw::get(rhs, i) })
|
||||
for elt in rhs.iter() {
|
||||
self.push((*elt).clone())
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue