Skip to content

Commit

Permalink
(Some) compile errors fixed; but: nightly panics again!
Browse files Browse the repository at this point in the history
  • Loading branch information
peter-lyons-kehl committed Dec 13, 2022
1 parent 8ad72c4 commit 143063b
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions library/alloc/src/collections/vec_deque/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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};
Expand Down Expand Up @@ -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()
}
}
Expand Down Expand Up @@ -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)]:,
{
Expand Down

0 comments on commit 143063b

Please # to comment.