Skip to content

Commit b0b4136

Browse files
Remove getenv warning
1 parent 7b973ba commit b0b4136

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

src/libsyntax/ext/env.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ use ext::build::AstBuilder;
2222
use parse::token;
2323

2424
use std::env;
25-
use std::os;
2625

2726
pub fn expand_option_env<'cx>(cx: &'cx mut ExtCtxt, sp: Span, tts: &[ast::TokenTree])
2827
-> Box<base::MacResult+'cx> {
@@ -102,12 +101,12 @@ pub fn expand_env<'cx>(cx: &'cx mut ExtCtxt, sp: Span, tts: &[ast::TokenTree])
102101
}
103102
}
104103

105-
let e = match os::getenv(&var) {
106-
None => {
104+
let e = match env::var_string(&var[]) {
105+
Err(_) => {
107106
cx.span_err(sp, &msg);
108107
cx.expr_usize(sp, 0)
109108
}
110-
Some(s) => cx.expr_str(sp, token::intern_and_get_ident(&s))
109+
Ok(s) => cx.expr_str(sp, token::intern_and_get_ident(&s))
111110
};
112111
MacExpr::new(e)
113112
}

0 commit comments

Comments
 (0)