Clippy fixes after updating Rust to v1.66

This commit is contained in:
Louis Dureuil 2022-12-19 14:12:26 +01:00
parent 867279f2a4
commit 869d331680
No known key found for this signature in database
8 changed files with 25 additions and 25 deletions

View file

@ -51,7 +51,7 @@ fn config_user_id_path(db_path: &Path) -> Option<PathBuf> {
fn find_user_id(db_path: &Path) -> Option<InstanceUid> {
fs::read_to_string(db_path.join("instance-uid"))
.ok()
.or_else(|| fs::read_to_string(&config_user_id_path(db_path)?).ok())
.or_else(|| fs::read_to_string(config_user_id_path(db_path)?).ok())
.and_then(|uid| InstanceUid::from_str(&uid).ok())
}