From 2b71aed003997cc09b85c01306083187cb924a29 Mon Sep 17 00:00:00 2001
From: "Felix S. Klock II" <pnkfelix@pnkfx.org>
Date: Wed, 1 Apr 2015 11:59:51 +0200
Subject: [PATCH] Update android tests to reflect API switch from `os::env` to
 `env::vars`.

---
 src/libstd/old_io/process.rs | 2 +-
 src/libstd/process.rs        | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/libstd/old_io/process.rs b/src/libstd/old_io/process.rs
index 7e1865a9ed6..ad2d5b46819 100644
--- a/src/libstd/old_io/process.rs
+++ b/src/libstd/old_io/process.rs
@@ -1074,7 +1074,7 @@ mod tests {
         let mut prog = env_cmd().spawn().unwrap();
         let output = String::from_utf8(prog.wait_with_output().unwrap().output).unwrap();
 
-        let r = env::vars();
+        let r = ::env::vars();
         for (k, v) in r {
             // don't check android RANDOM variables
             if k != "RANDOM".to_string() {
diff --git a/src/libstd/process.rs b/src/libstd/process.rs
index c2d43ba2a05..52f5965db80 100644
--- a/src/libstd/process.rs
+++ b/src/libstd/process.rs
@@ -832,14 +832,13 @@ mod tests {
     #[cfg(target_os="android")]
     #[test]
     fn test_inherit_env() {
-        use os;
+        use std::env;
         if running_on_valgrind() { return; }
 
         let mut result = env_cmd().output().unwrap();
         let output = String::from_utf8(result.stdout).unwrap();
 
-        let r = os::env();
-        for &(ref k, ref v) in &r {
+        for (ref k, ref v) in env::vars() {
             // don't check android RANDOM variables
             if *k != "RANDOM".to_string() {
                 assert!(output.contains(&format!("{}={}",