Move core::iter iterator.rs to traits module

src/libcore/iter/mod.rs

@@ -309,7 +309,7 @@
 use ops::Try;
 
 #[stable(feature = "rust1", since = "1.0.0")]
-pub use self::iterator::Iterator;
+pub use self::traits::Iterator;
 
 #[unstable(feature = "step_trait",
            reason = "likely to be replaced by finer-grained traits",
@@ -355,7 +355,6 @@
 
 use self::adapters::{flatten_compat, ChainState, ZipImpl};
 
-mod iterator;
 mod range;
 mod sources;
 mod traits;

src/libcore/iter/traits/iterator.rs

@@ -1,12 +1,12 @@
 use cmp::Ordering;
 use ops::Try;
 
-use super::LoopState;
-use super::{Chain, Cycle, Copied, Cloned, Enumerate, Filter, FilterMap, Fuse};
-use super::{Flatten, FlatMap, flatten_compat};
-use super::{Inspect, Map, Peekable, Scan, Skip, SkipWhile, StepBy, Take, TakeWhile, Rev};
-use super::{Zip, Sum, Product};
-use super::{ChainState, FromIterator, ZipImpl};
+use super::super::LoopState;
+use super::super::{Chain, Cycle, Copied, Cloned, Enumerate, Filter, FilterMap, Fuse};
+use super::super::{Flatten, FlatMap, flatten_compat};
+use super::super::{Inspect, Map, Peekable, Scan, Skip, SkipWhile, StepBy, Take, TakeWhile, Rev};
+use super::super::{Zip, Sum, Product};
+use super::super::{ChainState, FromIterator, ZipImpl};
 
 fn _assert_is_object_safe(_: &dyn Iterator<Item=()>) {}
 

src/libcore/iter/traits/mod.rs

@@ -3,6 +3,10 @@
 
 use super::LoopState;
 
+mod iterator;
+
+pub use self::iterator::Iterator;
+
 /// Conversion from an `Iterator`.
 ///
 /// By implementing `FromIterator` for a type, you define how it will be