diff --git a/src/etc/vim/syntax/rust.vim b/src/etc/vim/syntax/rust.vim index aa0549a861c89010fc54270bc11b9de3f8ba52cb..88e4189a7598bf73642a96dbe2cc30d408fa5b61 100644 --- a/src/etc/vim/syntax/rust.vim +++ b/src/etc/vim/syntax/rust.vim @@ -78,7 +78,7 @@ syn keyword rustTrait Default syn keyword rustTrait Hash syn keyword rustTrait FromStr syn keyword rustTrait FromIterator Extendable -syn keyword rustTrait Iterator DoubleEndedIterator RandomAccessIterator ClonableIterator +syn keyword rustTrait Iterator DoubleEndedIterator RandomAccessIterator CloneableIterator syn keyword rustTrait OrdIterator MutableDoubleEndedIterator ExactSize syn keyword rustTrait Times diff --git a/src/libstd/iter.rs b/src/libstd/iter.rs index 5ace24dbbee108ea6273bcee01462180627c9d1e..ee43435dab7c754f239c84cfada559d8ec4180dd 100644 --- a/src/libstd/iter.rs +++ b/src/libstd/iter.rs @@ -906,14 +906,14 @@ fn min(&mut self) -> Option { } } -/// A trait for iterators that are clonable. -pub trait ClonableIterator { +/// A trait for iterators that are cloneable. +pub trait CloneableIterator { /// Repeats an iterator endlessly /// /// # Example /// /// ```rust - /// use std::iter::{ClonableIterator, count}; + /// use std::iter::{CloneableIterator, count}; /// /// let a = count(1,1).take(1); /// let mut cy = a.cycle(); @@ -923,7 +923,7 @@ pub trait ClonableIterator { fn cycle(self) -> Cycle; } -impl> ClonableIterator for T { +impl> CloneableIterator for T { #[inline] fn cycle(self) -> Cycle { Cycle{orig: self.clone(), iter: self} diff --git a/src/libstd/prelude.rs b/src/libstd/prelude.rs index 583e87370bc72f11a46f441328ca4f209127fb36..f59264254ad9746d4e1f1039d9bb8719560741fa 100644 --- a/src/libstd/prelude.rs +++ b/src/libstd/prelude.rs @@ -55,7 +55,7 @@ pub use from_str::FromStr; pub use hash::Hash; pub use iter::{FromIterator, Extendable}; -pub use iter::{Iterator, DoubleEndedIterator, RandomAccessIterator, ClonableIterator}; +pub use iter::{Iterator, DoubleEndedIterator, RandomAccessIterator, CloneableIterator}; pub use iter::{OrdIterator, MutableDoubleEndedIterator, ExactSize}; pub use num::Times; pub use num::{Algebraic, Trigonometric, Exponential, Hyperbolic};