Skip to content

Commit 6094503

Browse files
dankingdanking
authored
chore: update toolchain to nightly-2025-06-26 (#3742)
Signed-off-by: Daniel King <[email protected]>
1 parent a5c357a commit 6094503

File tree

15 files changed

+71
-103
lines changed

15 files changed

+71
-103
lines changed

‎encodings/fsst/src/array.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ impl FSSTArray {
156156
/// this array.
157157
///
158158
/// This is private to the crate to avoid leaking `fsst-rs` types as part of the public API.
159-
pub(crate) fn decompressor(&self) -> Decompressor {
159+
pub(crate) fn decompressor(&self) -> Decompressor<'_> {
160160
Decompressor::new(self.symbols().as_slice(), self.symbol_lengths().as_slice())
161161
}
162162

‎vortex-array/src/builders/primitive.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ impl<T: NativePType> PrimitiveBuilder<T> {
8484
///
8585
/// assert_eq!(built.as_slice::<i32>(), &[0i32, 1, 2, 3, 4]);
8686
/// ```
87-
pub fn uninit_range(&mut self, len: usize) -> UninitRange<T> {
87+
pub fn uninit_range(&mut self, len: usize) -> UninitRange<'_, T> {
8888
let offset = self.values.len();
8989
assert!(
9090
offset + len <= self.values.capacity(),

‎vortex-array/src/serde.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ impl ArrayParts {
380380
}
381381

382382
/// Returns the root ArrayNode flatbuffer.
383-
fn flatbuffer(&self) -> fba::ArrayNode {
383+
fn flatbuffer(&self) -> fba::ArrayNode<'_> {
384384
unsafe { fba::ArrayNode::follow(self.flatbuffer.as_ref(), self.flatbuffer_loc) }
385385
}
386386

‎vortex-array/src/variants.rs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,63 +12,63 @@ use crate::search_sorted::IndexOrd;
1212

1313
impl dyn Array + '_ {
1414
/// Downcasts the array for null-specific behavior.
15-
pub fn as_null_typed(&self) -> NullTyped {
15+
pub fn as_null_typed(&self) -> NullTyped<'_> {
1616
matches!(self.dtype(), DType::Null)
1717
.then(|| NullTyped(self))
1818
.vortex_expect("Array does not have DType::Null")
1919
}
2020

2121
/// Downcasts the array for bool-specific behavior.
22-
pub fn as_bool_typed(&self) -> BoolTyped {
22+
pub fn as_bool_typed(&self) -> BoolTyped<'_> {
2323
matches!(self.dtype(), DType::Bool(..))
2424
.then(|| BoolTyped(self))
2525
.vortex_expect("Array does not have DType::Bool")
2626
}
2727

2828
/// Downcasts the array for primitive-specific behavior.
29-
pub fn as_primitive_typed(&self) -> PrimitiveTyped {
29+
pub fn as_primitive_typed(&self) -> PrimitiveTyped<'_> {
3030
matches!(self.dtype(), DType::Primitive(..))
3131
.then(|| PrimitiveTyped(self))
3232
.vortex_expect("Array does not have DType::Primitive")
3333
}
3434

3535
/// Downcasts the array for decimal-specific behavior.
36-
pub fn as_decimal_typed(&self) -> DecimalTyped {
36+
pub fn as_decimal_typed(&self) -> DecimalTyped<'_> {
3737
matches!(self.dtype(), DType::Decimal(..))
3838
.then(|| DecimalTyped(self))
3939
.vortex_expect("Array does not have DType::Decimal")
4040
}
4141

4242
/// Downcasts the array for utf8-specific behavior.
43-
pub fn as_utf8_typed(&self) -> Utf8Typed {
43+
pub fn as_utf8_typed(&self) -> Utf8Typed<'_> {
4444
matches!(self.dtype(), DType::Utf8(..))
4545
.then(|| Utf8Typed(self))
4646
.vortex_expect("Array does not have DType::Utf8")
4747
}
4848

4949
/// Downcasts the array for binary-specific behavior.
50-
pub fn as_binary_typed(&self) -> BinaryTyped {
50+
pub fn as_binary_typed(&self) -> BinaryTyped<'_> {
5151
matches!(self.dtype(), DType::Binary(..))
5252
.then(|| BinaryTyped(self))
5353
.vortex_expect("Array does not have DType::Binary")
5454
}
5555

5656
/// Downcasts the array for struct-specific behavior.
57-
pub fn as_struct_typed(&self) -> StructTyped {
57+
pub fn as_struct_typed(&self) -> StructTyped<'_> {
5858
matches!(self.dtype(), DType::Struct(..))
5959
.then(|| StructTyped(self))
6060
.vortex_expect("Array does not have DType::Struct")
6161
}
6262

6363
/// Downcasts the array for list-specific behavior.
64-
pub fn as_list_typed(&self) -> ListTyped {
64+
pub fn as_list_typed(&self) -> ListTyped<'_> {
6565
matches!(self.dtype(), DType::List(..))
6666
.then(|| ListTyped(self))
6767
.vortex_expect("Array does not have DType::List")
6868
}
6969

7070
/// Downcasts the array for extension-specific behavior.
71-
pub fn as_extension_typed(&self) -> ExtensionTyped {
71+
pub fn as_extension_typed(&self) -> ExtensionTyped<'_> {
7272
matches!(self.dtype(), DType::Extension(..))
7373
.then(|| ExtensionTyped(self))
7474
.vortex_expect("Array does not have DType::Extension")

‎vortex-btrblocks/src/float.rs‎

Lines changed: 0 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ use vortex_array::{ArrayRef, IntoArray, ToCanonical};
77
use vortex_dict::DictArray;
88
use vortex_dtype::PType;
99
use vortex_error::{VortexExpect, VortexResult, vortex_panic};
10-
use vortex_runend::RunEndArray;
11-
use vortex_runend::compress::runend_encode;
1210

1311
use self::stats::FloatStats;
1412
use crate::float::dictionary::dictionary_encode;
@@ -19,9 +17,6 @@ use crate::{
1917
estimate_compression_ratio_with_sampling, integer,
2018
};
2119

22-
/// Threshold for the average run length in an array before we consider run-end encoding.
23-
const RUN_END_THRESHOLD: u32 = 3;
24-
2520
pub trait FloatScheme: Scheme<StatsType = FloatStats, CodeType = FloatCode> {}
2621

2722
impl<T> FloatScheme for T where T: Scheme<StatsType = FloatStats, CodeType = FloatCode> {}
@@ -74,9 +69,6 @@ struct ALPRDScheme;
7469
#[derive(Debug, Copy, Clone)]
7570
struct DictScheme;
7671

77-
#[derive(Debug, Copy, Clone)]
78-
struct RunEndScheme;
79-
8072
impl Scheme for UncompressedScheme {
8173
type StatsType = FloatStats;
8274
type CodeType = FloatCode;
@@ -353,58 +345,6 @@ impl Scheme for DictScheme {
353345
}
354346
}
355347

356-
impl Scheme for RunEndScheme {
357-
type StatsType = FloatStats;
358-
type CodeType = FloatCode;
359-
360-
fn code(&self) -> FloatCode {
361-
RUNEND_SCHEME
362-
}
363-
364-
fn expected_compression_ratio(
365-
&self,
366-
stats: &Self::StatsType,
367-
is_sample: bool,
368-
allowed_cascading: usize,
369-
excludes: &[FloatCode],
370-
) -> VortexResult<f64> {
371-
if stats.average_run_length < RUN_END_THRESHOLD {
372-
return Ok(0.0);
373-
}
374-
375-
estimate_compression_ratio_with_sampling(
376-
self,
377-
stats,
378-
is_sample,
379-
allowed_cascading,
380-
excludes,
381-
)
382-
}
383-
384-
fn compress(
385-
&self,
386-
stats: &FloatStats,
387-
is_sample: bool,
388-
allowed_cascading: usize,
389-
_excludes: &[FloatCode],
390-
) -> VortexResult<ArrayRef> {
391-
let (ends, values) = runend_encode(stats.source())?;
392-
// Integer compress the ends, leave the values uncompressed.
393-
let compressed_ends = IntCompressor::compress(
394-
&ends,
395-
is_sample,
396-
allowed_cascading - 1,
397-
&[
398-
integer::RunEndScheme.code(),
399-
integer::DictScheme.code(),
400-
integer::SparseScheme.code(),
401-
],
402-
)?;
403-
404-
Ok(RunEndArray::try_new(compressed_ends, values)?.into_array())
405-
}
406-
}
407-
408348
#[cfg(test)]
409349
mod tests {
410350
use vortex_array::arrays::PrimitiveArray;

‎vortex-btrblocks/src/float/stats.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ pub struct FloatStats {
4848
pub(super) null_count: u32,
4949
// cache for validity.true_count()
5050
pub(super) value_count: u32,
51+
#[allow(dead_code)]
5152
pub(super) average_run_length: u32,
5253
pub(super) distinct_values: ErasedDistinctValues,
5354
pub(super) distinct_values_count: u32,

‎vortex-duckdb/src/duckdb/expr.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ impl Expression {
2424
}
2525

2626
/// Match the subclass of the expression.
27-
pub fn as_class(&self) -> Option<ExpressionClass> {
27+
pub fn as_class(&self) -> Option<ExpressionClass<'_>> {
2828
Some(
2929
match unsafe { cpp::duckdb_vx_expr_get_class(self.as_ptr()) } {
3030
cpp::DUCKDB_VX_EXPR_CLASS::DUCKDB_VX_EXPR_CLASS_BOUND_COLUMN_REF => {

‎vortex-duckdb/src/duckdb/table_filter.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ impl Debug for TableFilterSet {
5757
wrapper!(TableFilter, duckdb_vx_table_filter, |_| {});
5858

5959
impl TableFilter {
60-
pub fn as_class(&self) -> Option<TableFilterClass> {
60+
pub fn as_class(&self) -> Option<TableFilterClass<'_>> {
6161
Some(
6262
match unsafe { cpp::duckdb_vx_table_filter_get_type(self.as_ptr()) } {
6363
cpp::DUCKDB_VX_TABLE_FILTER_TYPE::DUCKDB_VX_TABLE_FILTER_TYPE_CONSTANT_COMPARISON => {

‎vortex-flatbuffers/src/lib.rs‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@
99
#[allow(clippy::unwrap_used)]
1010
#[allow(clippy::borrow_as_ptr)]
1111
#[allow(dead_code)]
12+
// TODO(robert): Remove once we can update toolchain
13+
#[allow(unknown_lints)]
14+
#[allow(mismatched_lifetime_syntaxes)]
1215
#[allow(non_snake_case)]
1316
#[allow(non_camel_case_types)]
1417
#[allow(unsafe_op_in_unsafe_fn)]
@@ -32,6 +35,9 @@ pub mod array;
3235
#[allow(clippy::unwrap_used)]
3336
#[allow(clippy::borrow_as_ptr)]
3437
#[allow(dead_code)]
38+
// TODO(robert): Remove once we can update toolchain
39+
#[allow(unknown_lints)]
40+
#[allow(mismatched_lifetime_syntaxes)]
3541
#[allow(non_snake_case)]
3642
#[allow(non_camel_case_types)]
3743
#[allow(unsafe_op_in_unsafe_fn)]
@@ -55,6 +61,9 @@ pub mod dtype;
5561
#[allow(clippy::unwrap_used)]
5662
#[allow(clippy::borrow_as_ptr)]
5763
#[allow(dead_code)]
64+
// TODO(robert): Remove once we can update toolchain
65+
#[allow(unknown_lints)]
66+
#[allow(mismatched_lifetime_syntaxes)]
5867
#[allow(non_snake_case)]
5968
#[allow(non_camel_case_types)]
6069
#[allow(unsafe_op_in_unsafe_fn)]
@@ -78,6 +87,9 @@ pub mod footer;
7887
#[allow(clippy::unwrap_used)]
7988
#[allow(clippy::borrow_as_ptr)]
8089
#[allow(dead_code)]
90+
// TODO(robert): Remove once we can update toolchain
91+
#[allow(unknown_lints)]
92+
#[allow(mismatched_lifetime_syntaxes)]
8193
#[allow(non_snake_case)]
8294
#[allow(non_camel_case_types)]
8395
#[allow(unsafe_op_in_unsafe_fn)]
@@ -101,6 +113,9 @@ pub mod layout;
101113
#[allow(clippy::unwrap_used)]
102114
#[allow(clippy::borrow_as_ptr)]
103115
#[allow(dead_code)]
116+
// TODO(robert): Remove once we can update toolchain
117+
#[allow(unknown_lints)]
118+
#[allow(mismatched_lifetime_syntaxes)]
104119
#[allow(non_snake_case)]
105120
#[allow(non_camel_case_types)]
106121
#[allow(unsafe_op_in_unsafe_fn)]

‎vortex-mask/src/lib.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ impl MaskValues {
174174
}
175175

176176
/// Return an iterator over either indices or slices of the mask based on a density threshold.
177-
pub fn threshold_iter(&self, threshold: f64) -> MaskIter {
177+
pub fn threshold_iter(&self, threshold: f64) -> MaskIter<'_> {
178178
if self.density >= threshold {
179179
MaskIter::Slices(self.slices())
180180
} else {
@@ -494,7 +494,7 @@ impl Mask {
494494
}
495495

496496
/// Return an iterator over either indices or slices of the mask based on a density threshold.
497-
pub fn threshold_iter(&self, threshold: f64) -> AllOr<MaskIter> {
497+
pub fn threshold_iter(&self, threshold: f64) -> AllOr<MaskIter<'_>> {
498498
match &self {
499499
Self::AllTrue(_) => AllOr::All,
500500
Self::AllFalse(_) => AllOr::None,

0 commit comments

Comments
 (0)