Skip to content

Commit dfb11fa

Browse files
committed
Fix rustc 1.79 clippy warnings.
Signed-off-by: Gerd Zellweger <mail@gerdzellweger.com>
1 parent 41a9f19 commit dfb11fa

4 files changed

Lines changed: 9 additions & 6 deletions

File tree

crates/dbsp/src/circuit/circuit_builder.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -591,7 +591,10 @@ where
591591
local_node_id: self.local_node_id,
592592
origin_node_id: self.origin_node_id.clone(),
593593
circuit: self.circuit.clone(),
594-
val: std::mem::transmute(self.val.clone()),
594+
val: std::mem::transmute::<
595+
Rc<UnsafeCell<StreamValue<D>>>,
596+
Rc<UnsafeCell<StreamValue<D2>>>,
597+
>(self.val.clone()),
595598
}
596599
}
597600
}

crates/dbsp/src/trace/layers/layer.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -820,7 +820,7 @@ where
820820
(source2, lower2, upper2),
821821
key_filter,
822822
value_filter,
823-
usize::max_value(),
823+
usize::MAX,
824824
);
825825
// TODO: account for filtered out keys.
826826
effort = (self.vals.keys() - starting_updates) as isize;

crates/dbsp/src/trace/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,7 @@ where
433433

434434
/// Merges `self` with `other` by running merger to completion.
435435
fn merge(&self, other: &Self) -> Self {
436-
let mut fuel = isize::max_value();
436+
let mut fuel = isize::MAX;
437437
let mut merger = Self::Merger::new_merger(self, other);
438438
merger.work(self, other, &None, &None, &mut fuel);
439439
merger.done()

crates/dbsp/src/trace/spine_fueled.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -703,7 +703,7 @@ where
703703

704704
fn consolidate(mut self) -> Option<B> {
705705
// Merge batches until there is nothing left to merge.
706-
let mut fuel = isize::max_value();
706+
let mut fuel = isize::MAX;
707707
while !self.reduced() {
708708
self.exert(&mut fuel);
709709
}
@@ -1150,7 +1150,7 @@ where
11501150
fn complete_merges(&mut self) {
11511151
for merge_state in self.merging.iter_mut() {
11521152
if merge_state.is_inprogress() {
1153-
let mut fuel = isize::max_value();
1153+
let mut fuel = isize::MAX;
11541154
merge_state.work(&self.key_filter, &self.value_filter, &mut fuel);
11551155
}
11561156
}
@@ -1346,7 +1346,7 @@ where
13461346
key_filter: &Option<Filter<B::Key>>,
13471347
value_filter: &Option<Filter<B::Val>>,
13481348
) -> Option<B> {
1349-
let mut fuel = isize::max_value();
1349+
let mut fuel = isize::MAX;
13501350
self.work(key_filter, value_filter, &mut fuel);
13511351
if let MergeVariant::Complete(batch) = self {
13521352
batch

0 commit comments

Comments
 (0)