Skip to content

Commit 93cc677

Browse files
committed
Rebase on top of the main branch.
1 parent 4fd1af2 commit 93cc677

1 file changed

Lines changed: 4 additions & 3 deletions

File tree

src/external_trait_impls/paralight.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
clippy::undocumented_unsafe_blocks
55
)]
66

7-
use crate::raw::Allocator;
7+
use crate::alloc::Allocator;
88
use crate::{HashMap, HashSet};
99
use paralight::iter::{
1010
IntoParallelRefMutSource, IntoParallelRefSource, IntoParallelSource, ParallelSource,
@@ -477,7 +477,8 @@ impl<K, V, A: Allocator> Drop for HashMapSourceDescriptor<K, V, A> {
477477
}
478478

479479
mod raw_table_wrapper {
480-
use crate::raw::{Allocator, RawTable};
480+
use crate::alloc::Allocator;
481+
use crate::raw::RawTable;
481482

482483
/// Helper to implement HashSet::par_iter().
483484
pub(super) struct HashSetRef<'data, T, A: Allocator> {
@@ -550,12 +551,12 @@ mod raw_table_wrapper {
550551
#[cfg(test)]
551552
mod test {
552553
use super::*;
553-
use alloc::boxed::Box;
554554
use core::cell::Cell;
555555
use core::ops::Deref;
556556
use paralight::iter::{ParallelIteratorExt, ParallelSourceExt};
557557
use paralight::threads::{CpuPinningPolicy, RangeStrategy, ThreadCount, ThreadPoolBuilder};
558558
use std::hash::{Hash, Hasher};
559+
use stdalloc::boxed::Box;
559560

560561
// A cell that implements Hash.
561562
#[derive(PartialEq, Eq)]

0 commit comments

Comments
 (0)