diff options
| -rw-r--r-- | src/libsyntax/ext/env.rs | 7 |
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) } |