Amend experimental thread support warnings

[rust.git] / src / shims / env.rs

diff --git a/src/shims/env.rs b/src/shims/env.rs
index 915decc28725ddf2e2aed4f9e7b06e08abf2063d..ae9b8c75145f78a2cfabf1f00dd0e322dadaf07e 100644 (file)
--- a/src/shims/env.rs
+++ b/src/shims/env.rs
@@ -50,8 +50,8 @@ pub(crate) fn init<'mir>(
         if ecx.machine.communicate() || !config.forwarded_env_vars.is_empty() {
             for (name, value) in env::vars_os() {
                 let forward = match ecx.machine.communicate() {
-                    true => !excluded_env_vars.iter().any(|v| v.as_str() == &name),
-                    false => config.forwarded_env_vars.iter().any(|v| v.as_str() == &name),
+                    true => !excluded_env_vars.iter().any(|v| **v == name),
+                    false => config.forwarded_env_vars.iter().any(|v| **v == name),
                 };
                 if forward {
                     let var_ptr = match target_os {
@@ -64,7 +64,7 @@ pub(crate) fn init<'mir>(
                                 unsupported
                             ),
                     };
-                    ecx.machine.env_vars.map.insert(OsString::from(name), var_ptr);
+                    ecx.machine.env_vars.map.insert(name, var_ptr);
                 }
             }
         }