CoAlloc: Added CO_ALLOC_PREF to two Guard structs inside vec_deque::into_iter. Tidy.

Author: peter-lyons-kehl

library/alloc/src/collections/binary_heap/tests.rs

@@ -1,7 +1,7 @@
 use super::*;
 use crate::boxed::Box;
-use crate::{CO_ALLOC_PREF_META_YES, CO_ALLOC_PREF_META_NO};
 use crate::testing::crash_test::{CrashTestDummy, Panic};
+use crate::{CO_ALLOC_PREF_META_NO, CO_ALLOC_PREF_META_YES};
 use core::mem;
 use std::iter::TrustedLen;
 use std::panic::{catch_unwind, AssertUnwindSafe};
@@ -449,10 +449,14 @@ fn test_extend_specialization() {
 
 #[allow(dead_code)]
 fn assert_covariance() {
-    fn drain<'new>(d: Drain<'static, &'static str, {CO_ALLOC_PREF_META_NO!()}>) -> Drain<'new, &'new str, {CO_ALLOC_PREF_META_NO!()}> {
+    fn drain<'new>(
+        d: Drain<'static, &'static str, { CO_ALLOC_PREF_META_NO!() }>,
+    ) -> Drain<'new, &'new str, { CO_ALLOC_PREF_META_NO!() }> {
         d
     }
-    fn drain_co<'new>(d: Drain<'static, &'static str, {CO_ALLOC_PREF_META_YES!()}>) -> Drain<'new, &'new str, {CO_ALLOC_PREF_META_YES!()}> {
+    fn drain_co<'new>(
+        d: Drain<'static, &'static str, { CO_ALLOC_PREF_META_YES!() }>,
+    ) -> Drain<'new, &'new str, { CO_ALLOC_PREF_META_YES!() }> {
         d
     }
 }

library/alloc/src/collections/vec_deque/into_iter.rs

@@ -1,6 +1,6 @@
-use core::iter::{FusedIterator, TrustedLen};
-use core::{alloc, array, fmt, mem::MaybeUninit, ops::Try, ptr};
 use crate::co_alloc::CoAllocPref;
+use core::iter::{FusedIterator, TrustedLen};
+use core::{array, fmt, mem::MaybeUninit, ops::Try, ptr};
 
 use crate::alloc::{Allocator, Global};
 
@@ -93,13 +93,19 @@ where
         F: FnMut(B, Self::Item) -> R,
         R: Try<Output = B>,
     {
-        struct Guard<'a, T, A: Allocator> {
-            deque: &'a mut VecDeque<T, A>,
+        struct Guard<'a, T, A: Allocator, const CO_ALLOC_PREF: CoAllocPref>
+        where
+            [(); { crate::meta_num_slots!(A, CO_ALLOC_PREF) }]:,
+        {
+            deque: &'a mut VecDeque<T, A, CO_ALLOC_PREF>,
             // `consumed <= deque.len` always holds.
             consumed: usize,
         }
 
-        impl<'a, T, A: Allocator> Drop for Guard<'a, T, A> {
+        impl<'a, T, A: Allocator, const CO_ALLOC_PREF: CoAllocPref> Drop for Guard<'a, T, A, CO_ALLOC_PREF>
+        where
+            [(); { crate::meta_num_slots!(A, CO_ALLOC_PREF) }]:,
+        {
             fn drop(&mut self) {
                 self.deque.len -= self.consumed;
                 self.deque.head = self.deque.to_physical_idx(self.consumed);
@@ -221,13 +227,19 @@ where
         F: FnMut(B, Self::Item) -> R,
         R: Try<Output = B>,
     {
-        struct Guard<'a, T, A: Allocator> {
-            deque: &'a mut VecDeque<T, A>,
+        struct Guard<'a, T, A: Allocator, const CO_ALLOC_PREF: CoAllocPref>
+        where
+            [(); { crate::meta_num_slots!(A, CO_ALLOC_PREF) }]:,
+        {
+            deque: &'a mut VecDeque<T, A, CO_ALLOC_PREF>,
             // `consumed <= deque.len` always holds.
             consumed: usize,
         }
 
-        impl<'a, T, A: Allocator> Drop for Guard<'a, T, A> {
+        impl<'a, T, A: Allocator, const CO_ALLOC_PREF: CoAllocPref> Drop for Guard<'a, T, A, CO_ALLOC_PREF>
+        where
+            [(); { crate::meta_num_slots!(A, CO_ALLOC_PREF) }]:,
+        {
             fn drop(&mut self) {
                 self.deque.len -= self.consumed;
             }

library/alloc/src/collections/vec_deque/mod.rs

@@ -2844,8 +2844,7 @@ where
 
 #[stable(feature = "rust1", since = "1.0.0")]
 #[allow(unused_braces)]
-impl<T> FromIterator<T> for VecDeque<T>
-{
+impl<T> FromIterator<T> for VecDeque<T> {
     fn from_iter<I: IntoIterator<Item = T>>(iter: I) -> VecDeque<T> {
         SpecFromIterCo::spec_from_iter_co(iter.into_iter())
     }

library/alloc/src/slice.rs

@@ -103,13 +103,11 @@ pub(crate) mod hack {
     // `vec!` macro mostly and causes perf regression. See #71204 for
     // discussion and perf results.
     #[allow(unused_braces)]
-    pub fn into_vec<T, A: Allocator>(
-        b: Box<[T], A>,
-    ) -> Vec<T, A>
+    pub fn into_vec<T, A: Allocator>(b: Box<[T], A>) -> Vec<T, A>
     where
         [(); { crate::meta_num_slots_default!(A) }]:,
     {
-        into_vec_co::<T, A, {crate::CO_ALLOC_PREF_META_DEFAULT!()}>(b)
+        into_vec_co::<T, A, { crate::CO_ALLOC_PREF_META_DEFAULT!() }>(b)
     }
 
     #[allow(unused_braces)]