Skip to content

Commit bb4b42a

Browse files
Retain original import style
1 parent 223f87b commit bb4b42a

File tree

3 files changed

+6
-12
lines changed

3 files changed

+6
-12
lines changed

src/derived/slot.rs

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
use crate::blocking_future::{BlockingFuture, Promise};
12
use crate::debug::TableEntry;
23
use crate::derived::MemoizationPolicy;
34
use crate::durability::Durability;
@@ -9,10 +10,7 @@ use crate::revision::Revision;
910
use crate::runtime::Runtime;
1011
use crate::runtime::RuntimeId;
1112
use crate::runtime::StampedValue;
12-
use crate::{
13-
blocking_future::{BlockingFuture, Promise},
14-
Canceled,
15-
};
13+
use crate::Canceled;
1614
use crate::{
1715
CycleError, Database, DatabaseKeyIndex, DiscardIf, DiscardWhat, Event, EventKind, QueryDb,
1816
SweepStrategy,

src/lib.rs

+2-4
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,10 @@ use crate::plumbing::LruQueryStorageOps;
3232
use crate::plumbing::QueryStorageMassOps;
3333
use crate::plumbing::QueryStorageOps;
3434
pub use crate::revision::Revision;
35+
use std::fmt::{self, Debug};
3536
use std::hash::Hash;
37+
use std::panic::{self, UnwindSafe};
3638
use std::sync::Arc;
37-
use std::{
38-
fmt::{self, Debug},
39-
panic::{self, UnwindSafe},
40-
};
4139

4240
pub use crate::durability::Durability;
4341
pub use crate::intern_id::InternId;

src/runtime.rs

+2-4
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,10 @@ use parking_lot::lock_api::{RawRwLock, RawRwLockRecursive};
77
use parking_lot::{Mutex, RwLock};
88
use rustc_hash::{FxHashMap, FxHasher};
99
use smallvec::SmallVec;
10+
use std::hash::{BuildHasherDefault, Hash};
11+
use std::panic::RefUnwindSafe;
1012
use std::sync::atomic::{AtomicUsize, Ordering};
1113
use std::sync::Arc;
12-
use std::{
13-
hash::{BuildHasherDefault, Hash},
14-
panic::RefUnwindSafe,
15-
};
1614

1715
pub(crate) type FxIndexSet<K> = indexmap::IndexSet<K, BuildHasherDefault<FxHasher>>;
1816
pub(crate) type FxIndexMap<K, V> = indexmap::IndexMap<K, V, BuildHasherDefault<FxHasher>>;

0 commit comments

Comments
 (0)