mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use saturating_sub

Browse Source
This commit is contained in:
Esteban Küber 2019-08-31 13:42:53 -07:00
parent bf90154410
commit 84567190e0
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/librustc_errors/emitter.rs
View File

@ -146,12 +146,12 @@ impl Margin {
} else if self.label_right - self.span_left <= self.column_width {
// Attempt to fit the code window considering only the spans and labels.
let padding_left = (self.column_width - (self.label_right - self.span_left)) / 2;
self.computed_left = max(self.span_left, padding_left) - padding_left;
self.computed_left = self.span_left.saturating_sub(padding_left);
self.computed_right = self.computed_left + self.column_width;
} else if self.span_right - self.span_left <= self.column_width {
// Attempt to fit the code window considering the spans and labels plus padding.
let padding_left = (self.column_width - (self.span_right - self.span_left)) / 5 * 2;
self.computed_left = max(self.span_left, padding_left) - padding_left;
self.computed_left = self.span_left.saturating_sub(padding_left);
self.computed_right = self.computed_left + self.column_width;
} else { // Mostly give up but still don't show the full line.
self.computed_left = self.span_left;
@ -1304,11 +1304,13 @@ impl EmitterWriter {
};
let column_width = if let Some(width) = self.terminal_width {
max(width, code_offset) - code_offset
width.saturating_sub(code_offset)
} else if self.ui_testing {
140
} else {
term_size::dimensions().map(|(w, _)| w - code_offset).unwrap_or(std::usize::MAX)
term_size::dimensions()
.map(|(w, _)| w.saturating_sub(code_offset))
.unwrap_or(std::usize::MAX)
};
let margin = Margin::new(