Resolved test error and clippy error

JulianSchmid · Nov 13, 2023 · 9593a03 · 9593a03
1 parent 5908f2f
commit 9593a03
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/src/tp_buf.rs b/src/tp_buf.rs
@@ -193,14 +193,13 @@ impl TpBuf {
         // get enough memory to store a SOMEIP header + tp reassembled payload
         let required_len = SOMEIP_HEADER_LENGTH + (tp_header.offset() as usize) + payload.len();
         if self.data.len() < required_len {
-            if self.data.capacity() < required_len {
-                if self
+            if self.data.capacity() < required_len
+                && self
                     .data
                     .try_reserve(required_len - self.data.len())
                     .is_err()
-                {
-                    return Err(AllocationFailure { len: required_len });
-                }
+            {
+                return Err(AllocationFailure { len: required_len });
             }
             unsafe {
                 self.data.set_len(required_len);

diff --git a/src/tp_pool.rs b/src/tp_pool.rs
@@ -43,7 +43,10 @@ where
         }
     }
 
-    pub fn with_capacity(buf_config: TpBufConfig, initial_bufs_count: usize) -> TpPool<ChannelId, Timestamp> {
+    pub fn with_capacity(
+        buf_config: TpBufConfig,
+        initial_bufs_count: usize,
+    ) -> TpPool<ChannelId, Timestamp> {
         TpPool {
             active: HashMap::with_capacity(initial_bufs_count),
             finished: {
@@ -63,7 +66,7 @@ where
         for _ in 0..additional {
             self.finished.push(TpBuf::new(self.buf_config.clone()));
         }
-        self.active.reserve(additional);
+        self.active.reserve(self.finished.len());
     }
 
     #[inline]