user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use map + sum instead of fold for computing Unicode width

Browse source
This commit is contained in:
AnthonyMikh 2019-09-25 23:23:19 +03:00 • committed by GitHub
parent 4fc5650d17
commit d6327e8f12
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/librustc_errors/emitter.rs
View file

@ -594,9 +594,9 @@ impl EmitterWriter {
let left = margin.left(source_string.len()); // Left trim
// Account for unicode characters of width !=0 that were removed.
let left = source_string.chars().take(left).fold(0, |acc, ch| {
acc + unicode_width::UnicodeWidthChar::width(ch).unwrap_or(1)
});
let left = source_string.chars().take(left)
.map(|ch| unicode_width::UnicodeWidthChar::width(ch).unwrap_or(1))
.sum();
self.draw_line(
buffer,
@ -1512,9 +1512,9 @@ impl EmitterWriter {
.saturating_sub(part.snippet.trim_start().len());
// ...or trailing spaces. Account for substitutions containing unicode
// characters.
let sub_len = part.snippet.trim().chars().fold(0, |acc, ch| {
acc + unicode_width::UnicodeWidthChar::width(ch).unwrap_or(1)
});
let sub_len = part.snippet.trim().chars()
.map(|ch| unicode_width::UnicodeWidthChar::width(ch).unwrap_or(1))
.sum();
let underline_start = (span_start_pos + start) as isize + offset;
let underline_end = (span_start_pos + start + sub_len) as isize + offset;
@ -1535,9 +1535,9 @@ impl EmitterWriter {
}
// length of the code after substitution
let full_sub_len = part.snippet.chars().fold(0, |acc, ch| {
acc + unicode_width::UnicodeWidthChar::width(ch).unwrap_or(1) as isize
});
let full_sub_len = part.snippet.chars()
.map(|ch| acc + unicode_width::UnicodeWidthChar::width(ch).unwrap_or(1))
.sum() as isize;
// length of the code to be substituted
let snippet_len = span_end_pos as isize - span_start_pos as isize;