Skip to content

Commit 5f0dc0e

Browse files
committed
Auto merge of #60333 - Centril:stabilize-iterator-copied, r=varkor
Stabilize Iterator::copied in 1.36.0 Per #57127 (comment). Closes #57127. r? @varkor
2 parents 938d4ff + b71f8d4 commit 5f0dc0e

File tree

4 files changed

+9
-11
lines changed

4 files changed

+9
-11
lines changed

src/libcore/iter/adapters/mod.rs

+7-6
Original file line numberDiff line numberDiff line change
@@ -130,19 +130,20 @@ unsafe impl<I> TrustedLen for Rev<I>
130130
///
131131
/// [`copied`]: trait.Iterator.html#method.copied
132132
/// [`Iterator`]: trait.Iterator.html
133-
#[unstable(feature = "iter_copied", issue = "57127")]
133+
#[stable(feature = "iter_copied", since = "1.36.0")]
134134
#[must_use = "iterators are lazy and do nothing unless consumed"]
135135
#[derive(Clone, Debug)]
136136
pub struct Copied<I> {
137137
it: I,
138138
}
139+
139140
impl<I> Copied<I> {
140141
pub(super) fn new(it: I) -> Copied<I> {
141142
Copied { it }
142143
}
143144
}
144145

145-
#[unstable(feature = "iter_copied", issue = "57127")]
146+
#[stable(feature = "iter_copied", since = "1.36.0")]
146147
impl<'a, I, T: 'a> Iterator for Copied<I>
147148
where I: Iterator<Item=&'a T>, T: Copy
148149
{
@@ -169,7 +170,7 @@ impl<'a, I, T: 'a> Iterator for Copied<I>
169170
}
170171
}
171172

172-
#[unstable(feature = "iter_copied", issue = "57127")]
173+
#[stable(feature = "iter_copied", since = "1.36.0")]
173174
impl<'a, I, T: 'a> DoubleEndedIterator for Copied<I>
174175
where I: DoubleEndedIterator<Item=&'a T>, T: Copy
175176
{
@@ -190,7 +191,7 @@ impl<'a, I, T: 'a> DoubleEndedIterator for Copied<I>
190191
}
191192
}
192193

193-
#[unstable(feature = "iter_copied", issue = "57127")]
194+
#[stable(feature = "iter_copied", since = "1.36.0")]
194195
impl<'a, I, T: 'a> ExactSizeIterator for Copied<I>
195196
where I: ExactSizeIterator<Item=&'a T>, T: Copy
196197
{
@@ -203,7 +204,7 @@ impl<'a, I, T: 'a> ExactSizeIterator for Copied<I>
203204
}
204205
}
205206

206-
#[unstable(feature = "iter_copied", issue = "57127")]
207+
#[stable(feature = "iter_copied", since = "1.36.0")]
207208
impl<'a, I, T: 'a> FusedIterator for Copied<I>
208209
where I: FusedIterator<Item=&'a T>, T: Copy
209210
{}
@@ -222,7 +223,7 @@ unsafe impl<'a, I, T: 'a> TrustedRandomAccess for Copied<I>
222223
}
223224
}
224225

225-
#[unstable(feature = "iter_copied", issue = "57127")]
226+
#[stable(feature = "iter_copied", since = "1.36.0")]
226227
unsafe impl<'a, I, T: 'a> TrustedLen for Copied<I>
227228
where I: TrustedLen<Item=&'a T>,
228229
T: Copy

src/libcore/iter/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ pub use self::adapters::Cloned;
352352
pub use self::adapters::StepBy;
353353
#[stable(feature = "iterator_flatten", since = "1.29.0")]
354354
pub use self::adapters::Flatten;
355-
#[unstable(feature = "iter_copied", issue = "57127")]
355+
#[stable(feature = "iter_copied", since = "1.36.0")]
356356
pub use self::adapters::Copied;
357357

358358
pub(crate) use self::adapters::TrustedRandomAccess;

src/libcore/iter/traits/iterator.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -2206,8 +2206,6 @@ pub trait Iterator {
22062206
/// Basic usage:
22072207
///
22082208
/// ```
2209-
/// #![feature(iter_copied)]
2210-
///
22112209
/// let a = [1, 2, 3];
22122210
///
22132211
/// let v_cloned: Vec<_> = a.iter().copied().collect();
@@ -2218,7 +2216,7 @@ pub trait Iterator {
22182216
/// assert_eq!(v_cloned, vec![1, 2, 3]);
22192217
/// assert_eq!(v_map, vec![1, 2, 3]);
22202218
/// ```
2221-
#[unstable(feature = "iter_copied", issue = "57127")]
2219+
#[stable(feature = "iter_copied", since = "1.36.0")]
22222220
fn copied<'a, T: 'a>(self) -> Copied<Self>
22232221
where Self: Sized + Iterator<Item=&'a T>, T: Copy
22242222
{

src/libcore/tests/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
#![feature(fmt_internals)]
1111
#![feature(hashmap_internals)]
1212
#![feature(is_sorted)]
13-
#![feature(iter_copied)]
1413
#![feature(iter_nth_back)]
1514
#![feature(iter_once_with)]
1615
#![feature(pattern)]

0 commit comments

Comments
 (0)