diff options
| author | Brian Anderson <banderson@mozilla.com> | 2013-06-13 19:06:47 -0700 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2013-06-13 19:06:47 -0700 |
| commit | 7755018074a7802e47ae61f69f5e2b5364a12eb8 (patch) | |
| tree | 0cc0d7770c01720c0b3d470935d68e4caabea945 /src/libsyntax/ext | |
| parent | b417bc8511a0a38e73312cee8086ed04eeb21b75 (diff) | |
| download | rust-7755018074a7802e47ae61f69f5e2b5364a12eb8.tar.gz rust-7755018074a7802e47ae61f69f5e2b5364a12eb8.zip | |
Revert "std: convert {vec,str}::to_owned to methods."
This fixes the strange random crashes in compile-fail tests. This reverts commit 96cd61ad034cc9e88ab6a7845c3480dbc1ea62f3. Conflicts: src/librustc/driver/driver.rs src/libstd/str.rs src/libsyntax/ext/quote.rs
Diffstat (limited to 'src/libsyntax/ext')
| -rw-r--r-- | src/libsyntax/ext/asm.rs | 3 | ||||
| -rw-r--r-- | src/libsyntax/ext/base.rs | 3 | ||||
| -rw-r--r-- | src/libsyntax/ext/log_syntax.rs | 3 | ||||
| -rw-r--r-- | src/libsyntax/ext/quote.rs | 5 | ||||
| -rw-r--r-- | src/libsyntax/ext/trace_macros.rs | 3 | ||||
| -rw-r--r-- | src/libsyntax/ext/tt/macro_rules.rs | 5 |
6 files changed, 15 insertions, 7 deletions
diff --git a/src/libsyntax/ext/asm.rs b/src/libsyntax/ext/asm.rs index 0394ccb3efb..febb6b324b9 100644 --- a/src/libsyntax/ext/asm.rs +++ b/src/libsyntax/ext/asm.rs @@ -14,6 +14,7 @@ use core::prelude::*; +use core::vec; use ast; use codemap::span; use ext::base; @@ -43,7 +44,7 @@ pub fn expand_asm(cx: @ExtCtxt, sp: span, tts: &[ast::token_tree]) -> base::MacResult { let p = parse::new_parser_from_tts(cx.parse_sess(), cx.cfg(), - tts.to_owned()); + vec::to_owned(tts)); let mut asm = @""; let mut outputs = ~[]; diff --git a/src/libsyntax/ext/base.rs b/src/libsyntax/ext/base.rs index 8e30a5880d5..997f4e2621f 100644 --- a/src/libsyntax/ext/base.rs +++ b/src/libsyntax/ext/base.rs @@ -10,6 +10,7 @@ use core::prelude::*; +use core::vec; use ast; use ast::Name; use codemap; @@ -366,7 +367,7 @@ pub fn get_exprs_from_tts(cx: @ExtCtxt, tts: &[ast::token_tree]) -> ~[@ast::expr] { let p = parse::new_parser_from_tts(cx.parse_sess(), cx.cfg(), - tts.to_owned()); + vec::to_owned(tts)); let mut es = ~[]; while *p.token != token::EOF { if es.len() != 0 { diff --git a/src/libsyntax/ext/log_syntax.rs b/src/libsyntax/ext/log_syntax.rs index ff8b492c943..4b61d4da218 100644 --- a/src/libsyntax/ext/log_syntax.rs +++ b/src/libsyntax/ext/log_syntax.rs @@ -10,6 +10,7 @@ use core::prelude::*; +use core::vec; use ast; use codemap; use ext::base::*; @@ -27,7 +28,7 @@ pub fn expand_syntax_ext(cx: @ExtCtxt, cx.print_backtrace(); io::stdout().write_line( print::pprust::tt_to_str( - ast::tt_delim(tt.to_owned()), + ast::tt_delim(vec::to_owned(tt)), get_ident_interner())); //trivial expression diff --git a/src/libsyntax/ext/quote.rs b/src/libsyntax/ext/quote.rs index 5e47862a1f0..25166eca7bb 100644 --- a/src/libsyntax/ext/quote.rs +++ b/src/libsyntax/ext/quote.rs @@ -10,6 +10,7 @@ use core::prelude::*; +use core::vec; use ast; use codemap::{BytePos, Pos, span}; use ext::base::ExtCtxt; @@ -38,6 +39,8 @@ pub mod rt { use parse; use print::pprust; + use core::str; + pub use ast::*; pub use parse::token::*; pub use parse::new_parser_from_tts; @@ -655,7 +658,7 @@ fn expand_tts(cx: @ExtCtxt, let p = parse::new_parser_from_tts( cx.parse_sess(), cx.cfg(), - tts.to_owned() + vec::to_owned(tts) ); *p.quote_depth += 1u; let tts = p.parse_all_token_trees(); diff --git a/src/libsyntax/ext/trace_macros.rs b/src/libsyntax/ext/trace_macros.rs index 09b3fd23434..09965b921c1 100644 --- a/src/libsyntax/ext/trace_macros.rs +++ b/src/libsyntax/ext/trace_macros.rs @@ -10,6 +10,7 @@ use core::prelude::*; +use core::vec; use ast; use codemap::span; use ext::base::ExtCtxt; @@ -27,7 +28,7 @@ pub fn expand_trace_macros(cx: @ExtCtxt, let tt_rdr = new_tt_reader( copy cx.parse_sess().span_diagnostic, None, - tt.to_owned() + vec::to_owned(tt) ); let rdr = tt_rdr as @reader; let rust_parser = Parser( diff --git a/src/libsyntax/ext/tt/macro_rules.rs b/src/libsyntax/ext/tt/macro_rules.rs index 491989c77c4..7cca7162fc8 100644 --- a/src/libsyntax/ext/tt/macro_rules.rs +++ b/src/libsyntax/ext/tt/macro_rules.rs @@ -10,6 +10,7 @@ use core::prelude::*; +use core::vec; use ast::{ident, matcher_, matcher, match_tok, match_nonterminal, match_seq}; use ast::{tt_delim}; use ast; @@ -83,7 +84,7 @@ pub fn add_new_extension(cx: @ExtCtxt, io::println(fmt!("%s! { %s }", cx.str_of(name), print::pprust::tt_to_str( - ast::tt_delim(arg.to_owned()), + ast::tt_delim(vec::to_owned(arg)), get_ident_interner()))); } @@ -100,7 +101,7 @@ pub fn add_new_extension(cx: @ExtCtxt, let arg_rdr = new_tt_reader( s_d, None, - arg.to_owned() + vec::to_owned(arg) ) as @reader; match parse(cx.parse_sess(), cx.cfg(), arg_rdr, *mtcs) { success(named_matches) => { |
