From 1984865087b75de98f302992c3141383d430f2b7 Mon Sep 17 00:00:00 2001 From: Andrew Sonin Date: Wed, 22 May 2024 15:20:56 +0300 Subject: [PATCH] rename(collections/blazemap): map --- src/collections.rs | 2 +- src/collections/{blazemap.rs => map.rs} | 8 ++--- src/collections/{blazemap => map}/entries.rs | 22 ++++++------- src/collections/{blazemap => map}/iters.rs | 34 ++++++++++---------- src/lib.rs | 2 +- tests/random_action.rs | 16 ++++----- 6 files changed, 41 insertions(+), 43 deletions(-) rename src/collections/{blazemap.rs => map.rs} (98%) rename src/collections/{blazemap => map}/entries.rs (88%) rename src/collections/{blazemap => map}/iters.rs (92%) diff --git a/src/collections.rs b/src/collections.rs index 0ad97d3..6da8e17 100644 --- a/src/collections.rs +++ b/src/collections.rs @@ -1,2 +1,2 @@ /// Defines [`BlazeMap`](crate::prelude::BlazeMap). -pub mod blazemap; +pub mod map; diff --git a/src/collections/blazemap.rs b/src/collections/map.rs similarity index 98% rename from src/collections/blazemap.rs rename to src/collections/map.rs index 1440406..a2bcc6c 100644 --- a/src/collections/blazemap.rs +++ b/src/collections/map.rs @@ -1,9 +1,9 @@ -pub use crate::collections::blazemap::{ +pub use crate::collections::map::{ entries::{Entry, OccupiedEntry, VacantEntry}, iters::{Drain, IntoIter, IntoKeys, IntoValues, Iter, IterMut, Keys, Values, ValuesMut}, }; use crate::{ - collections::blazemap::entries::VacantEntryInner, + collections::map::entries::VacantEntryInner, traits::{ BlazeMapId, BlazeMapIdStatic, CapacityInfoProvider, KeyByOffsetProvider, TypeInfoContainer, }, @@ -29,8 +29,8 @@ mod iters; /// A [`Vec`]-based analogue of a [`HashMap`](std::collections::HashMap). #[derive(Clone, PartialEq, Eq)] pub struct BlazeMap { - pub(in crate::collections::blazemap) inner: Vec>, - pub(in crate::collections::blazemap) len: usize, + pub(in crate::collections::map) inner: Vec>, + pub(in crate::collections::map) len: usize, phantom: PhantomData, } diff --git a/src/collections/blazemap/entries.rs b/src/collections/map/entries.rs similarity index 88% rename from src/collections/blazemap/entries.rs rename to src/collections/map/entries.rs index b33af28..e425c5a 100644 --- a/src/collections/blazemap/entries.rs +++ b/src/collections/map/entries.rs @@ -5,9 +5,9 @@ use crate::prelude::BlazeMapId; /// /// This enum is constructed /// from the [`entry`] method on -/// [`BlazeMap`](crate::collections::blazemap::BlazeMap). +/// [`BlazeMap`](crate::collections::map::BlazeMap). /// -/// [`entry`]: crate::collections::blazemap::BlazeMap::entry +/// [`entry`]: crate::collections::map::BlazeMap::entry pub enum Entry<'a, K, V> where K: BlazeMapId, @@ -20,36 +20,36 @@ where #[derive(Debug)] /// A view into an occupied entry in a -/// [`BlazeMap`](crate::collections::blazemap::BlazeMap). It is part of the +/// [`BlazeMap`](crate::collections::map::BlazeMap). It is part of the /// [`Entry`] enum. pub struct OccupiedEntry<'a, K, V> where K: BlazeMapId, { - pub(in crate::collections::blazemap) key: K, + pub(in crate::collections::map) key: K, - pub(in crate::collections::blazemap) len: &'a mut usize, + pub(in crate::collections::map) len: &'a mut usize, - pub(in crate::collections::blazemap) value: &'a mut Option, + pub(in crate::collections::map) value: &'a mut Option, } #[derive(Debug)] /// A view into a vacant entry in a -/// [`BlazeMap`](crate::collections::blazemap::BlazeMap). It is part of the +/// [`BlazeMap`](crate::collections::map::BlazeMap). It is part of the /// [`Entry`] enum. pub struct VacantEntry<'a, K, V> where K: BlazeMapId, { - pub(in crate::collections::blazemap) key: K, + pub(in crate::collections::map) key: K, - pub(in crate::collections::blazemap) len: &'a mut usize, + pub(in crate::collections::map) len: &'a mut usize, - pub(in crate::collections::blazemap) inner: VacantEntryInner<'a, V>, + pub(in crate::collections::map) inner: VacantEntryInner<'a, V>, } #[derive(Debug)] -pub(in crate::collections::blazemap) enum VacantEntryInner<'a, V> { +pub(in crate::collections::map) enum VacantEntryInner<'a, V> { ShouldBeInserted(&'a mut Option), ShouldBeEnlarged(&'a mut Vec>), } diff --git a/src/collections/blazemap/iters.rs b/src/collections/map/iters.rs similarity index 92% rename from src/collections/blazemap/iters.rs rename to src/collections/map/iters.rs index 0b3fd5a..d895623 100644 --- a/src/collections/blazemap/iters.rs +++ b/src/collections/map/iters.rs @@ -1,5 +1,5 @@ use crate::{ - collections::blazemap::BlazeMap, + collections::map::BlazeMap, prelude::{BlazeMapId, BlazeMapIdStatic}, traits::{KeyByOffsetProvider, TypeInfoContainer}, }; @@ -17,13 +17,13 @@ use std::{ /// /// [`iter`]: BlazeMap::iter pub struct Iter<'a, K, V> { - pub(in crate::collections::blazemap) inner: *const Option, + pub(in crate::collections::map) inner: *const Option, - pub(in crate::collections::blazemap) current_position: usize, + pub(in crate::collections::map) current_position: usize, - pub(in crate::collections::blazemap) len: usize, + pub(in crate::collections::map) len: usize, - pub(in crate::collections::blazemap) phantom: PhantomData<(K, &'a V)>, + pub(in crate::collections::map) phantom: PhantomData<(K, &'a V)>, } /// A mutable iterator over the entries of a [`BlazeMap`]. @@ -33,13 +33,13 @@ pub struct Iter<'a, K, V> { /// /// [`iter_mut`]: BlazeMap::iter_mut pub struct IterMut<'a, K, V> { - pub(in crate::collections::blazemap) inner: *mut Option, + pub(in crate::collections::map) inner: *mut Option, - pub(in crate::collections::blazemap) current_position: usize, + pub(in crate::collections::map) current_position: usize, - pub(in crate::collections::blazemap) len: usize, + pub(in crate::collections::map) len: usize, - pub(in crate::collections::blazemap) phantom: PhantomData<(K, &'a mut V)>, + pub(in crate::collections::map) phantom: PhantomData<(K, &'a mut V)>, } /// An iterator over the keys of a [`BlazeMap`]. @@ -49,7 +49,7 @@ pub struct IterMut<'a, K, V> { /// /// [`keys`]: BlazeMap::keys pub struct Keys<'a, K, V> { - pub(in crate::collections::blazemap) inner: Iter<'a, K, V>, + pub(in crate::collections::map) inner: Iter<'a, K, V>, } /// An iterator over the values of a [`BlazeMap`]. @@ -59,7 +59,7 @@ pub struct Keys<'a, K, V> { /// /// [`values`]: BlazeMap::values pub struct Values<'a, K, V> { - pub(in crate::collections::blazemap) inner: Iter<'a, K, V>, + pub(in crate::collections::map) inner: Iter<'a, K, V>, } /// A mutable iterator over the values of a [`BlazeMap`]. @@ -69,7 +69,7 @@ pub struct Values<'a, K, V> { /// /// [`values_mut`]: BlazeMap::values_mut pub struct ValuesMut<'a, K, V> { - pub(in crate::collections::blazemap) inner: IterMut<'a, K, V>, + pub(in crate::collections::map) inner: IterMut<'a, K, V>, } /// An owning iterator over the entries of a [`BlazeMap`]. @@ -79,7 +79,7 @@ pub struct ValuesMut<'a, K, V> { /// /// [`into_iter`]: IntoIterator::into_iter pub struct IntoIter { - pub(in crate::collections::blazemap) inner: BlazeMap, + pub(in crate::collections::map) inner: BlazeMap, } /// An owning iterator over the keys of a [`BlazeMap`]. @@ -89,7 +89,7 @@ pub struct IntoIter { /// /// [`into_keys`]: BlazeMap::into_keys pub struct IntoKeys { - pub(in crate::collections::blazemap) inner: IntoIter, + pub(in crate::collections::map) inner: IntoIter, } /// An owning iterator over the values of a [`BlazeMap`]. @@ -99,7 +99,7 @@ pub struct IntoKeys { /// /// [`into_values`]: BlazeMap::into_values pub struct IntoValues { - pub(in crate::collections::blazemap) inner: IntoIter, + pub(in crate::collections::map) inner: IntoIter, } /// A draining iterator over the entries of a [`BlazeMap`]. @@ -109,9 +109,9 @@ pub struct IntoValues { /// /// [`drain`]: BlazeMap::drain pub struct Drain<'a, K, V> { - pub(in crate::collections::blazemap) map: &'a mut BlazeMap, + pub(in crate::collections::map) map: &'a mut BlazeMap, - pub(in crate::collections::blazemap) current_position: usize, + pub(in crate::collections::map) current_position: usize, } impl<'a, K, V> Iterator for Iter<'a, K, V> diff --git a/src/lib.rs b/src/lib.rs index 1c868d1..f90918f 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -22,7 +22,7 @@ pub mod utils; /// Crate prelude. pub mod prelude { pub use crate::{ - collections::blazemap::BlazeMap, + collections::map::BlazeMap, traits::{AllInstancesIter, BlazeMapId, BlazeMapIdStatic, BlazeMapIdWrapper}, }; } diff --git a/tests/random_action.rs b/tests/random_action.rs index c313ad5..acf881e 100644 --- a/tests/random_action.rs +++ b/tests/random_action.rs @@ -234,7 +234,7 @@ impl Action { write!(io, "{}", entry.or_default()).unwrap(); } Entry::EntryMatch(event) => match entry { - blazemap::collections::blazemap::Entry::Occupied(mut entry) => { + blazemap::collections::map::Entry::Occupied(mut entry) => { match event.on_occupied { OccupiedEntry::Key => write!(io, "{:?}", entry.key()).unwrap(), OccupiedEntry::RemoveEntry => { @@ -252,15 +252,13 @@ impl Action { OccupiedEntry::Drop => drop(entry), } } - blazemap::collections::blazemap::Entry::Vacant(entry) => { - match event.on_vacant { - VacantEntry::Key => write!(io, "{:?}", entry.key()).unwrap(), - VacantEntry::Insert { value } => { - write!(io, "{:?}", entry.insert(value)).unwrap(); - } - VacantEntry::Drop => drop(entry), + blazemap::collections::map::Entry::Vacant(entry) => match event.on_vacant { + VacantEntry::Key => write!(io, "{:?}", entry.key()).unwrap(), + VacantEntry::Insert { value } => { + write!(io, "{:?}", entry.insert(value)).unwrap(); } - } + VacantEntry::Drop => drop(entry), + }, }, Entry::Drop => drop(entry), }