diff --git a/src/libstd/iter.rs b/src/libstd/iter.rs deleted file mode 100644 index ce528bc95225584a9b2bc1f4cdf27e93d0015c69..0000000000000000000000000000000000000000 --- a/src/libstd/iter.rs +++ /dev/null @@ -1,26 +0,0 @@ -// Copyright 2012-2013 The Rust Project Developers. See the COPYRIGHT -// file at the top-level directory of this distribution and at -// http://rust-lang.org/COPYRIGHT. -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - -/*! Times trait - -~~~ {.rust} -use iter::Times; -let ten = 10 as uint; -let mut accum = 0; -do ten.times { accum += 1; } -~~~ - -*/ - -#[allow(missing_doc)] -pub trait Times { - fn times(&self, it: &fn()); -} - diff --git a/src/libstd/num/num.rs b/src/libstd/num/num.rs index 80ab0caac670ccdc911cabd92b808d8ad6da32ad..3cb110d84643b11487ea30697be6e3f2f0aadf95 100644 --- a/src/libstd/num/num.rs +++ b/src/libstd/num/num.rs @@ -80,6 +80,19 @@ pub trait Signed: Num pub trait Unsigned: Num {} +/// Times trait +/// +/// ~~~ {.rust} +/// use num::Times; +/// let ten = 10 as uint; +/// let mut accum = 0; +/// do ten.times { accum += 1; } +/// ~~~ +/// +pub trait Times { + fn times(&self, it: &fn()); +} + pub trait Integer: Num + Orderable + Div diff --git a/src/libstd/num/uint.rs b/src/libstd/num/uint.rs index 86bc98e53fcb6605cca989137c733653f47326df..e23bdc576d36f4ffa62afad7c7f8b93dd55c0995 100644 --- a/src/libstd/num/uint.rs +++ b/src/libstd/num/uint.rs @@ -10,7 +10,7 @@ //! Operations and constants for `uint` -use iter; +use num; use sys; pub use self::generated::*; @@ -70,7 +70,7 @@ pub fn div_round(x: uint, y: uint) -> uint { /// pub fn div_floor(x: uint, y: uint) -> uint { return x / y; } -impl iter::Times for uint { +impl num::Times for uint { #[inline] /// /// A convenience form for basic repetition. Given a uint `x`, @@ -162,7 +162,7 @@ fn test_div() { #[test] pub fn test_times() { - use iter::Times; + use num::Times; let ten = 10 as uint; let mut accum = 0; do ten.times { accum += 1; } diff --git a/src/libstd/prelude.rs b/src/libstd/prelude.rs index bfe5b498f8f1327e2edbb455bbb9f2f852e9767a..24b3dc20260b1f96edf24eb135238bc0610e9d9b 100644 --- a/src/libstd/prelude.rs +++ b/src/libstd/prelude.rs @@ -49,7 +49,7 @@ pub use char::Char; pub use container::{Container, Mutable, Map, MutableMap, Set, MutableSet}; pub use hash::Hash; -pub use iter::Times; +pub use num::Times; pub use iterator::{FromIterator, Extendable}; pub use iterator::{Iterator, DoubleEndedIterator, RandomAccessIterator, ClonableIterator}; pub use iterator::{OrdIterator, MutableDoubleEndedIterator}; diff --git a/src/libstd/rt/comm.rs b/src/libstd/rt/comm.rs index 4b1881409f44f54e35f002342ee9bf23350e5411..4f5f26513b4c6fcf558cd52ab22bbac382a7f2d3 100644 --- a/src/libstd/rt/comm.rs +++ b/src/libstd/rt/comm.rs @@ -718,7 +718,7 @@ mod test { use option::*; use rt::test::*; use cell::Cell; - use iter::Times; + use num::Times; use rt::util; #[test] diff --git a/src/libstd/rt/sched.rs b/src/libstd/rt/sched.rs index b393832871dd7dae2074f028d5fafea4c8fa612c..6aa66a6ab6bcd886d00b23aed6093c2e7e0d221a 100644 --- a/src/libstd/rt/sched.rs +++ b/src/libstd/rt/sched.rs @@ -1114,7 +1114,7 @@ fn no_missed_messages() { #[test] fn multithreading() { use rt::comm::*; - use iter::Times; + use num::Times; use vec::OwnedVector; use container::Container; diff --git a/src/libstd/select.rs b/src/libstd/select.rs index f121158d4c525cfe02254028531fb6bb0815bd9b..d0afeb4be85610d834fdfc51bb7553ccba782230 100644 --- a/src/libstd/select.rs +++ b/src/libstd/select.rs @@ -126,7 +126,7 @@ pub fn select2, TB, B: SelectPort>(mut a: A, mut b: B) mod test { use super::*; use clone::Clone; - use iter::Times; + use num::Times; use option::*; use rt::comm::*; use rt::test::*; diff --git a/src/libstd/std.rs b/src/libstd/std.rs index ad3e4368daa5298c3e4f07e3b9a7c9316d0810ac..0d754323727c088500ea142860052157e9868297 100644 --- a/src/libstd/std.rs +++ b/src/libstd/std.rs @@ -140,7 +140,6 @@ pub mod linkhack { pub mod from_str; #[path = "num/num.rs"] pub mod num; -pub mod iter; pub mod iterator; pub mod to_str; pub mod to_bytes; @@ -220,4 +219,3 @@ mod std { pub use fmt; pub use to_bytes; } - diff --git a/src/libstd/str.rs b/src/libstd/str.rs index e6cadd04a5b6ea9eb82068df94d20f53336fccd8..b24d48e93b5e7d4b3e4ec901beacfbd2efb0fcc4 100644 --- a/src/libstd/str.rs +++ b/src/libstd/str.rs @@ -21,7 +21,7 @@ use char::Char; use clone::{Clone, DeepClone}; use container::{Container, Mutable}; -use iter::Times; +use num::Times; use iterator::{Iterator, FromIterator, Extendable}; use iterator::{Filter, AdditiveIterator, Map}; use iterator::{Invert, DoubleEndedIterator};