fixup! Remove need for generic array and typenum constants

Author: sosthene-nitrokey

src/driver.rs

@@ -18,13 +18,10 @@ mod private {
 
         /// Current capacity, set by the last call to [`set_capacity`](Buffer::set_capacity)
         /// or at initialization through [`with_capacity`](Buffer::with_capacity)
-        fn current_capacity(&self) -> usize;
+        fn current_len(&self) -> usize;
 
         /// Can panic if `capacity` > `Self::MAX_CAPACITY`
-        fn set_capacity(&mut self, capacity: usize);
-
-        /// Can panic if `capacity` > `Self::MAX_CAPACITY`
-        fn with_capacity(capacity: usize) -> Self;
+        fn with_len(capacity: usize) -> Self;
     }
 }
 
@@ -44,14 +41,11 @@ impl<const N: usize> private::Sealed for [u8; N] {
         <[u8]>::as_mut_ptr(self)
     }
 
-    fn current_capacity(&self) -> usize {
+    fn current_len(&self) -> usize {
         N
     }
 
-    fn set_capacity(&mut self, _capacity: usize) {
-        // noop, fixed capacity
-    }
-    fn with_capacity(capacity: usize) -> Self {
+    fn with_len(capacity: usize) -> Self {
         assert!(capacity <= N);
         [0; N]
     }
@@ -71,17 +65,13 @@ impl private::Sealed for alloc::vec::Vec<u8> {
         <[u8]>::as_mut_ptr(self)
     }
 
-    fn current_capacity(&self) -> usize {
-        self.capacity()
-    }
-
-    fn set_capacity(&mut self, capacity: usize) {
-        self.resize(capacity, 0)
+    fn current_len(&self) -> usize {
+        self.len()
     }
 
-    fn with_capacity(capacity: usize) -> Self {
+    fn with_len(capacity: usize) -> Self {
         let mut this = alloc::vec::Vec::with_capacity(capacity);
-        this.set_capacity(capacity);
+        this.resize(capacity, 0);
         this
     }
 }

src/fs.rs

@@ -43,17 +43,18 @@ struct Cache<Storage: driver::Storage> {
     read: UnsafeCell<Storage::CACHE_BUFFER>,
     write: UnsafeCell<Storage::CACHE_BUFFER>,
     // lookahead: aligned::Aligned<aligned::A4, Bytes<Storage::LOOKAHEAD_SIZE>>,
-    lookahead: UnsafeCell<Storage::CACHE_BUFFER>,
+    lookahead: UnsafeCell<Storage::LOOKAHEAD_BUFFER>,
     size: usize,
 }
 
 impl<S: driver::Storage> Cache<S> {
     pub fn new(storage: &S) -> Self {
         let cache_size = storage.cache_size();
+        let lookahaed_size = storage.lookahead_size();
         Self {
-            read: UnsafeCell::new(S::CACHE_BUFFER::with_capacity(cache_size)),
-            write: UnsafeCell::new(S::CACHE_BUFFER::with_capacity(cache_size)),
-            lookahead: UnsafeCell::new(S::CACHE_BUFFER::with_capacity(cache_size)),
+            read: UnsafeCell::new(S::CACHE_BUFFER::with_len(cache_size)),
+            write: UnsafeCell::new(S::CACHE_BUFFER::with_len(cache_size)),
+            lookahead: UnsafeCell::new(S::LOOKAHEAD_BUFFER::with_len(lookahaed_size * 8)),
             size: cache_size,
         }
     }
@@ -537,7 +538,7 @@ impl<S: driver::Storage> FileAllocation<S> {
     pub fn new(cache_size: usize) -> Self {
         debug_assert!(cache_size > 0);
         Self {
-            cache: UnsafeCell::new(S::CACHE_BUFFER::with_capacity(cache_size)),
+            cache: UnsafeCell::new(S::CACHE_BUFFER::with_len(cache_size)),
             cache_size,
             state: unsafe { mem::MaybeUninit::zeroed().assume_init() },
             config: unsafe { mem::MaybeUninit::zeroed().assume_init() },