fix linting, address comments

apache · Mar 18, 2024 · 72854c4 · 72854c4
1 parent 4c29007
commit 72854c4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/arrow-ipc/src/reader.rs b/arrow-ipc/src/reader.rs
@@ -86,7 +86,7 @@ fn create_array(
         BinaryView | Utf8View => {
             let count = variadic_counts
                 .pop_front()
-                .expect("Incorrect variadic count!");
+                .ok_or(ArrowError::IpcError("Incorrect variadic count!".to_owned()))?;
             let count = count + 2; // view and null buffer.
             let buffers = (0..count)
                 .map(|_| reader.next_buffer())
@@ -359,7 +359,7 @@ impl<'a> ArrayReader<'a> {
             Utf8View | BinaryView => {
                 let count = variadic_count
                     .pop_front()
-                    .expect("Incorrect variadic count!");
+                    .ok_or(ArrowError::IpcError("Incorrect variadic count!".to_owned()))?;
                 let count = count + 2; // view and null buffer.
                 for _i in 0..count {
                     self.skip_buffer()

diff --git a/arrow-ipc/src/writer.rs b/arrow-ipc/src/writer.rs
@@ -1895,9 +1895,8 @@ mod tests {
             Some(LONG_TEST_STRING.as_bytes()),
         ];
         let binary_array = BinaryViewArray::from_iter(values);
-        let utf8_array = StringViewArray::from_iter(
-            vec![Some("foo"), Some("bar"), Some(LONG_TEST_STRING)].into_iter(),
-        );
+        let utf8_array =
+            StringViewArray::from_iter(vec![Some("foo"), Some("bar"), Some(LONG_TEST_STRING)]);
         let record_batch = RecordBatch::try_new(
             Arc::new(schema.clone()),
             vec![Arc::new(binary_array), Arc::new(utf8_array)],