Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add missing Copy/Clone impls for Iterators #47304

Closed
wants to merge 1 commit into from
Closed

Add missing Copy/Clone impls for Iterators #47304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
85 changes: 66 additions & 19 deletions src/libcore/iter/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,7 @@ impl<R: Try> LoopState<R::Ok, R> {
///
/// [`rev`]: trait.Iterator.html#method.rev
/// [`Iterator`]: trait.Iterator.html
#[derive(Clone, Debug)]
#[derive(Copy, Clone, Debug)]
#[must_use = "iterator adaptors are lazy and do nothing unless consumed"]
#[stable(feature = "rust1", since = "1.0.0")]
pub struct Rev<T> {
Expand Down Expand Up @@ -506,7 +506,7 @@ unsafe impl<I> TrustedLen for Rev<I>
/// [`Iterator`]: trait.Iterator.html
#[stable(feature = "iter_cloned", since = "1.1.0")]
#[must_use = "iterator adaptors are lazy and do nothing unless consumed"]
#[derive(Clone, Debug)]
#[derive(Copy, Clone, Debug)]
pub struct Cloned<I> {
it: I,
}
Expand Down Expand Up @@ -614,7 +614,7 @@ unsafe impl<'a, I, T: 'a> TrustedLen for Cloned<I>
///
/// [`cycle`]: trait.Iterator.html#method.cycle
/// [`Iterator`]: trait.Iterator.html
#[derive(Clone, Debug)]
#[derive(Copy, Clone, Debug)]
#[must_use = "iterator adaptors are lazy and do nothing unless consumed"]
#[stable(feature = "rust1", since = "1.0.0")]
pub struct Cycle<I> {
Expand Down Expand Up @@ -659,7 +659,7 @@ impl<I> FusedIterator for Cycle<I> where I: Clone + Iterator {}
#[unstable(feature = "iterator_step_by",
reason = "unstable replacement of Range::step_by",
issue = "27741")]
#[derive(Clone, Debug)]
#[derive(Copy, Clone, Debug)]
pub struct StepBy<I> {
iter: I,
step: usize,
Expand Down Expand Up @@ -709,7 +709,7 @@ impl<I> ExactSizeIterator for StepBy<I> where I: ExactSizeIterator {}
///
/// [`chain`]: trait.Iterator.html#method.chain
/// [`Iterator`]: trait.Iterator.html
#[derive(Clone, Debug)]
#[derive(Copy, Clone, Debug)]
#[must_use = "iterator adaptors are lazy and do nothing unless consumed"]
#[stable(feature = "rust1", since = "1.0.0")]
pub struct Chain<A, B> {
Expand All @@ -731,7 +731,7 @@ pub struct Chain<A, B> {
//
// The fourth state (neither iterator is remaining) only occurs after Chain has
// returned None once, so we don't need to store this state.
#[derive(Clone, Debug)]
#[derive(Copy, Clone, Debug)]
enum ChainState {
// both front and back iterator are remaining
Both,
Expand Down Expand Up @@ -960,7 +960,7 @@ unsafe impl<A, B> TrustedLen for Chain<A, B>
///
/// [`zip`]: trait.Iterator.html#method.zip
/// [`Iterator`]: trait.Iterator.html
#[derive(Clone, Debug)]
#[derive(Copy, Clone, Debug)]
#[must_use = "iterator adaptors are lazy and do nothing unless consumed"]
#[stable(feature = "rust1", since = "1.0.0")]
pub struct Zip<A, B> {
Expand Down Expand Up @@ -1227,7 +1227,7 @@ unsafe impl<A, B> TrustedLen for Zip<A, B>
/// ```
#[must_use = "iterator adaptors are lazy and do nothing unless consumed"]
#[stable(feature = "rust1", since = "1.0.0")]
#[derive(Clone)]
#[derive(Copy, Clone)]
pub struct Map<I, F> {
iter: I,
f: F,
Expand Down Expand Up @@ -1338,7 +1338,7 @@ unsafe impl<B, I, F> TrustedRandomAccess for Map<I, F>
/// [`Iterator`]: trait.Iterator.html
#[must_use = "iterator adaptors are lazy and do nothing unless consumed"]
#[stable(feature = "rust1", since = "1.0.0")]
#[derive(Clone)]
#[derive(Copy, Clone)]
pub struct Filter<I, P> {
iter: I,
predicate: P,
Expand Down Expand Up @@ -1470,7 +1470,7 @@ impl<I: FusedIterator, P> FusedIterator for Filter<I, P>
/// [`Iterator`]: trait.Iterator.html
#[must_use = "iterator adaptors are lazy and do nothing unless consumed"]
#[stable(feature = "rust1", since = "1.0.0")]
#[derive(Clone)]
#[derive(Copy, Clone)]
pub struct FilterMap<I, F> {
iter: I,
f: F,
Expand Down Expand Up @@ -1739,7 +1739,7 @@ unsafe impl<I> TrustedLen for Enumerate<I>
///
/// [`peekable`]: trait.Iterator.html#method.peekable
/// [`Iterator`]: trait.Iterator.html
#[derive(Clone, Debug)]
#[derive(Debug)]
#[must_use = "iterator adaptors are lazy and do nothing unless consumed"]
#[stable(feature = "rust1", since = "1.0.0")]
pub struct Peekable<I: Iterator> {
Expand All @@ -1748,6 +1748,27 @@ pub struct Peekable<I: Iterator> {
peeked: Option<Option<I::Item>>,
}

#[stable(feature = "rust1", since = "1.25.0")]
impl<I> Copy for Peekable<I>
where
I: Iterator + Copy,
I::Item: Copy,
{}

#[stable(feature = "rust1", since = "1.25.0")]
impl<I> Clone for Peekable<I>
where
I: Iterator + Clone,
I::Item: Clone,
{
fn clone(&self) -> Self {
Peekable {
iter: self.iter.clone(),
peeked: self.peeked.clone(),
}
}
}

// Peekable must remember if a None has been seen in the `.peek()` method.
// It ensures that `.peek(); .peek();` or `.peek(); .next();` only advances the
// underlying iterator at most once. This does not by itself make the iterator
Expand Down Expand Up @@ -1906,7 +1927,7 @@ impl<I: Iterator> Peekable<I> {
/// [`Iterator`]: trait.Iterator.html
#[must_use = "iterator adaptors are lazy and do nothing unless consumed"]
#[stable(feature = "rust1", since = "1.0.0")]
#[derive(Clone)]
#[derive(Copy, Clone)]
pub struct SkipWhile<I, P> {
iter: I,
flag: bool,
Expand Down Expand Up @@ -1989,7 +2010,7 @@ impl<I, P> FusedIterator for SkipWhile<I, P>
/// [`Iterator`]: trait.Iterator.html
#[must_use = "iterator adaptors are lazy and do nothing unless consumed"]
#[stable(feature = "rust1", since = "1.0.0")]
#[derive(Clone)]
#[derive(Copy, Clone)]
pub struct TakeWhile<I, P> {
iter: I,
flag: bool,
Expand Down Expand Up @@ -2066,7 +2087,7 @@ impl<I, P> FusedIterator for TakeWhile<I, P>
///
/// [`skip`]: trait.Iterator.html#method.skip
/// [`Iterator`]: trait.Iterator.html
#[derive(Clone, Debug)]
#[derive(Copy, Clone, Debug)]
#[must_use = "iterator adaptors are lazy and do nothing unless consumed"]
#[stable(feature = "rust1", since = "1.0.0")]
pub struct Skip<I> {
Expand Down Expand Up @@ -2204,7 +2225,7 @@ impl<I> FusedIterator for Skip<I> where I: FusedIterator {}
///
/// [`take`]: trait.Iterator.html#method.take
/// [`Iterator`]: trait.Iterator.html
#[derive(Clone, Debug)]
#[derive(Copy, Clone, Debug)]
#[must_use = "iterator adaptors are lazy and do nothing unless consumed"]
#[stable(feature = "rust1", since = "1.0.0")]
pub struct Take<I> {
Expand Down Expand Up @@ -2287,7 +2308,7 @@ impl<I> FusedIterator for Take<I> where I: FusedIterator {}
/// [`Iterator`]: trait.Iterator.html
#[must_use = "iterator adaptors are lazy and do nothing unless consumed"]
#[stable(feature = "rust1", since = "1.0.0")]
#[derive(Clone)]
#[derive(Copy, Clone)]
pub struct Scan<I, St, F> {
iter: I,
f: F,
Expand Down Expand Up @@ -2347,14 +2368,40 @@ impl<B, I, St, F> Iterator for Scan<I, St, F> where
/// [`Iterator`]: trait.Iterator.html
#[must_use = "iterator adaptors are lazy and do nothing unless consumed"]
#[stable(feature = "rust1", since = "1.0.0")]
#[derive(Clone)]
pub struct FlatMap<I, U: IntoIterator, F> {
iter: I,
f: F,
frontiter: Option<U::IntoIter>,
backiter: Option<U::IntoIter>,
}

#[stable(feature = "rust1", since = "1.25.0")]
impl<I, U, F> Copy for FlatMap<I, U, F>
where
I: Copy,
F: Copy,
U: IntoIterator,
U::IntoIter: Copy,
{}

#[stable(feature = "rust1", since = "1.25.0")]
impl<I, U, F> Clone for FlatMap<I, U, F>
where
I: Clone,
F: Clone,
U: IntoIterator,
U::IntoIter: Clone,
{
fn clone(&self) -> Self {
FlatMap {
iter: self.iter.clone(),
f: self.f.clone(),
frontiter: self.frontiter.clone(),
backiter: self.backiter.clone(),
}
}
}

#[stable(feature = "core_impl_debug", since = "1.9.0")]
impl<I: fmt::Debug, U: IntoIterator, F> fmt::Debug for FlatMap<I, U, F>
where U::IntoIter: fmt::Debug
Expand Down Expand Up @@ -2513,7 +2560,7 @@ impl<I, U, F> FusedIterator for FlatMap<I, U, F>
///
/// [`fuse`]: trait.Iterator.html#method.fuse
/// [`Iterator`]: trait.Iterator.html
#[derive(Clone, Debug)]
#[derive(Copy, Clone, Debug)]
#[must_use = "iterator adaptors are lazy and do nothing unless consumed"]
#[stable(feature = "rust1", since = "1.0.0")]
pub struct Fuse<I> {
Expand Down Expand Up @@ -2740,7 +2787,7 @@ impl<I> ExactSizeIterator for Fuse<I> where I: ExactSizeIterator {
/// [`Iterator`]: trait.Iterator.html
#[must_use = "iterator adaptors are lazy and do nothing unless consumed"]
#[stable(feature = "rust1", since = "1.0.0")]
#[derive(Clone)]
#[derive(Copy, Clone)]
pub struct Inspect<I, F> {
iter: I,
f: F,
Expand Down
7 changes: 5 additions & 2 deletions src/libcore/iter/sources.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ use super::{FusedIterator, TrustedLen};
/// This `struct` is created by the [`repeat`] function. See its documentation for more.
///
/// [`repeat`]: fn.repeat.html
#[derive(Clone, Debug)]
#[derive(Copy, Clone, Debug)]
#[stable(feature = "rust1", since = "1.0.0")]
pub struct Repeat<A> {
element: A
Expand Down Expand Up @@ -144,6 +144,9 @@ unsafe impl<T> TrustedLen for Empty<T> {}
#[unstable(feature = "fused", issue = "35602")]
impl<T> FusedIterator for Empty<T> {}

#[stable(feature = "iter_empty", since = "1.25.0")]
impl<T> Copy for Empty<T> {}

// not #[derive] because that adds a Clone bound on T,
// which isn't necessary.
#[stable(feature = "iter_empty", since = "1.2.0")]
Expand Down Expand Up @@ -186,7 +189,7 @@ pub fn empty<T>() -> Empty<T> {
/// This `struct` is created by the [`once`] function. See its documentation for more.
///
/// [`once`]: fn.once.html
#[derive(Clone, Debug)]
#[derive(Copy, Clone, Debug)]
#[stable(feature = "iter_once", since = "1.2.0")]
pub struct Once<T> {
inner: ::option::IntoIter<T>
Expand Down
7 changes: 5 additions & 2 deletions src/libcore/option.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -960,7 +960,7 @@ impl<T> From<T> for Option<T> {
// The Option Iterators
/////////////////////////////////////////////////////////////////////////////

#[derive(Clone, Debug)]
#[derive(Copy, Clone, Debug)]
struct Item<A> {
opt: Option<A>
}
Expand Down Expand Up @@ -1031,6 +1031,9 @@ impl<'a, A> FusedIterator for Iter<'a, A> {}
#[unstable(feature = "trusted_len", issue = "37572")]
unsafe impl<'a, A> TrustedLen for Iter<'a, A> {}

#[stable(feature = "rust1", since = "1.25.0")]
impl<'a, A> Copy for Iter<'a, A> {}

#[stable(feature = "rust1", since = "1.0.0")]
impl<'a, A> Clone for Iter<'a, A> {
fn clone(&self) -> Iter<'a, A> {
Expand Down Expand Up @@ -1084,7 +1087,7 @@ unsafe impl<'a, A> TrustedLen for IterMut<'a, A> {}
/// [`Option`]: enum.Option.html
/// [`Some`]: enum.Option.html#variant.Some
/// [`Option::into_iter`]: enum.Option.html#method.into_iter
#[derive(Clone, Debug)]
#[derive(Copy, Clone, Debug)]
#[stable(feature = "rust1", since = "1.0.0")]
pub struct IntoIter<A> { inner: Item<A> }

Expand Down