diff options
| author | bors <bors@rust-lang.org> | 2013-06-08 02:28:15 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-06-08 02:28:15 -0700 |
| commit | e2ec8e71cec0373616953f8188cf7c4953269af0 (patch) | |
| tree | f55e88533a533024f4386572901ca09fdc2675fb /src/libstd | |
| parent | 8db1d2cdde6fafdd396d2ce5c5994492d5bcf8cb (diff) | |
| parent | d27ba09245f4a6415ff077a815f9e9eb1f1d0a4d (diff) | |
| download | rust-e2ec8e71cec0373616953f8188cf7c4953269af0.tar.gz rust-e2ec8e71cec0373616953f8188cf7c4953269af0.zip | |
auto merge of #7008 : thestinger/rust/iterator, r=catamorphism
The `IteratorUtil` trait hits a bug in method resolve, but the basic trait has no issue.
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/prelude.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/libstd/prelude.rs b/src/libstd/prelude.rs index 89992003026..476aef37093 100644 --- a/src/libstd/prelude.rs +++ b/src/libstd/prelude.rs @@ -51,6 +51,7 @@ pub use old_iter::{CopyableIter, CopyableOrderedIter, CopyableNonstrictIter}; pub use old_iter::{ExtendedMutableIter}; pub use iter::{Times, FromIter}; // FIXME: #5898 pub use iterator::{Iterator, IteratorUtil}; +pub use iterator::Iterator; pub use num::{Num, NumCast}; pub use num::{Orderable, Signed, Unsigned, Round}; pub use num::{Algebraic, Trigonometric, Exponential, Hyperbolic}; |