From a559ccdbd8f36f3efe3fe3b1bdb3b21cca838bbd Mon Sep 17 00:00:00 2001 From: Mark Poliakov Date: Wed, 5 Mar 2025 15:14:53 +0200 Subject: [PATCH] alnyan/yggdrasil: inherit env properly in Command --- library/std/src/sys/pal/yggdrasil/process/command.rs | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/library/std/src/sys/pal/yggdrasil/process/command.rs b/library/std/src/sys/pal/yggdrasil/process/command.rs index 54cbfb3d6ef..d30e16025ec 100644 --- a/library/std/src/sys/pal/yggdrasil/process/command.rs +++ b/library/std/src/sys/pal/yggdrasil/process/command.rs @@ -157,14 +157,10 @@ impl Command { let program = &util::resolve_binary(program).unwrap_or_else(|| program.to_owned()); - let envs = Vec::from_iter(self.env.iter().filter_map(|(key, value)| { - if let Some(value) = value { - let key = key.to_str().unwrap(); - let value = value.to_str().unwrap(); - Some(format!("{}={}", key, value)) - } else { - None - } + let envs = Vec::from_iter(self.env.capture().iter().filter_map(|(key, value)| { + let key = key.to_str()?; + let value = value.to_str()?; + Some(format!("{}={}", key, value)) })); let directory = self.cwd.as_ref().map(|cwd| cwd.to_str().unwrap());