From 143063b1f7c299c21f4f69453cfb367d707668a0 Mon Sep 17 00:00:00 2001
From: Peter Kehl <peter.kehl@gmail.com>
Date: Mon, 12 Dec 2022 21:54:59 -0800
Subject: [PATCH] (Some) compile errors fixed; but: nightly panics again!

---
 library/alloc/src/collections/vec_deque/mod.rs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/library/alloc/src/collections/vec_deque/mod.rs b/library/alloc/src/collections/vec_deque/mod.rs
index a6f2631c3fd33..34c788d27efba 100644
--- a/library/alloc/src/collections/vec_deque/mod.rs
+++ b/library/alloc/src/collections/vec_deque/mod.rs
@@ -8,7 +8,7 @@
 #![feature(global_co_alloc)]
 #![stable(feature = "rust1", since = "1.0.0")]
 use crate::vec::DEFAULT_COOP_PREFERRED;
-use core::alloc::{self, GlobalAlloc};
+use core::alloc;
 use core::cmp::{self, Ordering};
 use core::fmt;
 use core::hash::{Hash, Hasher};
@@ -158,10 +158,10 @@ where
 }
 
 #[stable(feature = "rust1", since = "1.0.0")]
-impl<T, A: Allocator, const COOP_PREFERRED: bool> Default for VecDeque<T, Global, COOP_PREFERRED> {
+impl<T, A: Allocator, const COOP_PREFERRED: bool> Default for VecDeque<T, A, COOP_PREFERRED> {
     /// Creates an empty deque.
     #[inline]
-    fn default() -> VecDeque<T, Global, COOP_PREFERRED> {
+    fn default() -> VecDeque<T, A, COOP_PREFERRED> {
         VecDeque::new()
     }
 }
@@ -2973,8 +2973,8 @@ where
 }
 
 #[stable(feature = "std_collections_from_array", since = "1.56.0")]
-impl<T, const N: usize, A: Allocator = Global, const COOP_PREFERRED: bool = DEFAULT_COOP_PREFERRED>
-    From<[T; N]> for VecDeque<T, A, COOP_PREFERRED>
+impl<T, const N: usize, A: Allocator, const COOP_PREFERRED: bool> From<[T; N]>
+    for VecDeque<T, A, COOP_PREFERRED>
 where
     [(); alloc::co_alloc_metadata_num_slots_with_preference::<A>(COOP_PREFERRED)]:,
 {