Skip to content

Commit 5b248a0

Browse files
(Some) compile errors fixed; but: nightly panics again!
1 parent 40aea98 commit 5b248a0

File tree

1 file changed

+5
-5
lines changed
  • library/alloc/src/collections/vec_deque

1 file changed

+5
-5
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#![feature(global_co_alloc)]
99
#![stable(feature = "rust1", since = "1.0.0")]
1010
use crate::vec::DEFAULT_COOP_PREFERRED;
11-
use core::alloc::{self, GlobalAlloc};
11+
use core::alloc;
1212
use core::cmp::{self, Ordering};
1313
use core::fmt;
1414
use core::hash::{Hash, Hasher};
@@ -158,10 +158,10 @@ where
158158
}
159159

160160
#[stable(feature = "rust1", since = "1.0.0")]
161-
impl<T, A: Allocator, const COOP_PREFERRED: bool> Default for VecDeque<T, Global, COOP_PREFERRED> {
161+
impl<T, A: Allocator, const COOP_PREFERRED: bool> Default for VecDeque<T, A, COOP_PREFERRED> {
162162
/// Creates an empty deque.
163163
#[inline]
164-
fn default() -> VecDeque<T, Global, COOP_PREFERRED> {
164+
fn default() -> VecDeque<T, A, COOP_PREFERRED> {
165165
VecDeque::new()
166166
}
167167
}
@@ -2974,8 +2974,8 @@ where
29742974
}
29752975

29762976
#[stable(feature = "std_collections_from_array", since = "1.56.0")]
2977-
impl<T, const N: usize, A: Allocator = Global, const COOP_PREFERRED: bool = DEFAULT_COOP_PREFERRED>
2978-
From<[T; N]> for VecDeque<T, A, COOP_PREFERRED>
2977+
impl<T, const N: usize, A: Allocator, const COOP_PREFERRED: bool> From<[T; N]>
2978+
for VecDeque<T, A, COOP_PREFERRED>
29792979
where
29802980
[(); alloc::co_alloc_metadata_num_slots_with_preference::<A>(COOP_PREFERRED)]:,
29812981
{

0 commit comments

Comments
 (0)