OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rollup merge of #69434 - petrochenkov:metabs, r=Mark-Simulacrum

Browse Source 
rustc_metadata: Use binary search from standard library

instead of a hand rolled one.

Noticed while reviewing https://github.com/rust-lang/rust/pull/68941.
This commit is contained in:
Dylan DPC 2020-02-26 15:34:33 +01:00 committed by GitHub
commit c0760279b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/librustc_metadata/rmeta/decoder.rs
View File

@ -408,20 +408,12 @@ impl<'a, 'tcx> SpecializedDecoder<Span> for DecodeContext<'a, 'tcx> {
{
last_source_file
} else {
let mut a = 0;
let mut b = imported_source_files.len();
let index = imported_source_files
.binary_search_by_key(&lo, |source_file| source_file.original_start_pos)
.unwrap_or_else(|index| index - 1);
while b - a > 1 {
let m = (a + b) / 2;
if imported_source_files[m].original_start_pos > lo {
b = m;
} else {
a = m;
}
}
self.last_source_file_index = a;
&imported_source_files[a]
self.last_source_file_index = index;
&imported_source_files[index]
}
};