about summary refs log tree commit diff
path: root/src/libcollections
diff options
context:
space:
mode:
authorMark Simulacrum <mark.simulacrum@gmail.com>2017-06-02 09:10:42 -0600
committerGitHub <noreply@github.com>2017-06-02 09:10:42 -0600
commit1316281f2d9ee2ae0aa635741a418e32b59dcc26 (patch)
tree82b5454721067116b37ab84f229f66604b56940c /src/libcollections
parent551dd7c7a2ae1fa94eff953fd418b5bc664eb9a7 (diff)
parent15dff84dc3a640be4b6e49f45614c7d1806c8f56 (diff)
Rollup merge of #42310 - scottmcm:deprecate-range-stepby, r=alexcrichton
Deprecate range-specific `step_by`

Deprecation attributes and test updates only.

Was replaced by an any-iterator version in https://github.com/rust-lang/rust/pull/41439

Last follow-up (this release) to https://github.com/rust-lang/rust/pull/42110#issuecomment-303210138

r? @alexcrichton
Diffstat (limited to 'src/libcollections')
-rw-r--r--src/libcollections/tests/lib.rs2
-rw-r--r--src/libcollections/tests/vec_deque.rs3
2 files changed, 3 insertions, 2 deletions
diff --git a/src/libcollections/tests/lib.rs b/src/libcollections/tests/lib.rs
index 6ad5781c5d5..8af8786994e 100644
--- a/src/libcollections/tests/lib.rs
+++ b/src/libcollections/tests/lib.rs
@@ -16,12 +16,12 @@
 #![feature(collections)]
 #![feature(const_fn)]
 #![feature(exact_size_is_empty)]
+#![feature(iterator_step_by)]
 #![feature(pattern)]
 #![feature(placement_in_syntax)]
 #![feature(rand)]
 #![feature(slice_rotate)]
 #![feature(splice)]
-#![feature(step_by)]
 #![feature(str_escape)]
 #![feature(test)]
 #![feature(unboxed_closures)]
diff --git a/src/libcollections/tests/vec_deque.rs b/src/libcollections/tests/vec_deque.rs
index f2935c05d4f..a992351653d 100644
--- a/src/libcollections/tests/vec_deque.rs
+++ b/src/libcollections/tests/vec_deque.rs
@@ -510,7 +510,8 @@ fn test_from_iter() {
     let u: Vec<_> = deq.iter().cloned().collect();
     assert_eq!(u, v);
 
-    let seq = (0..).step_by(2).take(256);
+    // FIXME #27741: Remove `.skip(0)` when Range::step_by is fully removed
+    let seq = (0..).skip(0).step_by(2).take(256);
     let deq: VecDeque<_> = seq.collect();
     for (i, &x) in deq.iter().enumerate() {
         assert_eq!(2 * i, x);