diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 0cba62d83da..41b482e3c83 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -370,7 +370,7 @@ jobs: runs-on: ubuntu-24.04 strategy: matrix: - msrv: ["1.91.0"] # This should match up with rust-version in Cargo.toml + msrv: ["1.94.0"] # This should match up with rust-version in Cargo.toml env: # Need up-to-date compilers for kernels CC: clang diff --git a/Cargo.toml b/Cargo.toml index eb3af1f2fa7..51300ff2169 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -53,7 +53,7 @@ categories = [ "development-tools", "science", ] -rust-version = "1.91.0" +rust-version = "1.94.0" [workspace.dependencies] arc-swap = "1.7" diff --git a/java/lance-jni/Cargo.toml b/java/lance-jni/Cargo.toml index 14d68fbe214..47f15eca7e3 100644 --- a/java/lance-jni/Cargo.toml +++ b/java/lance-jni/Cargo.toml @@ -3,7 +3,7 @@ name = "lance-jni" version = "13.0.0-beta.4" edition = "2024" authors = ["Lance Devs "] -rust-version = "1.91" +rust-version = "1.94" license = "Apache-2.0" repository = "https://github.com/lance-format/lance" readme = "../../README.md" diff --git a/python/Cargo.toml b/python/Cargo.toml index b0a37e93217..4d48db60c40 100644 --- a/python/Cargo.toml +++ b/python/Cargo.toml @@ -4,7 +4,7 @@ version = "13.0.0-beta.4" edition = "2024" authors = ["Lance Devs "] license = "Apache-2.0" -rust-version = "1.91" +rust-version = "1.94" exclude = ["python/lance/conftest.py"] publish = false diff --git a/rust/lance-arrow/src/lib.rs b/rust/lance-arrow/src/lib.rs index 21e9ac39dee..1e1a25272cd 100644 --- a/rust/lance-arrow/src/lib.rs +++ b/rust/lance-arrow/src/lib.rs @@ -441,13 +441,9 @@ pub trait FixedSizeBinaryArrayExt { /// let int_values = UInt8Array::from_iter(0..10); /// let fixed_size_list_arr = FixedSizeBinaryArray::try_new_from_values(&int_values, 2).unwrap(); /// assert_eq!(fixed_size_list_arr, - /// FixedSizeBinaryArray::from(vec![ - /// Some(vec![0, 1].as_slice()), - /// Some(vec![2, 3].as_slice()), - /// Some(vec![4, 5].as_slice()), - /// Some(vec![6, 7].as_slice()), - /// Some(vec![8, 9].as_slice()) - /// ])) + /// FixedSizeBinaryArray::try_from_iter( + /// [[0u8, 1], [2, 3], [4, 5], [6, 7], [8, 9]].into_iter() + /// ).unwrap()) /// ``` fn try_new_from_values(values: &UInt8Array, stride: i32) -> Result; } @@ -2979,7 +2975,8 @@ mod tests { vec![Some(b"1".as_slice()), Some(b"23".as_slice())] ); - let fixed_size = FixedSizeBinaryArray::from(vec![b"abcd", b"efgh"]); + let fixed_size = + FixedSizeBinaryArray::try_from_iter([b"abcd", b"efgh"].into_iter()).unwrap(); assert_eq!( iter_binary_array(&fixed_size).unwrap().collect::>(), vec![Some(b"abcd".as_slice()), Some(b"efgh".as_slice())] diff --git a/rust/lance-file/src/versions/v1/writer/statistics.rs b/rust/lance-file/src/versions/v1/writer/statistics.rs index 7eeb3db12bc..7a013abd635 100644 --- a/rust/lance-file/src/versions/v1/writer/statistics.rs +++ b/rust/lance-file/src/versions/v1/writer/statistics.rs @@ -1541,13 +1541,12 @@ mod tests { }, // FixedSizeBinaryArray TestCase { - source_arrays: vec![Arc::new(FixedSizeBinaryArray::from(vec![ - Some(vec![0, 1].as_slice()), - Some(vec![2, 3].as_slice()), - Some(vec![4, 5].as_slice()), - Some(vec![6, 7].as_slice()), - Some(vec![8, 9].as_slice()), - ]))], + source_arrays: vec![Arc::new( + FixedSizeBinaryArray::try_from_iter( + [[0u8, 1], [2, 3], [4, 5], [6, 7], [8, 9]].into_iter(), + ) + .unwrap(), + )], stats: StatisticsRow { null_count: 0, min_value: ScalarValue::FixedSizeBinary(2, Some(vec![0, 1])), @@ -1555,9 +1554,10 @@ mod tests { }, }, TestCase { - source_arrays: vec![Arc::new(FixedSizeBinaryArray::from(vec![ - min_binary_value.as_slice(), - ]))], + source_arrays: vec![Arc::new( + FixedSizeBinaryArray::try_from_iter([min_binary_value.as_slice()].into_iter()) + .unwrap(), + )], stats: StatisticsRow { null_count: 0, min_value: ScalarValue::FixedSizeBinary( @@ -1571,9 +1571,12 @@ mod tests { }, }, TestCase { - source_arrays: vec![Arc::new(FixedSizeBinaryArray::from(vec![ - &[0xFFu8; BINARY_PREFIX_LENGTH + 7], - ]))], + source_arrays: vec![Arc::new( + FixedSizeBinaryArray::try_from_iter( + [[0xFFu8; BINARY_PREFIX_LENGTH + 7]].into_iter(), + ) + .unwrap(), + )], stats: StatisticsRow { null_count: 0, min_value: ScalarValue::FixedSizeBinary( diff --git a/rust/lance-namespace-datafusion/src/session_builder.rs b/rust/lance-namespace-datafusion/src/session_builder.rs index 2955cd51111..eba33b10461 100755 --- a/rust/lance-namespace-datafusion/src/session_builder.rs +++ b/rust/lance-namespace-datafusion/src/session_builder.rs @@ -138,10 +138,10 @@ mod tests { use super::SessionBuilder; use std::sync::Arc; + use arrow_array::record_batch; use arrow_array::{Int64Array, RecordBatch}; use datafusion::catalog::SchemaProvider; use datafusion::catalog::memory::{MemoryCatalogProvider, MemorySchemaProvider}; - use datafusion::common::record_batch; use datafusion::datasource::MemTable; use datafusion::error::Result; diff --git a/rust/lance-namespace-datafusion/tests/sql.rs b/rust/lance-namespace-datafusion/tests/sql.rs index e49cd7e58e3..25bd2fe6bdc 100755 --- a/rust/lance-namespace-datafusion/tests/sql.rs +++ b/rust/lance-namespace-datafusion/tests/sql.rs @@ -3,9 +3,9 @@ use std::sync::Arc; +use arrow_array::record_batch; use arrow_array::{Int32Array, Int64Array, RecordBatch, RecordBatchIterator, StringArray}; use arrow_schema::Schema; -use datafusion::common::record_batch; use datafusion::error::{DataFusionError, Result as DFResult}; use datafusion::prelude::SessionContext; use lance::Dataset;