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

Auto merge of #86778 - tmiasko:fast-multiline, r=davidtwco

Browse Source 
Avoid byte to char position conversions in `is_multiline`

Converting a byte position into a char position is currently linear in
the number of multibyte characters in the source code. Avoid it when
checking if a range spans across lines.

This makes it feasible to compile source files with a large number of
multibyte characters.
This commit is contained in:
bors 2021-07-03 16:06:35 +00:00
commit 96859dbaf6
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
compiler/rustc_span/src/source_map.rs
View File

@ -461,9 +461,13 @@ pub fn span_to_filename(&self, sp: Span) -> FileName {
} }
pub fn is_multiline(&self, sp: Span) -> bool { pub fn is_multiline(&self, sp: Span) -> bool {
let lo = self.lookup_char_pos(sp.lo()); let lo = self.lookup_source_file_idx(sp.lo());
let hi = self.lookup_char_pos(sp.hi()); let hi = self.lookup_source_file_idx(sp.hi());
lo.line != hi.line if lo != hi {
return true;
}
let f = (*self.files.borrow().source_files)[lo].clone();
f.lookup_line(sp.lo()) != f.lookup_line(sp.hi())
} }
pub fn is_valid_span(&self, sp: Span) -> Result<(Loc, Loc), SpanLinesError> { pub fn is_valid_span(&self, sp: Span) -> Result<(Loc, Loc), SpanLinesError> {