Skip to content

Commit 72e17b8

Browse files
committed
Stabilize Iterator::step_by
Fixes rust-lang#27741
1 parent 4ecf12b commit 72e17b8

File tree

6 files changed

+4
-18
lines changed

6 files changed

+4
-18
lines changed

src/liballoc/tests/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
#![feature(const_fn)]
1616
#![feature(drain_filter)]
1717
#![feature(exact_size_is_empty)]
18-
#![feature(iterator_step_by)]
1918
#![feature(pattern)]
2019
#![feature(rand)]
2120
#![feature(slice_sort_by_cached_key)]

src/libcore/iter/iterator.rs

+1-4
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,6 @@ pub trait Iterator {
283283
/// Basic usage:
284284
///
285285
/// ```
286-
/// #![feature(iterator_step_by)]
287286
/// let a = [0, 1, 2, 3, 4, 5];
288287
/// let mut iter = a.into_iter().step_by(2);
289288
///
@@ -293,9 +292,7 @@ pub trait Iterator {
293292
/// assert_eq!(iter.next(), None);
294293
/// ```
295294
#[inline]
296-
#[unstable(feature = "iterator_step_by",
297-
reason = "unstable replacement of Range::step_by",
298-
issue = "27741")]
295+
#[stable(feature = "iterator_step_by", since = "1.28.0")]
299296
fn step_by(self, step: usize) -> StepBy<Self> where Self: Sized {
300297
assert!(step != 0);
301298
StepBy{iter: self, step: step - 1, first_take: true}

src/libcore/iter/mod.rs

+3-9
Original file line numberDiff line numberDiff line change
@@ -673,19 +673,15 @@ impl<I> FusedIterator for Cycle<I> where I: Clone + Iterator {}
673673
/// [`step_by`]: trait.Iterator.html#method.step_by
674674
/// [`Iterator`]: trait.Iterator.html
675675
#[must_use = "iterator adaptors are lazy and do nothing unless consumed"]
676-
#[unstable(feature = "iterator_step_by",
677-
reason = "unstable replacement of Range::step_by",
678-
issue = "27741")]
676+
#[stable(feature = "iterator_step_by", since = "1.28.0")]
679677
#[derive(Clone, Debug)]
680678
pub struct StepBy<I> {
681679
iter: I,
682680
step: usize,
683681
first_take: bool,
684682
}
685683

686-
#[unstable(feature = "iterator_step_by",
687-
reason = "unstable replacement of Range::step_by",
688-
issue = "27741")]
684+
#[stable(feature = "iterator_step_by", since = "1.28.0")]
689685
impl<I> Iterator for StepBy<I> where I: Iterator {
690686
type Item = I::Item;
691687

@@ -757,9 +753,7 @@ impl<I> Iterator for StepBy<I> where I: Iterator {
757753
}
758754

759755
// StepBy can only make the iterator shorter, so the len will still fit.
760-
#[unstable(feature = "iterator_step_by",
761-
reason = "unstable replacement of Range::step_by",
762-
issue = "27741")]
756+
#[stable(feature = "iterator_step_by", since = "1.28.0")]
763757
impl<I> ExactSizeIterator for StepBy<I> where I: ExactSizeIterator {}
764758

765759
/// An iterator that strings two iterators together.

src/libcore/tests/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
#![feature(flt2dec)]
2424
#![feature(fmt_internals)]
2525
#![feature(hashmap_internals)]
26-
#![feature(iterator_step_by)]
2726
#![feature(iterator_flatten)]
2827
#![feature(iterator_repeat_with)]
2928
#![feature(pattern)]

src/test/run-pass/range_inclusive.rs

-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010

1111
// Test inclusive range syntax.
1212

13-
#![feature(iterator_step_by)]
14-
1513
use std::ops::{RangeInclusive, RangeToInclusive};
1614

1715
fn foo() -> isize { 42 }

src/test/run-pass/sync-send-iterators-in-libcore.rs

-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
#![feature(iter_empty)]
1515
#![feature(iter_once)]
1616
#![feature(iter_unfold)]
17-
#![feature(iterator_step_by)]
1817
#![feature(str_escape)]
1918

2019
use std::iter::{empty, once, repeat};

0 commit comments

Comments
 (0)