Merge remote-tracking branch 'origin/trunk' into use-instant-over-system-time

This commit is contained in:
Richard Feldman 2022-07-22 21:01:09 -04:00
commit c6eff66f4b
No known key found for this signature in database
GPG key ID: 7E4127D1E4241798
31 changed files with 689 additions and 396 deletions

View file

@ -1931,12 +1931,14 @@ pub fn surgery(
) {
let total_start = Instant::now();
let loading_metadata_start = total_start;
let input = fs::File::open(metadata_filename).unwrap_or_else(|e| internal_error!("{}", e));
let input = BufReader::new(input);
let md: metadata::Metadata = match deserialize_from(input) {
Ok(data) => data,
Err(err) => {
internal_error!("Failed to deserialize metadata: {}", err);
let md: metadata::Metadata = {
let input = fs::File::open(metadata_filename).unwrap_or_else(|e| internal_error!("{}", e));
let input = BufReader::new(input);
match deserialize_from(input) {
Ok(data) => data,
Err(err) => {
internal_error!("Failed to deserialize metadata: {}", err);
}
}
};
let loading_metadata_duration = loading_metadata_start.elapsed();