diff options
| author | Jon Gjengset <jon@thesquareplanet.com> | 2020-07-06 11:52:20 -0400 |
|---|---|---|
| committer | Jon Gjengset <jon@thesquareplanet.com> | 2020-07-06 11:52:20 -0400 |
| commit | 8872ec37600114e3e1a07c18443a119788bbb052 (patch) | |
| tree | 282fc980619c7714d632ff349327ce26ac20c40a | |
| parent | 7fb26938b1b88d9f3c0d3046712375e48aeb91ae (diff) | |
| download | rust-8872ec37600114e3e1a07c18443a119788bbb052.tar.gz rust-8872ec37600114e3e1a07c18443a119788bbb052.zip | |
fixups
| -rw-r--r-- | src/liballoc/collections/vec_deque.rs | 6 | ||||
| -rw-r--r-- | src/liballoc/collections/vec_deque/tests.rs | 6 | ||||
| -rw-r--r-- | src/liballoc/lib.rs | 1 |
3 files changed, 9 insertions, 4 deletions
diff --git a/src/liballoc/collections/vec_deque.rs b/src/liballoc/collections/vec_deque.rs index 08ab6a69ce8..4efa7ef6f5e 100644 --- a/src/liballoc/collections/vec_deque.rs +++ b/src/liballoc/collections/vec_deque.rs @@ -1114,10 +1114,12 @@ impl<T> VecDeque<T> { /// # Examples /// /// ``` + /// #![feature(deque_range)] + /// /// use std::collections::VecDeque; /// /// let v: VecDeque<_> = vec![1, 2, 3].into_iter().collect(); - /// let range = v.iter_rage(2..).copied().collect::<VecDeque<_>>(); + /// let range = v.range(2..).copied().collect::<VecDeque<_>>(); /// assert_eq!(range, [3]); /// /// // A full range covers all contents @@ -1151,6 +1153,8 @@ impl<T> VecDeque<T> { /// # Examples /// /// ``` + /// #![feature(deque_range)] + /// /// use std::collections::VecDeque; /// /// let mut v: VecDeque<_> = vec![1, 2, 3].into_iter().collect(); diff --git a/src/liballoc/collections/vec_deque/tests.rs b/src/liballoc/collections/vec_deque/tests.rs index 4473ce8719e..e5edfe02a52 100644 --- a/src/liballoc/collections/vec_deque/tests.rs +++ b/src/liballoc/collections/vec_deque/tests.rs @@ -254,7 +254,7 @@ fn test_range() { for len in 0..=cap { for tail in 0..=cap { for start in 0..=len { - for end in drain_start..=len { + for end in start..=len { tester.tail = tail; tester.head = tail; for i in 0..len { @@ -279,7 +279,7 @@ fn test_range_mut() { for len in 0..=cap { for tail in 0..=cap { for start in 0..=len { - for end in drain_start..=len { + for end in start..=len { tester.tail = tail; tester.head = tail; for i in 0..len { @@ -290,7 +290,7 @@ fn test_range_mut() { let tail_was = tester.tail; // Check that we iterate over the correct values - let range: VecDeque<_> = tester.range_mut(start..end).copied().collect(); + let range: VecDeque<_> = tester.range_mut(start..end).map(|v| *v).collect(); let expected: VecDeque<_> = (start..end).collect(); assert_eq!(range, expected); diff --git a/src/liballoc/lib.rs b/src/liballoc/lib.rs index 79bfd57a00f..2ec777ac85c 100644 --- a/src/liballoc/lib.rs +++ b/src/liballoc/lib.rs @@ -89,6 +89,7 @@ #![feature(const_in_array_repeat_expressions)] #![cfg_attr(bootstrap, feature(const_if_match))] #![feature(cow_is_borrowed)] +#![feature(deque_range)] #![feature(dispatch_from_dyn)] #![feature(core_intrinsics)] #![feature(container_error_extra)] |