From 6919cf5fe14701621437fcb57f3a0c38fb394c65 Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Sun, 8 Sep 2013 11:01:16 -0400 Subject: rename `std::iterator` to `std::iter` The trait will keep the `Iterator` naming, but a more concise module name makes using the free functions less verbose. The module will define iterables in addition to iterators, as it deals with iteration in general. --- src/libextra/bitv.rs | 4 ++-- src/libextra/dlist.rs | 16 ++++++++-------- src/libextra/enum_set.rs | 2 -- src/libextra/json.rs | 7 +++---- src/libextra/num/bigint.rs | 4 ++-- src/libextra/priority_queue.rs | 1 - src/libextra/ringbuf.rs | 6 +++--- src/libextra/smallintmap.rs | 2 +- src/libextra/treemap.rs | 2 +- 9 files changed, 20 insertions(+), 24 deletions(-) (limited to 'src/libextra') diff --git a/src/libextra/bitv.rs b/src/libextra/bitv.rs index 70fd3a01ca4..780527e4532 100644 --- a/src/libextra/bitv.rs +++ b/src/libextra/bitv.rs @@ -12,8 +12,8 @@ use std::cmp; -use std::iterator::RandomAccessIterator; -use std::iterator::{Invert, Enumerate, Repeat, Map, Zip}; +use std::iter::RandomAccessIterator; +use std::iter::{Invert, Enumerate, Repeat, Map, Zip}; use std::num; use std::ops; use std::uint; diff --git a/src/libextra/dlist.rs b/src/libextra/dlist.rs index 64bb17a6271..ac296ad527e 100644 --- a/src/libextra/dlist.rs +++ b/src/libextra/dlist.rs @@ -25,8 +25,8 @@ use std::cast; use std::ptr; use std::util; -use std::iterator::{FromIterator, Extendable, Invert}; -use std::iterator; +use std::iter::Invert; +use std::iter; use container::Deque; @@ -593,27 +593,27 @@ impl Extendable for DList { impl Eq for DList { fn eq(&self, other: &DList) -> bool { self.len() == other.len() && - iterator::order::eq(self.iter(), other.iter()) + iter::order::eq(self.iter(), other.iter()) } fn ne(&self, other: &DList) -> bool { self.len() != other.len() || - iterator::order::ne(self.iter(), other.iter()) + iter::order::ne(self.iter(), other.iter()) } } impl Ord for DList { fn lt(&self, other: &DList) -> bool { - iterator::order::lt(self.iter(), other.iter()) + iter::order::lt(self.iter(), other.iter()) } fn le(&self, other: &DList) -> bool { - iterator::order::le(self.iter(), other.iter()) + iter::order::le(self.iter(), other.iter()) } fn gt(&self, other: &DList) -> bool { - iterator::order::gt(self.iter(), other.iter()) + iter::order::gt(self.iter(), other.iter()) } fn ge(&self, other: &DList) -> bool { - iterator::order::ge(self.iter(), other.iter()) + iter::order::ge(self.iter(), other.iter()) } } diff --git a/src/libextra/enum_set.rs b/src/libextra/enum_set.rs index 2b1246b0af0..242faa2b4da 100644 --- a/src/libextra/enum_set.rs +++ b/src/libextra/enum_set.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use std::iterator::Iterator; - #[deriving(Clone, Eq, IterBytes, ToStr)] /// A specialized Set implementation to use enum types. pub struct EnumSet { diff --git a/src/libextra/json.rs b/src/libextra/json.rs index ee3e1966fe2..f76dc05b277 100644 --- a/src/libextra/json.rs +++ b/src/libextra/json.rs @@ -18,7 +18,6 @@ use std::char; use std::cast::transmute; -use std::iterator; use std::float; use std::hashmap::HashMap; use std::io::WriterUtil; @@ -489,7 +488,7 @@ pub struct Parser { } /// Decode a json value from an Iterator -pub fn Parser>(rdr: ~T) -> Parser { +pub fn Parser>(rdr: ~T) -> Parser { let mut p = Parser { rdr: rdr, ch: '\x00', @@ -500,7 +499,7 @@ pub fn Parser>(rdr: ~T) -> Parser { p } -impl> Parser { +impl> Parser { pub fn parse(&mut self) -> Result { match self.parse_value() { Ok(value) => { @@ -518,7 +517,7 @@ impl> Parser { } } -impl> Parser { +impl> Parser { // FIXME: #8971: unsound fn eof(&self) -> bool { self.ch == unsafe { transmute(-1u32) } } diff --git a/src/libextra/num/bigint.rs b/src/libextra/num/bigint.rs index cb764228155..2e61b7fdbdc 100644 --- a/src/libextra/num/bigint.rs +++ b/src/libextra/num/bigint.rs @@ -2011,13 +2011,13 @@ mod bigint_tests { #[cfg(test)] mod bench { use super::*; - use std::{iterator, util}; + use std::{iter, util}; use std::num::{Zero, One}; use extra::test::BenchHarness; fn factorial(n: uint) -> BigUint { let mut f: BigUint = One::one(); - for i in iterator::range_inclusive(1, n) { + for i in iter::range_inclusive(1, n) { f = f * BigUint::from_uint(i); } f diff --git a/src/libextra/priority_queue.rs b/src/libextra/priority_queue.rs index b085981aabb..6dd4759d927 100644 --- a/src/libextra/priority_queue.rs +++ b/src/libextra/priority_queue.rs @@ -16,7 +16,6 @@ use std::clone::Clone; use std::unstable::intrinsics::{move_val_init, init}; use std::util::{replace, swap}; use std::vec; -use std::iterator::{FromIterator, Extendable}; /// A priority queue implemented with a binary heap #[deriving(Clone)] diff --git a/src/libextra/ringbuf.rs b/src/libextra/ringbuf.rs index 9ae9b47e207..ea8537caeb5 100644 --- a/src/libextra/ringbuf.rs +++ b/src/libextra/ringbuf.rs @@ -15,7 +15,7 @@ use std::num; use std::vec; -use std::iterator::{FromIterator, Invert, RandomAccessIterator, Extendable}; +use std::iter::{Invert, RandomAccessIterator}; use container::Deque; @@ -694,13 +694,13 @@ mod tests { #[test] fn test_from_iterator() { - use std::iterator; + use std::iter; let v = ~[1,2,3,4,5,6,7]; let deq: RingBuf = v.iter().map(|&x| x).collect(); let u: ~[int] = deq.iter().map(|&x| x).collect(); assert_eq!(u, v); - let mut seq = iterator::count(0u, 2).take(256); + let mut seq = iter::count(0u, 2).take(256); let deq: RingBuf = seq.collect(); for (i, &x) in deq.iter().enumerate() { assert_eq!(2*i, x); diff --git a/src/libextra/smallintmap.rs b/src/libextra/smallintmap.rs index ac07fd2bebf..983247971d3 100644 --- a/src/libextra/smallintmap.rs +++ b/src/libextra/smallintmap.rs @@ -15,7 +15,7 @@ #[allow(missing_doc)]; -use std::iterator::{Iterator, Enumerate, FilterMap, Invert}; +use std::iter::{Enumerate, FilterMap, Invert}; use std::util::replace; use std::vec::{VecIterator, VecMutIterator}; use std::vec; diff --git a/src/libextra/treemap.rs b/src/libextra/treemap.rs index 307de43a067..99643e643b7 100644 --- a/src/libextra/treemap.rs +++ b/src/libextra/treemap.rs @@ -14,7 +14,7 @@ use std::util::{swap, replace}; -use std::iterator::{FromIterator, Extendable, Peekable}; +use std::iter::{Peekable}; use std::cmp::Ordering; // This is implemented as an AA tree, which is a simplified variation of -- cgit 1.4.1-3-g733a5