bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Rollup merge of #139026 - yotamofek:pr/abs-diff, r=compiler-errors

Browse source 
Use `abs_diff` where applicable

Very small cleanup, dogfooding a [new clippy lint](https://github.com/rust-lang/rust-clippy/pull/14482) I'm trying to add
This commit is contained in:
Jacob Pratt 2025-03-27 21:41:50 -04:00 • committed by GitHub
commit 2465b62858
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 2 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
compiler/rustc_errors/src/snippet.rs
View file

@ -159,11 +159,7 @@ impl Annotation {
/// Length of this annotation as displayed in the stderr output /// Length of this annotation as displayed in the stderr output
pub(crate) fn len(&self) -> usize { pub(crate) fn len(&self) -> usize {
// Account for usize underflows // Account for usize underflows
if self.end_col.display > self.start_col.display { self.end_col.display.abs_diff(self.start_col.display)
self.end_col.display - self.start_col.display
} else {
self.start_col.display - self.end_col.display
}
} }
pub(crate) fn has_label(&self) -> bool { pub(crate) fn has_label(&self) -> bool {

2
compiler/rustc_span/src/edit_distance.rs
View file

@ -118,7 +118,7 @@ pub fn edit_distance_with_substrings(a: &str, b: &str, limit: usize) -> Option<u
// Check one isn't less than half the length of the other. If this is true then there is a // Check one isn't less than half the length of the other. If this is true then there is a
// big difference in length. // big difference in length.
let big_len_diff = (n * 2) < m || (m * 2) < n; let big_len_diff = (n * 2) < m || (m * 2) < n;
let len_diff = if n < m { m - n } else { n - m }; let len_diff = m.abs_diff(n);
let distance = edit_distance(a, b, limit + len_diff)?; let distance = edit_distance(a, b, limit + len_diff)?;
// This is the crux, subtracting length difference means exact substring matches will now be 0 // This is the crux, subtracting length difference means exact substring matches will now be 0