Skip to content

Commit

Permalink
Retain original import style
Browse files Browse the repository at this point in the history
  • Loading branch information
jonas-schievink committed May 18, 2021
1 parent 223f87b commit bb4b42a
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 12 deletions.
6 changes: 2 additions & 4 deletions src/derived/slot.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
use crate::blocking_future::{BlockingFuture, Promise};
use crate::debug::TableEntry;
use crate::derived::MemoizationPolicy;
use crate::durability::Durability;
Expand All @@ -9,10 +10,7 @@ use crate::revision::Revision;
use crate::runtime::Runtime;
use crate::runtime::RuntimeId;
use crate::runtime::StampedValue;
use crate::{
blocking_future::{BlockingFuture, Promise},
Canceled,
};
use crate::Canceled;
use crate::{
CycleError, Database, DatabaseKeyIndex, DiscardIf, DiscardWhat, Event, EventKind, QueryDb,
SweepStrategy,
Expand Down
6 changes: 2 additions & 4 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,10 @@ use crate::plumbing::LruQueryStorageOps;
use crate::plumbing::QueryStorageMassOps;
use crate::plumbing::QueryStorageOps;
pub use crate::revision::Revision;
use std::fmt::{self, Debug};
use std::hash::Hash;
use std::panic::{self, UnwindSafe};
use std::sync::Arc;
use std::{
fmt::{self, Debug},
panic::{self, UnwindSafe},
};

pub use crate::durability::Durability;
pub use crate::intern_id::InternId;
Expand Down
6 changes: 2 additions & 4 deletions src/runtime.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,10 @@ use parking_lot::lock_api::{RawRwLock, RawRwLockRecursive};
use parking_lot::{Mutex, RwLock};
use rustc_hash::{FxHashMap, FxHasher};
use smallvec::SmallVec;
use std::hash::{BuildHasherDefault, Hash};
use std::panic::RefUnwindSafe;
use std::sync::atomic::{AtomicUsize, Ordering};
use std::sync::Arc;
use std::{
hash::{BuildHasherDefault, Hash},
panic::RefUnwindSafe,
};

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

0 comments on commit bb4b42a

Please sign in to comment.