Skip to content

Commit fb4e571

Browse files
committed
fix(forge): use total cmp instead partial
1 parent 4e6a859 commit fb4e571

File tree

3 files changed

+4
-6
lines changed

3 files changed

+4
-6
lines changed

crates/cli/src/utils/suggestions.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ where
1717
.map(|pv| (strsim::jaro_winkler(v, pv.as_ref()), pv.as_ref().to_owned()))
1818
.filter(|(similarity, _)| *similarity > 0.8)
1919
.collect();
20-
candidates.sort_by(|a, b| a.0.partial_cmp(&b.0).unwrap_or(Ordering::Equal));
20+
candidates.sort_by(|a, b| a.0.total_cmp(&b.0));
2121
candidates.into_iter().map(|(_, pv)| pv).collect()
2222
}
2323

crates/common/src/contracts.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ impl ContractsByArtifact {
147147
None
148148
}
149149
})
150-
.min_by(|(score1, _), (score2, _)| score1.partial_cmp(score2).unwrap())
150+
.min_by(|(score1, _), (score2, _)| score1.total_cmp(score2))
151151
.map(|(_, data)| data)
152152
}
153153

crates/forge/bin/cmd/snapshot.rs

+2-4
Original file line numberDiff line numberDiff line change
@@ -373,9 +373,7 @@ fn diff(tests: Vec<SuiteTestResult>, snaps: Vec<GasSnapshotEntry>) -> Result<()>
373373
let mut overall_gas_change = 0i128;
374374
let mut overall_gas_used = 0i128;
375375

376-
diffs.sort_by(|a, b| {
377-
a.gas_diff().abs().partial_cmp(&b.gas_diff().abs()).unwrap_or(Ordering::Equal)
378-
});
376+
diffs.sort_by(|a, b| a.gas_diff().abs().total_cmp(&b.gas_diff().abs()));
379377

380378
for diff in diffs {
381379
let gas_change = diff.gas_change();
@@ -401,7 +399,7 @@ fn diff(tests: Vec<SuiteTestResult>, snaps: Vec<GasSnapshotEntry>) -> Result<()>
401399

402400
fn fmt_pct_change(change: f64) -> String {
403401
let change_pct = change * 100.0;
404-
match change.partial_cmp(&0.0).unwrap_or(Ordering::Equal) {
402+
match change.total_cmp(&0.0) {
405403
Ordering::Less => format!("{change_pct:.3}%").green().to_string(),
406404
Ordering::Equal => {
407405
format!("{change_pct:.3}%")

0 commit comments

Comments
 (0)