berkus
/
miette
mirror of https://github.com/zkat/miette.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use std::cmp::max instead of manual calculation

This commit is contained in:
Lucas Holten 2024-01-11 11:34:25 +01:00
parent 36f7f65f87
commit b1e2bd2563
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/handlers/graphical.rs
View File

@ -405,16 +405,12 @@ impl GraphicalReportHandler {
// The snippets will overlap, so we create one Big Chunky Boi // The snippets will overlap, so we create one Big Chunky Boi
let left_end = left.offset() + left.len(); let left_end = left.offset() + left.len();
let right_end = right.offset() + right.len(); let right_end = right.offset() + right.len();
let new_end = std::cmp::max(left_end, right_end);
let new_span = LabeledSpan::new( let new_span = LabeledSpan::new(
left.label().map(String::from), left.label().map(String::from),
left.offset(), left.offset(),
if right_end >= left_end { new_end - left.offset(),
// Right end goes past left end
right_end - left.offset()
} else {
// right is contained inside left
left.len()
},
); );
// Check that the two contexts can be combined // Check that the two contexts can be combined
if let Ok(new_conts) = if let Ok(new_conts) =