From e482cf8944cf0d63283ae2cb88cd33051be567a6 Mon Sep 17 00:00:00 2001 From: Andrew Sonin Date: Wed, 22 May 2024 00:30:07 +0300 Subject: [PATCH] style(imports): group imports --- src/collections/blazemap.rs | 22 +++++++++---------- src/collections/blazemap/iters.rs | 11 +++++----- src/loom.rs | 10 ++++----- src/type_info_containers/key_wrapper.rs | 16 ++++++-------- .../key_wrapper_bounded.rs | 21 ++++++++---------- src/type_info_containers/plain_id.rs | 7 +++--- 6 files changed, 40 insertions(+), 47 deletions(-) diff --git a/src/collections/blazemap.rs b/src/collections/blazemap.rs index 7362052..1440406 100644 --- a/src/collections/blazemap.rs +++ b/src/collections/blazemap.rs @@ -1,9 +1,18 @@ +pub use crate::collections::blazemap::{ + entries::{Entry, OccupiedEntry, VacantEntry}, + iters::{Drain, IntoIter, IntoKeys, IntoValues, Iter, IterMut, Keys, Values, ValuesMut}, +}; +use crate::{ + collections::blazemap::entries::VacantEntryInner, + traits::{ + BlazeMapId, BlazeMapIdStatic, CapacityInfoProvider, KeyByOffsetProvider, TypeInfoContainer, + }, +}; use std::{ borrow::Borrow, fmt::{Debug, Formatter}, marker::PhantomData, }; - #[cfg(feature = "serde")] use { crate::prelude::BlazeMapIdWrapper, @@ -14,17 +23,6 @@ use { }, }; -pub use crate::collections::blazemap::{ - entries::{Entry, OccupiedEntry, VacantEntry}, - iters::{Drain, IntoIter, IntoKeys, IntoValues, Iter, IterMut, Keys, Values, ValuesMut}, -}; -use crate::{ - collections::blazemap::entries::VacantEntryInner, - traits::{ - BlazeMapId, BlazeMapIdStatic, CapacityInfoProvider, KeyByOffsetProvider, TypeInfoContainer, - }, -}; - mod entries; mod iters; diff --git a/src/collections/blazemap/iters.rs b/src/collections/blazemap/iters.rs index bb7b0dc..0b3fd5a 100644 --- a/src/collections/blazemap/iters.rs +++ b/src/collections/blazemap/iters.rs @@ -1,3 +1,8 @@ +use crate::{ + collections::blazemap::BlazeMap, + prelude::{BlazeMapId, BlazeMapIdStatic}, + traits::{KeyByOffsetProvider, TypeInfoContainer}, +}; use std::{ borrow::Borrow, fmt::{Debug, Formatter}, @@ -5,12 +10,6 @@ use std::{ panic::{RefUnwindSafe, UnwindSafe}, }; -use crate::{ - collections::blazemap::BlazeMap, - prelude::{BlazeMapId, BlazeMapIdStatic}, - traits::{KeyByOffsetProvider, TypeInfoContainer}, -}; - /// An iterator over the entries of a [`BlazeMap`]. /// /// This `struct` is created by the [`iter`] method on [`BlazeMap`]. See its diff --git a/src/loom.rs b/src/loom.rs index c1e1dba..2114d5e 100644 --- a/src/loom.rs +++ b/src/loom.rs @@ -1,10 +1,10 @@ -use std::{cmp::Ordering, marker::PhantomData}; - -use crate::prelude::AllInstancesIter; +use crate::{ + prelude::AllInstancesIter, + traits::{BlazeMapId, TypeInfoContainer}, +}; #[cfg(feature = "serde")] use serde::{Serialize, Serializer}; - -use crate::traits::{BlazeMapId, TypeInfoContainer}; +use std::{cmp::Ordering, marker::PhantomData}; /// Provides `PartialOrd`, `Ord` and `Serialize` traits, which are derived as /// for an original type, for [`BlazeMapId`]s in the diff --git a/src/type_info_containers/key_wrapper.rs b/src/type_info_containers/key_wrapper.rs index 47ba2e7..4bbafdc 100644 --- a/src/type_info_containers/key_wrapper.rs +++ b/src/type_info_containers/key_wrapper.rs @@ -1,3 +1,10 @@ +use crate::{ + prelude::BlazeMapId, + sync::RwLock, + traits::{CapacityInfoProvider, KeyByOffsetProvider, TypeInfoContainer, WrapKey}, +}; +#[cfg(not(feature = "loom"))] +use once_cell::sync::Lazy; use std::{ borrow::Borrow, collections::{hash_map::Entry, HashMap}, @@ -5,15 +12,6 @@ use std::{ ops::Deref, }; -#[cfg(not(feature = "loom"))] -use once_cell::sync::Lazy; - -use crate::{ - prelude::BlazeMapId, - sync::RwLock, - traits::{CapacityInfoProvider, KeyByOffsetProvider, TypeInfoContainer, WrapKey}, -}; - /// Global, statically initialized container with correspondence mapping /// between blazemap offset wrappers and original keys. #[cfg(not(feature = "loom"))] diff --git a/src/type_info_containers/key_wrapper_bounded.rs b/src/type_info_containers/key_wrapper_bounded.rs index 751588d..3e3fc60 100644 --- a/src/type_info_containers/key_wrapper_bounded.rs +++ b/src/type_info_containers/key_wrapper_bounded.rs @@ -1,25 +1,22 @@ +#[cfg(feature = "loom")] +use crate::sync::RwLockReadGuard; +use crate::{ + prelude::BlazeMapId, + sync::{AtomicUsize, Ordering, RwLock}, + traits::{CapacityInfoProvider, KeyByOffsetProvider, TypeInfoContainer, WrapKey}, +}; use std::{ + borrow::Borrow, collections::{hash_map::Entry, HashMap}, hash::Hash, + ops::Deref, }; - -use std::{borrow::Borrow, ops::Deref}; #[cfg(not(feature = "loom"))] use std::{ cell::UnsafeCell, mem::{needs_drop, MaybeUninit}, }; -use crate::sync::{AtomicUsize, Ordering, RwLock}; - -use crate::{ - prelude::BlazeMapId, - traits::{CapacityInfoProvider, KeyByOffsetProvider, TypeInfoContainer, WrapKey}, -}; - -#[cfg(feature = "loom")] -use crate::sync::RwLockReadGuard; - /// Global, statically initialized container with correspondence mapping /// between blazemap index wrappers and original keys. /// diff --git a/src/type_info_containers/plain_id.rs b/src/type_info_containers/plain_id.rs index 4ffb3e7..b5beb9f 100644 --- a/src/type_info_containers/plain_id.rs +++ b/src/type_info_containers/plain_id.rs @@ -1,8 +1,9 @@ -use crate::sync::{AtomicUsize, Ordering}; +use crate::{ + sync::{AtomicUsize, Ordering}, + traits::{CapacityInfoProvider, KeyByOffsetProvider, TypeInfoContainer}, +}; use std::{borrow::Borrow, ops::Deref}; -use crate::traits::{CapacityInfoProvider, KeyByOffsetProvider, TypeInfoContainer}; - /// Global, statically initialized offset generator. #[doc(hidden)] #[derive(Debug)]