diff options
| author | bors <bors@rust-lang.org> | 2013-07-12 13:34:29 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-07-12 13:34:29 -0700 |
| commit | 96453eb5c524fea0ee48b9a8e4b60c12dd0e9fc9 (patch) | |
| tree | d50a3ccbaca480e6ef0f526fc0591622c20c542d /src/libsyntax | |
| parent | 5cc4e5145dc971c032eb106b7a6866b8aa274482 (diff) | |
| parent | 9b21bf45e9be7410f2370e5f178c46f3415b6765 (diff) | |
| download | rust-96453eb5c524fea0ee48b9a8e4b60c12dd0e9fc9.tar.gz rust-96453eb5c524fea0ee48b9a8e4b60c12dd0e9fc9.zip | |
auto merge of #7736 : thestinger/rust/doc, r=thestinger
2b96408 r=sanxiyn documents conversion, size hints and double-ended iterators and adds more of the traits to the prelude
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/attr.rs | 3 | ||||
| -rw-r--r-- | src/libsyntax/ext/asm.rs | 4 | ||||
| -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 | 4 | ||||
| -rw-r--r-- | src/libsyntax/ext/trace_macros.rs | 4 | ||||
| -rw-r--r-- | src/libsyntax/ext/tt/macro_rules.rs | 5 |
7 files changed, 8 insertions, 18 deletions
diff --git a/src/libsyntax/attr.rs b/src/libsyntax/attr.rs index e4532c476d7..055d5540f8d 100644 --- a/src/libsyntax/attr.rs +++ b/src/libsyntax/attr.rs @@ -20,7 +20,6 @@ use diagnostic::span_handler; use parse::comments::{doc_comment_style, strip_doc_comment_decoration}; use std::hashmap::HashSet; -use std::vec; /* Constructors */ pub fn mk_name_value_item_str(name: @str, value: @str) @@ -256,7 +255,7 @@ pub fn last_meta_item_list_by_name(items: ~[@ast::meta_item], name: &str) pub fn sort_meta_items(items: &[@ast::meta_item]) -> ~[@ast::meta_item] { // This is sort of stupid here, converting to a vec of mutables and back - let mut v = vec::to_owned(items); + let mut v = items.to_owned(); do extra::sort::quick_sort(v) |ma, mb| { get_meta_item_name(*ma) <= get_meta_item_name(*mb) } diff --git a/src/libsyntax/ext/asm.rs b/src/libsyntax/ext/asm.rs index 532757346d0..bf7cccdc9ef 100644 --- a/src/libsyntax/ext/asm.rs +++ b/src/libsyntax/ext/asm.rs @@ -19,8 +19,6 @@ use ext::base::*; use parse; use parse::token; -use std::vec; - enum State { Asm, Outputs, @@ -43,7 +41,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(), - vec::to_owned(tts)); + tts.to_owned()); let mut asm = @""; let mut outputs = ~[]; diff --git a/src/libsyntax/ext/base.rs b/src/libsyntax/ext/base.rs index 56868874916..c9bd2986a42 100644 --- a/src/libsyntax/ext/base.rs +++ b/src/libsyntax/ext/base.rs @@ -18,7 +18,6 @@ use parse; use parse::token; use parse::token::{ident_to_str, intern, str_to_ident}; -use std::vec; use std::hashmap::HashMap; // new-style macro! tt code: @@ -362,7 +361,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(), - vec::to_owned(tts)); + tts.to_owned()); 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 9e6776363a8..409873d347b 100644 --- a/src/libsyntax/ext/log_syntax.rs +++ b/src/libsyntax/ext/log_syntax.rs @@ -15,7 +15,6 @@ use ext::base; use print; use parse::token::{get_ident_interner}; -use std::vec; use std::io; pub fn expand_syntax_ext(cx: @ExtCtxt, @@ -26,7 +25,7 @@ pub fn expand_syntax_ext(cx: @ExtCtxt, cx.print_backtrace(); io::stdout().write_line( print::pprust::tt_to_str( - &ast::tt_delim(vec::to_owned(tt)), + &ast::tt_delim(tt.to_owned()), get_ident_interner())); //trivial expression diff --git a/src/libsyntax/ext/quote.rs b/src/libsyntax/ext/quote.rs index c550e3382a2..3e0e9c93fd0 100644 --- a/src/libsyntax/ext/quote.rs +++ b/src/libsyntax/ext/quote.rs @@ -17,8 +17,6 @@ use parse::token::*; use parse::token; use parse; -use std::vec; - /** * * Quasiquoting works via token trees. @@ -653,7 +651,7 @@ fn expand_tts(cx: @ExtCtxt, let p = parse::new_parser_from_tts( cx.parse_sess(), cx.cfg(), - vec::to_owned(tts) + tts.to_owned() ); *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 299706b2d40..ba3b8f22e69 100644 --- a/src/libsyntax/ext/trace_macros.rs +++ b/src/libsyntax/ext/trace_macros.rs @@ -16,8 +16,6 @@ use parse::lexer::{new_tt_reader, reader}; use parse::parser::Parser; use parse::token::keywords; -use std::vec; - pub fn expand_trace_macros(cx: @ExtCtxt, sp: span, tt: &[ast::token_tree]) @@ -27,7 +25,7 @@ pub fn expand_trace_macros(cx: @ExtCtxt, let tt_rdr = new_tt_reader( copy cx.parse_sess().span_diagnostic, None, - vec::to_owned(tt) + tt.to_owned() ); 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 6de504c66fd..a2e3d7bfeca 100644 --- a/src/libsyntax/ext/tt/macro_rules.rs +++ b/src/libsyntax/ext/tt/macro_rules.rs @@ -23,7 +23,6 @@ use parse::token::{get_ident_interner, special_idents, gensym_ident, ident_to_st use parse::token::{FAT_ARROW, SEMI, nt_matchers, nt_tt}; use print; -use std::vec; use std::io; pub fn add_new_extension(cx: @ExtCtxt, @@ -82,7 +81,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(vec::to_owned(arg)), + &ast::tt_delim(arg.to_owned()), get_ident_interner()))); } @@ -99,7 +98,7 @@ pub fn add_new_extension(cx: @ExtCtxt, let arg_rdr = new_tt_reader( s_d, None, - vec::to_owned(arg) + arg.to_owned() ) as @reader; match parse(cx.parse_sess(), cx.cfg(), arg_rdr, *mtcs) { success(named_matches) => { |
