Skip to content

Commit 42632b4

Browse files
iampopovichdiemol
andauthored
[rust] simplify clear_metadata() body (#11862)
simplify clear_metadata() body Co-authored-by: Diego Molina <[email protected]>
1 parent db9fcdb commit 42632b4

File tree

2 files changed

+7
-10
lines changed

2 files changed

+7
-10
lines changed

rust/src/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ fn main() {
111111
}
112112

113113
if cli.clear_metadata {
114-
clear_metadata(&log)
114+
clear_metadata(&log);
115115
}
116116

117117
let browser_name: String = cli.browser.unwrap_or_default();

rust/src/metadata.rs

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ use std::fs;
1919
use std::fs::File;
2020
use std::path::PathBuf;
2121
use std::time::{SystemTime, UNIX_EPOCH};
22+
use std::io::Error;
2223

2324
use serde::{Deserialize, Serialize};
2425

@@ -155,14 +156,10 @@ pub fn write_metadata(metadata: &Metadata, log: &Logger) {
155156
.unwrap();
156157
}
157158

158-
pub fn clear_metadata(log: &Logger) {
159+
pub fn clear_metadata(log: &Logger) -> Result<(), Error> {
159160
let metadata_path = get_metadata_path();
160-
log.trace(format!(
161-
"Deleting metadata file {}",
162-
metadata_path.display()
163-
));
164-
match fs::remove_file(metadata_path) {
165-
Ok(()) => log.trace("Metadata file was deleted".to_string()),
166-
Err(err) => log.warn(format!("Metadata file deleting invoked an error: {}", err)),
167-
}
161+
log.trace(format!("Deleting metadata file {}", metadata_path.display()));
162+
fs::remove_file(metadata_path)?;
163+
log.trace("Metadata file was deleted".to_string());
164+
Ok(())
168165
}

0 commit comments

Comments
 (0)