user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Convert std::generic_os to istrs. Issue #855

Browse source
This commit is contained in:
Brian Anderson 2011-08-24 23:34:10 -07:00
parent ccc68fc18b
commit 85b4253bc1
6 changed files with 41 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/comp/syntax/ext/env.rs
View file

@ -5,6 +5,7 @@
* interface.
*/
import std::vec;
import std::istr;
import std::option;
import std::generic_os;
import base::*;
@ -26,9 +27,11 @@ fn expand_syntax_ext(cx: &ext_ctxt, sp: codemap::span, arg: @ast::expr,
// option::t<str> rather than just an maybe-empty string.
let var = expr_to_str(cx, args[0], "#env requires a string");
alt generic_os::getenv(var) {
alt generic_os::getenv(istr::from_estr(var)) {
option::none. { ret make_new_str(cx, sp, ""); }
option::some(s) { ret make_new_str(cx, sp, s); }
option::some(s) {
ret make_new_str(cx, sp, istr::to_estr(s));
}
}
}