uutils/coreutils
0
0
Fork 0
mirror of https://github.com/uutils/coreutils.git synced 2026-06-10 15:48:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

uucore: locale: Use if let instead of match

Browse Source 
Recent cargo clippy prefers to use if let for single pattern.

For some reason it only triggers on one of the LANG restore case though,
but we can just fix them all.
This commit is contained in:
Nicolas Boichat
2025-06-03 09:35:47 +02:00
parent 862565cd1a
commit c939b6096b
1 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/uucore/src/lib/mods/locale.rs
+23 -19
View File
@@ -739,13 +739,14 @@ invalid-syntax = This is { $missing
assert_eq!(result.unwrap(), "es-ES");
// Restore original LANG value
match original_lang {
Some(val) => unsafe {
if let Some(val) = original_lang {
unsafe {
env::set_var("LANG", val);
},
None => unsafe {
}
} else {
unsafe {
env::remove_var("LANG");
},
}
}
}
@@ -764,11 +765,12 @@ invalid-syntax = This is { $missing
assert_eq!(result.unwrap().to_string(), "en-US");
// Restore original LANG value
match original_lang {
Some(val) => unsafe {
if let Some(val) = original_lang {
unsafe {
env::set_var("LANG", val);
},
None => {} // Was already unset
}
} else {
{} // Was already unset
}
}
@@ -791,13 +793,14 @@ invalid-syntax = This is { $missing
assert_eq!(message, "Bonjour, le monde!");
// Restore original LANG value
match original_lang {
Some(val) => unsafe {
if let Some(val) = original_lang {
unsafe {
env::set_var("LANG", val);
},
None => unsafe {
}
} else {
unsafe {
env::remove_var("LANG");
},
}
}
})
.join()
@@ -823,13 +826,14 @@ invalid-syntax = This is { $missing
assert_eq!(message, "Hello, world!");
// Restore original LANG value
match original_lang {
Some(val) => unsafe {
if let Some(val) = original_lang {
unsafe {
env::set_var("LANG", val);
},
None => unsafe {
}
} else {
unsafe {
env::remove_var("LANG");
},
}
}
})
.join()