Make zero-copy and ZeroCopyBuffer work with Vec<T> of length 0 (#…

…48) * Make `zero-copy` work with `Vec` of length 0 * Add test for zero-length `Vec<T>` and `[T;N]` * Update into_dart.rs * Respect cargo clippy
shekohex · Sep 22, 2023 · 6281240 · 6281240
1 parent c8bfb2d
commit 6281240
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/src/into_dart.rs b/src/into_dart.rs
@@ -157,6 +157,20 @@ fn vec_to_dart_native_external_typed_data<T>(
 where
     T: DartTypedDataTypeTrait,
 {
+    if vec_from_rust.is_empty() {
+        let data = DartNativeTypedData {
+            ty: T::dart_typed_data_type(),
+            length: 0,
+            values: std::ptr::null_mut(),
+        };
+        return DartCObject {
+            ty: DartCObjectType::DartTypedData,
+            value: DartCObjectValue {
+                as_typed_data: data,
+            },
+        };
+    }
+
     let mut vec = ManuallyDrop::new(vec_from_rust);
     vec.shrink_to_fit();
     let length = vec.len();

diff --git a/tests/containers.rs b/tests/containers.rs
@@ -22,6 +22,7 @@ fn main() {
     assert!(!isolate.post(vec![42.0f64; 100]));
     assert!(!isolate.post(vec![true; 100]));
     assert!(!isolate.post(vec![false; 100]));
+    assert!(!isolate.post(ZeroCopyBuffer(vec![0u8; 0])));
     assert!(!isolate.post(ZeroCopyBuffer(vec![42i8; 100])));
     assert!(!isolate.post(ZeroCopyBuffer(vec![42u8; 100])));
     assert!(!isolate.post(ZeroCopyBuffer(vec![42i16; 100])));
@@ -45,6 +46,7 @@ fn main() {
     assert!(!isolate.post([42.0f64; 100]));
     assert!(!isolate.post([true; 100]));
     assert!(!isolate.post([false; 100]));
+    assert!(!isolate.post(ZeroCopyBuffer([0u8; 0])));
     assert!(!isolate.post(ZeroCopyBuffer([42i8; 100])));
     assert!(!isolate.post(ZeroCopyBuffer([42u8; 100])));
     assert!(!isolate.post(ZeroCopyBuffer([42i16; 100])));