---

yaml
---
r: 195531
b: refs/heads/master
c: 2b71aed
h: refs/heads/master
i:
  195529: 15496b8
  195527: 769b929
v: v3

Author: pnkfelix

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 8dff0ac143a689b7a1e04e55273d3f006b8369d1
+refs/heads/master: 2b71aed003997cc09b85c01306083187cb924a29
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: b3317d68910900f135f9f38e43a7a699bc736b4a
 refs/heads/try: 961e0358e1a5c0faaef606e31e9965742c1643bf

trunk/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() {

trunk/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!("{}={}",