Merge branch 'main' into MichaelScofield-patch-1

Author: MichaelScofield

Cargo.toml

@@ -17,7 +17,7 @@
 
 [package]
 name = "orc-rust"
-version = "0.6.0"
+version = "0.6.1"
 edition = "2021"
 homepage = "https://github.com/datafusion-contrib/orc-rust"
 repository = "https://github.com/datafusion-contrib/orc-rust"
@@ -33,16 +33,16 @@ all-features = true
 
 [dependencies]
 arrow = { version = "56.0", features = ["prettyprint", "chrono-tz", "ipc_compression"] }
-bytemuck = { version = "1.18.0", features = ["must_cast"] }
-bytes = "1.4"
+bytemuck = { version = "1.22.0", features = ["must_cast"] }
+bytes = "1.10.1"
 chrono = { version = "0.4.41", default-features = false, features = ["std"] }
 chrono-tz = "0.10"
-fallible-streaming-iterator = { version = "0.1" }
+fallible-streaming-iterator = "0.1"
 flate2 = "1"
 lz4_flex = "0.11"
 lzokay-native = "0.1"
 num = "0.4.1"
-prost = { version = "0.13" }
+prost = "0.13"
 snafu = "0.8"
 snap = "1.1"
 zstd = "0.13"
@@ -65,13 +65,13 @@ anyhow = { version = "1.0", optional = true }
 clap = { version = "4.5.4", features = ["derive"], optional = true }
 
 # opendal
-opendal = { version = "0.50", optional = true, default-features = false }
+opendal = { version = "0.53", optional = true, default-features = false }
 
 [dev-dependencies]
 arrow-ipc = { version = "56.0", features = ["lz4"] }
 arrow-json = "56.0"
 criterion = { version = "0.5", default-features = false, features = ["async_tokio"] }
-opendal = { version = "0.50", default-features = false, features = ["services-memory"] }
+opendal = { version = "0.53", default-features = false, features = ["services-memory"] }
 pretty_assertions = "1.3.0"
 proptest = "1.0.0"
 serde_json = { version = "1.0", default-features = false, features = ["std"] }

benches/arrow_reader.rs

@@ -23,7 +23,7 @@ use orc_rust::arrow_reader::ArrowReaderBuilder;
 
 fn basic_path(path: &str) -> String {
     let dir = env!("CARGO_MANIFEST_DIR");
-    format!("{}/tests/basic/data/{}", dir, path)
+    format!("{dir}/tests/basic/data/{path}")
 }
 
 // demo-12-zlib.orc

src/compression.rs

@@ -96,7 +96,7 @@ pub enum CompressionType {
 
 impl std::fmt::Display for CompressionType {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{:?}", self)
+        write!(f, "{self:?}")
     }
 }
 

src/lib.rs

@@ -53,10 +53,12 @@ pub mod arrow_writer;
 pub mod async_arrow_reader;
 mod column;
 pub mod compression;
+#[allow(dead_code)]
 mod encoding;
 pub mod error;
 mod memory;
 pub mod projection;
+#[allow(dead_code)]
 mod proto;
 pub mod reader;
 pub mod schema;

src/schema.rs

@@ -133,8 +133,7 @@ fn parse_struct_children_from_proto(
         ty.subtypes.len() == ty.field_names.len(),
         UnexpectedSnafu {
             msg: format!(
-                "Struct type for column index {} must have matching lengths for subtypes and field names lists",
-                column_index,
+                "Struct type for column index {column_index} must have matching lengths for subtypes and field names lists"
             )
         }
     );

tests/basic/main.rs

@@ -77,7 +77,7 @@ fn new_arrow_reader_range(path: &str, range: Range<usize>) -> ArrowReader<File>
 
 fn basic_path(path: &str) -> String {
     let dir = env!("CARGO_MANIFEST_DIR");
-    format!("{}/tests/basic/data/{}", dir, path)
+    format!("{dir}/tests/basic/data/{path}")
 }
 
 #[test]
@@ -617,7 +617,7 @@ pub fn decimal128_timestamps_test() {
 
 fn integration_path(path: &str) -> String {
     let dir = env!("CARGO_MANIFEST_DIR");
-    format!("{}/tests/integration/data/{}", dir, path)
+    format!("{dir}/tests/integration/data/{path}")
 }
 
 // TODO: Move this to integration test file. Placed here because it has access to assert_batches_eq.
@@ -661,7 +661,6 @@ pub fn assert_batches_eq(batches: &[RecordBatch], expected_lines: &[&str]) {
     let actual_lines: Vec<_> = formatted.trim().lines().collect();
     assert_eq!(
         &actual_lines, expected_lines,
-        "\n\nexpected:\n\n{:#?}\nactual:\n\n{:#?}\n\n",
-        expected_lines, actual_lines
+        "\n\nexpected:\n\n{expected_lines:#?}\nactual:\n\n{actual_lines:#?}\n\n"
     );
 }