---

yaml
---
r: 196007
b: refs/heads/beta
c: 2b71aed
h: refs/heads/master
i:
  196005: a1985b6
  196003: 5bc90a2
  195999: 88877fb
v: v3

Author: pnkfelix

[refs]

@@ -29,7 +29,7 @@ refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
 refs/heads/automation-fail: 1bf06495443584539b958873e04cc2f864ab10e4
 refs/heads/batch: b7fd822592a4fb577552d93010c4a4e14f314346
 refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
-refs/heads/beta: 8dff0ac143a689b7a1e04e55273d3f006b8369d1
+refs/heads/beta: 2b71aed003997cc09b85c01306083187cb924a29
 refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
 refs/heads/tmp: 9de34a84bb300bab1bf0227f577331620cd60511

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

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