Fix IntoVec::into_vec

worm-blossom · Aug 8, 2024 · ee7360a · ee7360a
1 parent fd6b73d
commit ee7360a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/ufotofu/src/common/consumer/into_vec.rs b/ufotofu/src/common/consumer/into_vec.rs
@@ -175,11 +175,11 @@ mod tests {
     #[test]
     fn converts_into_vec() {
         let mut into_vec = IntoVec::new();
-        let _ = into_vec.bulk_consume(b"ufotofu");
+        let _ = into_vec.bulk_consume_full_slice(b"ufotofu");
         let _ = into_vec.close(());
 
-        let vec = into_vec.into_vec();
-        assert_eq!(vec.len(), 7);
+        let v = into_vec.into_vec();
+        assert_eq!(v, std::vec![117, 102, 111, 116, 111, 102, 117]);
     }
 
     // Panic conditions:

diff --git a/ufotofu/src/common/consumer/into_vec_fallible.rs b/ufotofu/src/common/consumer/into_vec_fallible.rs
@@ -79,7 +79,9 @@ impl<T> AsMut<Vec<T>> for IntoVecFallible<T> {
 
 impl<T> Wrapper<Vec<T>> for IntoVecFallible<T> {
     fn into_inner(self) -> Vec<T> {
-        self.v
+        let IntoVecFallible { mut v, consumed } = self;
+        v.truncate(consumed);
+        v
     }
 }
 
@@ -153,11 +155,11 @@ mod tests {
     #[test]
     fn converts_into_vec() {
         let mut into_vec = IntoVecFallible::new();
-        let _ = into_vec.bulk_consume(b"ufotofu");
+        let _ = into_vec.bulk_consume_full_slice(b"ufotofu");
         let _ = into_vec.close(());
 
-        let vec = into_vec.into_vec();
-        assert_eq!(vec.len(), 7);
+        let v = into_vec.into_vec();
+        assert_eq!(v, std::vec![117, 102, 111, 116, 111, 102, 117]);
     }
 
     // Panic conditions: