diff options
| author | Brian Anderson <banderson@mozilla.com> | 2011-08-30 14:57:59 -0700 |
|---|---|---|
| committer | Brian Anderson <andersrb@gmail.com> | 2011-08-30 21:08:07 -0700 |
| commit | eb70267e5e731a5b489aabf0e2214a9c4a264e26 (patch) | |
| tree | a73565a23afeb2dbd75df30e3be95dfc298f0c00 /src/comp | |
| parent | 04928ed3f00e82d7d233d2b4d2a63440f098b279 (diff) | |
| download | rust-eb70267e5e731a5b489aabf0e2214a9c4a264e26.tar.gz rust-eb70267e5e731a5b489aabf0e2214a9c4a264e26.zip | |
Convert #env to istrs. Temporarily disable usage in rustc. Issue #855
Diffstat (limited to 'src/comp')
| -rw-r--r-- | src/comp/driver/rustc.rs | 4 | ||||
| -rw-r--r-- | src/comp/syntax/ext/env.rs | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/comp/driver/rustc.rs b/src/comp/driver/rustc.rs index fffdcc75bf3..75717529791 100644 --- a/src/comp/driver/rustc.rs +++ b/src/comp/driver/rustc.rs @@ -256,7 +256,9 @@ fn pretty_print_input(sess: session::session, cfg: ast::crate_cfg, fn version(argv0: &istr) { let vers = "unknown version"; - let env_vers = #env["CFG_VERSION"]; + // FIXME: Restore after istr conversion + //let env_vers = #env["CFG_VERSION"]; + let env_vers = "FIXME"; if str::byte_len(env_vers) != 0u { vers = env_vers; } io::stdout().write_str( istr::from_estr(#fmt["%s %s\n", diff --git a/src/comp/syntax/ext/env.rs b/src/comp/syntax/ext/env.rs index 23feb43d817..c10f835ff29 100644 --- a/src/comp/syntax/ext/env.rs +++ b/src/comp/syntax/ext/env.rs @@ -36,7 +36,7 @@ fn expand_syntax_ext(cx: &ext_ctxt, sp: codemap::span, arg: @ast::expr, } fn make_new_str(cx: &ext_ctxt, sp: codemap::span, s: &istr) -> @ast::expr { - ret make_new_lit(cx, sp, ast::lit_str(s, ast::sk_rc)); + ret make_new_lit(cx, sp, ast::lit_str(s, ast::sk_unique)); } // // Local Variables: |