From ae89b1275b98bdd93304a5da75b90a876fe9e7f9 Mon Sep 17 00:00:00 2001
From: stratact <stratact1@gmail.com>
Date: Sun, 8 Jul 2018 14:56:22 -0700
Subject: [PATCH] Take 3 for Redox
---
members/sys/src/sys/redox/mod.rs | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/members/sys/src/sys/redox/mod.rs b/members/sys/src/sys/redox/mod.rs
index 6bea20fd..f519b9de 100644
--- a/members/sys/src/sys/redox/mod.rs
+++ b/members/sys/src/sys/redox/mod.rs
@@ -160,12 +160,12 @@ pub fn execve<S: AsRef<str>>(prog: &str, args: &[S], clear_env: bool) -> io::Err
// This is a fully specified scheme or path to an
// executable.
Some(PathBuf::from(prog))
- } else if let Ok(paths) = env::var("PATH") {
+ } else if let Ok(paths) = var("PATH") {
// This is not a fully specified scheme or path.
// Iterate through the possible paths in the
// env var PATH that this executable may be found
// in and return the first one found.
- env::split_paths(&paths)
+ split_paths(&paths)
.filter_map(|mut path| {
path.push(prog);
if path.exists() {
@@ -181,8 +181,8 @@ pub fn execve<S: AsRef<str>>(prog: &str, args: &[S], clear_env: bool) -> io::Err
// If clear_env set, clear the env.
if clear_env {
- for (key, _) in env::vars() {
- env::remove_var(key);
+ for (key, _) in vars() {
+ remove_var(key);
}
}
--
GitLab