From 3fe87800b317655566724d77d863de802843cd1e Mon Sep 17 00:00:00 2001 From: patr0nus Date: Wed, 8 Feb 2023 19:48:01 +0800 Subject: [PATCH 1/2] Refactor building from pairs --- src/builder.rs | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++ src/lib.rs | 47 ++++--------------------------------- src/serde.rs | 47 ++++--------------------------------- 3 files changed, 72 insertions(+), 85 deletions(-) create mode 100644 src/builder.rs diff --git a/src/builder.rs b/src/builder.rs new file mode 100644 index 0000000..8e50a20 --- /dev/null +++ b/src/builder.rs @@ -0,0 +1,63 @@ +use crate::{Entry, Slab}; + +// Building `Slab` from pairs (usize, T). +pub(crate) struct Builder { + slab: Slab, + vacant_list_broken: bool, + first_vacant_index: Option, +} + +impl Builder { + pub(crate) fn with_capacity(capacity: usize) -> Self { + Self { + slab: Slab::with_capacity(capacity), + vacant_list_broken: false, + first_vacant_index: None, + } + } + pub(crate) fn pair(&mut self, key: usize, value: T) { + let slab = &mut self.slab; + if key < slab.entries.len() { + // iterator is not sorted, might need to recreate vacant list + if let Entry::Vacant(_) = slab.entries[key] { + self.vacant_list_broken = true; + slab.len += 1; + } + // if an element with this key already exists, replace it. + // This is consistent with HashMap and BtreeMap + slab.entries[key] = Entry::Occupied(value); + } else { + if self.first_vacant_index.is_none() && slab.entries.len() < key { + self.first_vacant_index = Some(slab.entries.len()); + } + // insert holes as necessary + while slab.entries.len() < key { + // add the entry to the start of the vacant list + let next = slab.next; + slab.next = slab.entries.len(); + slab.entries.push(Entry::Vacant(next)); + } + slab.entries.push(Entry::Occupied(value)); + slab.len += 1; + } + } + + pub(crate) fn build(self) -> Slab { + let mut slab = self.slab; + if slab.len == slab.entries.len() { + // no vacant entries, so next might not have been updated + slab.next = slab.entries.len(); + } else if self.vacant_list_broken { + slab.recreate_vacant_list(); + } else if let Some(first_vacant_index) = self.first_vacant_index { + let next = slab.entries.len(); + match &mut slab.entries[first_vacant_index] { + Entry::Vacant(n) => *n = next, + _ => unreachable!(), + } + } else { + unreachable!() + } + slab + } +} diff --git a/src/lib.rs b/src/lib.rs index 6d0c8c2..3828f6e 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -118,6 +118,8 @@ extern crate std as alloc; #[cfg(feature = "serde")] mod serde; +pub(crate) mod builder; + use alloc::vec::{self, Vec}; use core::iter::{self, FromIterator, FusedIterator}; use core::{fmt, mem, ops, slice}; @@ -1260,51 +1262,12 @@ impl FromIterator<(usize, T)> for Slab { I: IntoIterator, { let iterator = iterable.into_iter(); - let mut slab = Self::with_capacity(iterator.size_hint().0); + let mut builder = builder::Builder::with_capacity(iterator.size_hint().0); - let mut vacant_list_broken = false; - let mut first_vacant_index = None; for (key, value) in iterator { - if key < slab.entries.len() { - // iterator is not sorted, might need to recreate vacant list - if let Entry::Vacant(_) = slab.entries[key] { - vacant_list_broken = true; - slab.len += 1; - } - // if an element with this key already exists, replace it. - // This is consistent with HashMap and BtreeMap - slab.entries[key] = Entry::Occupied(value); - } else { - if first_vacant_index.is_none() && slab.entries.len() < key { - first_vacant_index = Some(slab.entries.len()); - } - // insert holes as necessary - while slab.entries.len() < key { - // add the entry to the start of the vacant list - let next = slab.next; - slab.next = slab.entries.len(); - slab.entries.push(Entry::Vacant(next)); - } - slab.entries.push(Entry::Occupied(value)); - slab.len += 1; - } + builder.pair(key, value) } - if slab.len == slab.entries.len() { - // no vacant entries, so next might not have been updated - slab.next = slab.entries.len(); - } else if vacant_list_broken { - slab.recreate_vacant_list(); - } else if let Some(first_vacant_index) = first_vacant_index { - let next = slab.entries.len(); - match &mut slab.entries[first_vacant_index] { - Entry::Vacant(n) => *n = next, - _ => unreachable!(), - } - } else { - unreachable!() - } - - slab + builder.build() } } diff --git a/src/serde.rs b/src/serde.rs index 7ffe8e0..894d59c 100644 --- a/src/serde.rs +++ b/src/serde.rs @@ -4,7 +4,7 @@ use core::marker::PhantomData; use serde::de::{Deserialize, Deserializer, MapAccess, Visitor}; use serde::ser::{Serialize, SerializeMap, Serializer}; -use super::{Entry, Slab}; +use super::{builder::Builder, Slab}; impl Serialize for Slab where @@ -39,52 +39,13 @@ where where A: MapAccess<'de>, { - let mut slab = Slab::with_capacity(map.size_hint().unwrap_or(0)); + let mut builder = Builder::with_capacity(map.size_hint().unwrap_or(0)); - // same as FromIterator impl - let mut vacant_list_broken = false; - let mut first_vacant_index = None; while let Some((key, value)) = map.next_entry()? { - if key < slab.entries.len() { - // iterator is not sorted, might need to recreate vacant list - if let Entry::Vacant(_) = slab.entries[key] { - vacant_list_broken = true; - slab.len += 1; - } - // if an element with this key already exists, replace it. - // This is consistent with HashMap and BtreeMap - slab.entries[key] = Entry::Occupied(value); - } else { - if first_vacant_index.is_none() && slab.entries.len() < key { - first_vacant_index = Some(slab.entries.len()); - } - // insert holes as necessary - while slab.entries.len() < key { - // add the entry to the start of the vacant list - let next = slab.next; - slab.next = slab.entries.len(); - slab.entries.push(Entry::Vacant(next)); - } - slab.entries.push(Entry::Occupied(value)); - slab.len += 1; - } - } - if slab.len == slab.entries.len() { - // no vacant entries, so next might not have been updated - slab.next = slab.entries.len(); - } else if vacant_list_broken { - slab.recreate_vacant_list(); - } else if let Some(first_vacant_index) = first_vacant_index { - let next = slab.entries.len(); - match &mut slab.entries[first_vacant_index] { - Entry::Vacant(n) => *n = next, - _ => unreachable!(), - } - } else { - unreachable!() + builder.pair(key, value) } - Ok(slab) + Ok(builder.build()) } } From 9f9b31a02d76e36b48cbfd75a763426328c71dd9 Mon Sep 17 00:00:00 2001 From: "Wang, Chi" Date: Fri, 10 Feb 2023 09:25:27 +0800 Subject: [PATCH 2/2] Update visibility modifier Co-authored-by: Taiki Endo --- src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib.rs b/src/lib.rs index 3828f6e..ec21147 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -118,7 +118,7 @@ extern crate std as alloc; #[cfg(feature = "serde")] mod serde; -pub(crate) mod builder; +mod builder; use alloc::vec::{self, Vec}; use core::iter::{self, FromIterator, FusedIterator};