Flat container storage abstraction

Signed-off-by: Moritz Hoffmann <[email protected]>

container/Cargo.toml

@@ -7,5 +7,6 @@ license = "MIT"
 
 [dependencies]
 columnation = { git = "https://github.com/frankmcsherry/columnation" }
-flatcontainer = "0.5"
+# flatcontainer = "0.5"
+flatcontainer = { git = "https://github.com/antiguru/flatcontainer", branch = "storage" }
 serde = { version = "1.0"}

container/src/flatcontainer.rs

@@ -1,9 +1,15 @@
 //! Present a [`FlatStack`] as a timely container.
 
 pub use flatcontainer::*;
+use flatcontainer::impls::offsets::OffsetContainer;
 use crate::{buffer, Container, SizableContainer, PushInto};
 
-impl<R: Region + Clone + 'static> Container for FlatStack<R> {
+impl<R, S> Container for FlatStack<R, S>
+where
+    R: Region + Clone + 'static,
+    S: OffsetContainer<<R as Region>::Index> + Clone + 'static,
+    for<'a> &'a S: IntoIterator<Item = &'a R::Index>,
+{
     type ItemRef<'a> = R::ReadItem<'a>  where Self: 'a;
     type Item<'a> = R::ReadItem<'a> where Self: 'a;
 
@@ -28,6 +34,7 @@ impl<R: Region + Clone + 'static> Container for FlatStack<R> {
     }
 }
 
+// Only implemented for `FlatStack` with `Vec` offsets.
 impl<R: Region + Clone + 'static> SizableContainer for FlatStack<R> {
     fn capacity(&self) -> usize {
         self.capacity()
@@ -42,7 +49,12 @@ impl<R: Region + Clone + 'static> SizableContainer for FlatStack<R> {
     }
 }
 
-impl<R: Region + Push<T>, T> PushInto<T> for FlatStack<R> {
+impl<R, S, T> PushInto<T> for FlatStack<R, S>
+where
+    R: Region + Push<T>,
+    S: OffsetContainer<R::Index> + Clone + 'static,
+    for<'a> &'a S: IntoIterator<Item = &'a R::Index>,
+{
     #[inline]
     fn push_into(&mut self, item: T) {
         self.copy(item);