Remove a few uses of deprecated getenv

diff --git a/src/librustc_back/target/mod.rs b/src/librustc_back/target/mod.rs
index 4d90c492fa2406f24bffcabb5d89f57909a5a48f..b80a486b191d20ede43a37b50bb558ca8a330d36 100644 (file)
--- a/src/librustc_back/target/mod.rs
+++ b/src/librustc_back/target/mod.rs
@@ -384,8 +384,7 @@ macro_rules! load_specific {
             Path::new(target)
         };
 
-        let target_path = env::var_os("RUST_TARGET_PATH")
-                              .unwrap_or(OsString::from_str(""));
+        let target_path = env::var_os("RUST_TARGET_PATH").unwrap_or(OsString::from_str(""));
 
         // FIXME 16351: add a sane default search path?
 

diff --git a/src/libstd/sync/mpsc/mod.rs b/src/libstd/sync/mpsc/mod.rs
index 2e60d684d6823aeb82a8c4248ad9fe8053a809ea..d783acd57ac04356fe6e6f06fa1e722f1cfbd1fd 100644 (file)
--- a/src/libstd/sync/mpsc/mod.rs
+++ b/src/libstd/sync/mpsc/mod.rs
@@ -1024,14 +1024,14 @@ fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 mod test {
     use prelude::v1::*;
 
-    use os;
+    use std::env;
     use super::*;
     use thread::Thread;
 
     pub fn stress_factor() -> uint {
-        match os::getenv("RUST_TEST_STRESS") {
-            Some(val) => val.parse().unwrap(),
-            None => 1,
+        match env::var("RUST_TEST_STRESS") {
+            Ok(val) => val.parse().unwrap(),
+            Err(..) => 1,
         }
     }
 
@@ -1546,14 +1546,14 @@ fn destroy_upgraded_shared_port_when_sender_still_active() {
 mod sync_tests {
     use prelude::v1::*;
 
-    use os;
+    use std::env;
     use thread::Thread;
     use super::*;
 
     pub fn stress_factor() -> uint {
-        match os::getenv("RUST_TEST_STRESS") {
-            Some(val) => val.parse().unwrap(),
-            None => 1,
+        match env::var("RUST_TEST_STRESS") {
+            Ok(val) => val.parse().unwrap(),
+            Err(..) => 1,
         }
     }