about summary refs log tree commit diff
path: root/src/libsyntax/ext/env.rs
diff options
context:
space:
mode:
authorGuillaumeGomez <guillaume1.gomez@gmail.com>2015-02-05 01:03:12 +0100
committerGuillaumeGomez <guillaume1.gomez@gmail.com>2015-02-06 12:03:48 +0100
commitb0b4136d457d7be14ab147b6a46ea6bda10966f0 (patch)
treeb50f7f250617dd7bd5dd1ad3372fdfa610cd24b1 /src/libsyntax/ext/env.rs
parent7b973ba827076fcee194521b21a3b30caab41012 (diff)
downloadrust-b0b4136d457d7be14ab147b6a46ea6bda10966f0.tar.gz
rust-b0b4136d457d7be14ab147b6a46ea6bda10966f0.zip
Remove getenv warning
Diffstat (limited to 'src/libsyntax/ext/env.rs')
-rw-r--r--src/libsyntax/ext/env.rs7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/libsyntax/ext/env.rs b/src/libsyntax/ext/env.rs
index 8f3c9177b9c..417506cf3aa 100644
--- a/src/libsyntax/ext/env.rs
+++ b/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)
 }