From c939b6096bc6f448207bf7fe9f70c80b19070b7a Mon Sep 17 00:00:00 2001 From: Nicolas Boichat Date: Tue, 3 Jun 2025 09:33:31 +0200 Subject: [PATCH] uucore: locale: Use if let instead of match 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. --- src/uucore/src/lib/mods/locale.rs | 42 +++++++++++++++++-------------- 1 file changed, 23 insertions(+), 19 deletions(-) diff --git a/src/uucore/src/lib/mods/locale.rs b/src/uucore/src/lib/mods/locale.rs index 858c05089..7bd3c0988 100644 --- a/src/uucore/src/lib/mods/locale.rs +++ b/src/uucore/src/lib/mods/locale.rs @@ -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()