mirror of
https://github.com/RGBCube/uutils-coreutils
synced 2025-07-28 11:37:44 +00:00
Merge pull request #8050 from drinkcat/local-lang-clippy
uucore: locale: Use if let instead of match
This commit is contained in:
commit
28612fe1f1
1 changed files with 23 additions and 19 deletions
|
@ -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()
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue