Skip to content

Commit da75ee9

Browse files
committed
Obey clippy::comparison_chain
1 parent 02acf2d commit da75ee9

File tree

2 files changed

+14
-11
lines changed

2 files changed

+14
-11
lines changed

tyrga-lib/src/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
#![deny(unused_mut)]
1717
#![deny(unused_variables)]
1818
#![deny(clippy::inefficient_to_string)]
19+
#![deny(clippy::comparison_chain)]
1920

2021
// make macros visible to later modules
2122
#[macro_use]

tyrga-lib/src/stack.rs

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ impl Manager {
7676
fn nudge(&mut self, pick_movement : i32, depth_movement : i32) -> StackActions {
7777
use crate::tenyr::InstructionType::Type3;
7878
use crate::tenyr::MemoryOpType::{LoadRight, NoLoad, StoreRight};
79+
use std::cmp::Ordering::*;
7980

8081
let spilled_before = self.spilled_count();
8182

@@ -111,17 +112,18 @@ impl Manager {
111112
kind : Type3(off),
112113
});
113114

114-
if n < 0 {
115-
update
116-
.chain((spilled_before..spilled_after).map(mover(StoreRight, spilled_before)))
117-
.collect()
118-
} else if n > 0 {
119-
(spilled_after..spilled_before)
120-
.map(mover(LoadRight, spilled_after))
121-
.chain(update)
122-
.collect()
123-
} else {
124-
std::iter::empty().collect()
115+
match n.cmp(&0) {
116+
Less =>
117+
update
118+
.chain((spilled_before..spilled_after).map(mover(StoreRight, spilled_before)))
119+
.collect(),
120+
Equal =>
121+
std::iter::empty().collect(),
122+
Greater =>
123+
(spilled_after..spilled_before)
124+
.map(mover(LoadRight, spilled_after))
125+
.chain(update)
126+
.collect(),
125127
}
126128
}
127129

0 commit comments

Comments
 (0)