From 8872ec37600114e3e1a07c18443a119788bbb052 Mon Sep 17 00:00:00 2001
From: Jon Gjengset <jon@thesquareplanet.com>
Date: Mon, 6 Jul 2020 11:52:20 -0400
Subject: [PATCH] fixups

---
 src/liballoc/collections/vec_deque.rs       | 6 +++++-
 src/liballoc/collections/vec_deque/tests.rs | 6 +++---
 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 08ab6a69ce85c..4efa7ef6f5e9d 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 4473ce8719e13..e5edfe02a525f 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 79bfd57a00fa9..2ec777ac85c66 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)]