Skip to content

Commit 569ca71

Browse files
authored
build: Use stable channel in rust-toolchain (#1465)
1 parent c1c7459 commit 569ca71

File tree

9 files changed

+15
-13
lines changed

9 files changed

+15
-13
lines changed

native/core/benches/perf.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ pub struct FlamegraphProfiler<'a> {
3030
active_profiler: Option<ProfilerGuard<'a>>,
3131
}
3232

33-
impl<'a> FlamegraphProfiler<'a> {
33+
impl FlamegraphProfiler<'_> {
3434
pub fn new(frequency: c_int) -> Self {
3535
FlamegraphProfiler {
3636
frequency,
@@ -39,7 +39,7 @@ impl<'a> FlamegraphProfiler<'a> {
3939
}
4040
}
4141

42-
impl<'a> Profiler for FlamegraphProfiler<'a> {
42+
impl Profiler for FlamegraphProfiler<'_> {
4343
fn start_profiling(&mut self, _benchmark_id: &str, _benchmark_dir: &Path) {
4444
self.active_profiler = Some(ProfilerGuard::new(self.frequency).unwrap());
4545
}

native/core/src/common/bit.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -901,7 +901,6 @@ impl BitReader {
901901
/// `T` needs to be a little-endian native type. The value is assumed to be byte
902902
/// aligned so the bit reader will be advanced to the start of the next byte before
903903
/// reading the value.
904-
905904
/// Returns `Some` if there's enough bytes left to form a value of `T`.
906905
/// Otherwise `None`.
907906
pub fn get_aligned<T: FromBytes>(&mut self, num_bytes: usize) -> Option<T> {

native/core/src/errors.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -551,12 +551,16 @@ mod tests {
551551

552552
let jvm = JavaVM::new(jvm_args).unwrap_or_else(|e| panic!("{:#?}", e));
553553

554+
#[allow(static_mut_refs)]
554555
unsafe {
555556
JVM = Some(Arc::new(jvm));
556557
}
557558
});
558559

559-
unsafe { JVM.as_ref().unwrap() }
560+
#[allow(static_mut_refs)]
561+
unsafe {
562+
JVM.as_ref().unwrap()
563+
}
560564
}
561565

562566
fn attach_current_thread() -> AttachGuard<'static> {

native/core/src/execution/operators/scan.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@ struct ScanStream<'a> {
404404
cast_time: Time,
405405
}
406406

407-
impl<'a> ScanStream<'a> {
407+
impl ScanStream<'_> {
408408
pub fn new(
409409
scan: ScanExec,
410410
schema: SchemaRef,
@@ -453,7 +453,7 @@ impl<'a> ScanStream<'a> {
453453
}
454454
}
455455

456-
impl<'a> Stream for ScanStream<'a> {
456+
impl Stream for ScanStream<'_> {
457457
type Item = DataFusionResult<RecordBatch>;
458458

459459
fn poll_next(self: Pin<&mut Self>, _: &mut Context<'_>) -> Poll<Option<Self::Item>> {
@@ -485,7 +485,7 @@ impl<'a> Stream for ScanStream<'a> {
485485
}
486486
}
487487

488-
impl<'a> RecordBatchStream for ScanStream<'a> {
488+
impl RecordBatchStream for ScanStream<'_> {
489489
/// Get the schema
490490
fn schema(&self) -> SchemaRef {
491491
Arc::clone(&self.schema)

native/core/src/execution/sort.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ use std::{cmp, mem, ptr};
2020
/// This is a copy of the `rdxsort-rs` crate, with the following changes:
2121
/// - removed `Rdx` implementations for all types except for i64 which is the packed representation
2222
/// of row addresses and partition ids from Spark.
23-
2423
pub trait Rdx {
2524
/// Sets the number of buckets used by the generic implementation.
2625
fn cfg_nbuckets() -> usize;

native/core/src/jvm_bridge/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -209,9 +209,9 @@ pub struct JVMClasses<'a> {
209209
pub comet_task_memory_manager: CometTaskMemoryManager<'a>,
210210
}
211211

212-
unsafe impl<'a> Send for JVMClasses<'a> {}
212+
unsafe impl Send for JVMClasses<'_> {}
213213

214-
unsafe impl<'a> Sync for JVMClasses<'a> {}
214+
unsafe impl Sync for JVMClasses<'_> {}
215215

216216
/// Keeps global references to JVM classes. Used for JNI calls to JVM.
217217
static JVM_CLASSES: OnceCell<JVMClasses> = OnceCell::new();

native/core/src/parquet/data_type.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ impl AsBytes for Vec<u8> {
6868
}
6969
}
7070

71-
impl<'a> AsBytes for &'a str {
71+
impl AsBytes for &str {
7272
fn as_bytes(&self) -> &[u8] {
7373
(self as &str).as_bytes()
7474
}

native/spark-expr/src/agg_funcs/variance.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ impl Accumulator for VarianceAccumulator {
229229
};
230230

231231
Ok(ScalarValue::Float64(match self.count {
232-
count if count == 0.0 => None,
232+
0.0 => None,
233233
count if count == 1.0 && StatsType::Sample == self.stats_type => {
234234
if self.null_on_divide_by_zero {
235235
None

rust-toolchain.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@
1616
# under the License.
1717

1818
[toolchain]
19-
channel = "1.81"
19+
channel = "stable"
2020
components = ["rustfmt", "clippy", "rust-analyzer"]

0 commit comments

Comments
 (0)