From eb70267e5e731a5b489aabf0e2214a9c4a264e26 Mon Sep 17 00:00:00 2001 From: Brian Anderson Date: Tue, 30 Aug 2011 14:57:59 -0700 Subject: [PATCH] Convert #env to istrs. Temporarily disable usage in rustc. Issue #855 --- src/comp/driver/rustc.rs | 4 +++- src/comp/syntax/ext/env.rs | 2 +- src/test/compile-fail/extenv-too-many-args.rs | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/comp/driver/rustc.rs b/src/comp/driver/rustc.rs index fffdcc75bf30..757175297914 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 23feb43d817d..c10f835ff293 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: diff --git a/src/test/compile-fail/extenv-too-many-args.rs b/src/test/compile-fail/extenv-too-many-args.rs index 945546fd6cb4..f6fb13cbc33b 100644 --- a/src/test/compile-fail/extenv-too-many-args.rs +++ b/src/test/compile-fail/extenv-too-many-args.rs @@ -1,3 +1,3 @@ // error-pattern:malformed #env call -fn main() { #env["one", "two"]; } +fn main() { #env[~"one", ~"two"]; }