---

yaml
---
r: 179343
b: refs/heads/tmp
c: b0b4136
h: refs/heads/master
i:
  179341: 18d51d9
  179339: 99e70ab
  179335: e3b973f
  179327: d63e1c3
v: v3

Author: GuillaumeGomez

[refs]

@@ -34,4 +34,4 @@ refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
 refs/heads/beta: 44a287e6eb22ec3c2a687fc156813577464017f7
 refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
-refs/heads/tmp: 7b973ba827076fcee194521b21a3b30caab41012
+refs/heads/tmp: b0b4136d457d7be14ab147b6a46ea6bda10966f0

branches/tmp/src/libsyntax/ext/env.rs

@@ -22,7 +22,6 @@ use ext::build::AstBuilder;
 use parse::token;
 
 use std::env;
-use std::os;
 
 pub fn expand_option_env<'cx>(cx: &'cx mut ExtCtxt, sp: Span, tts: &[ast::TokenTree])
                               -> Box<base::MacResult+'cx> {
@@ -102,12 +101,12 @@ pub fn expand_env<'cx>(cx: &'cx mut ExtCtxt, sp: Span, tts: &[ast::TokenTree])
         }
     }
 
-    let e = match os::getenv(&var) {
-        None => {
+    let e = match env::var_string(&var[]) {
+        Err(_) => {
             cx.span_err(sp, &msg);
             cx.expr_usize(sp, 0)
         }
-        Some(s) => cx.expr_str(sp, token::intern_and_get_ident(&s))
+        Ok(s) => cx.expr_str(sp, token::intern_and_get_ident(&s))
     };
     MacExpr::new(e)
 }