Mirrors/rust
1
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2026-05-16 21:15:18 +03:00
Code Issues Packages Projects Releases Wiki Activity

Rollup merge of #65327 - guanqun:remove-hand-binary-search, r=petrochenkov

Browse Source 
replace the hand-written binary search with the library one
This commit is contained in:
Mazdak Farrokhzad
2019-10-13 13:34:37 +02:00
committed by GitHub
parent 643261aad4 63cb2fa197
commit af8a6e5e6d
1 changed files with 2 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libsyntax/source_map.rs
+2 -19
View File
@@ -878,25 +878,8 @@ pub fn bytepos_to_file_charpos(&self, bpos: BytePos) -> CharPos {
// Returns the index of the `SourceFile` (in `self.files`) that contains `pos`.
pub fn lookup_source_file_idx(&self, pos: BytePos) -> usize {
let files = self.files.borrow();
let files = &files.source_files;
let count = files.len();
// Binary search for the `SourceFile`.
let mut a = 0;
let mut b = count;
while b - a > 1 {
let m = (a + b) / 2;
if files[m].start_pos > pos {
b = m;
} else {
a = m;
}
}
assert!(a < count, "position {} does not resolve to a source location", pos.to_usize());
return a;
self.files.borrow().source_files.binary_search_by_key(&pos, |key| key.start_pos)
.unwrap_or_else(|p| p - 1)
}
pub fn count_lines(&self) -> usize {