From ffcc680f9cc26b5b2cb2f453a89dbcf8144f8b9b Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Sun, 12 May 2013 16:50:57 -0400 Subject: Fix test fallout from removing vecs_implicitly_copyable --- src/libsyntax/ast_util.rs | 16 ++++++++-------- src/libsyntax/ext/expand.rs | 20 ++++++++------------ src/libsyntax/parse/mod.rs | 13 ++++++------- src/libsyntax/parse/parser.rs | 2 +- 4 files changed, 23 insertions(+), 28 deletions(-) (limited to 'src/libsyntax') diff --git a/src/libsyntax/ast_util.rs b/src/libsyntax/ast_util.rs index 0ea0dcf16f6..212ceadf912 100644 --- a/src/libsyntax/ast_util.rs +++ b/src/libsyntax/ast_util.rs @@ -679,19 +679,19 @@ mod test { #[test] fn xorpush_test () { let mut s = ~[]; xorPush(&mut s,14); - assert_eq!(s,~[14]); + assert_eq!(copy s,~[14]); xorPush(&mut s,14); - assert_eq!(s,~[]); + assert_eq!(copy s,~[]); xorPush(&mut s,14); - assert_eq!(s,~[14]); + assert_eq!(copy s,~[14]); xorPush(&mut s,15); - assert_eq!(s,~[14,15]); + assert_eq!(copy s,~[14,15]); xorPush (&mut s,16); - assert_eq! (s,~[14,15,16]); + assert_eq!(copy s,~[14,15,16]); xorPush (&mut s,16); - assert_eq! (s,~[14,15]); + assert_eq!(copy s,~[14,15]); xorPush (&mut s,15); - assert_eq! (s,~[14]); + assert_eq!(copy s,~[14]); } // convert a list of uints to an @~[ident] @@ -746,7 +746,7 @@ mod test { let mut t = mk_sctable(); let test_sc = ~[M(3),R(id(101,0),14),M(9)]; - assert_eq!(unfold_test_sc(test_sc,empty_ctxt,&mut t),3); + assert_eq!(unfold_test_sc(copy test_sc,empty_ctxt,&mut t),3); assert_eq!(t[1],Mark(9,0)); assert_eq!(t[2],Rename(id(101,0),14,1)); assert_eq!(t[3],Mark(3,2)); diff --git a/src/libsyntax/ext/expand.rs b/src/libsyntax/ext/expand.rs index 55229edfa18..9afbe1e479d 100644 --- a/src/libsyntax/ext/expand.rs +++ b/src/libsyntax/ext/expand.rs @@ -662,12 +662,11 @@ mod test { #[test] fn fail_exists_test () { let src = ~"fn main() { fail!(\"something appropriately gloomy\");}"; let sess = parse::new_parse_sess(None); - let cfg = ~[]; let crate_ast = parse::parse_crate_from_source_str( ~"", @src, - cfg,sess); - expand_crate(sess,cfg,crate_ast); + ~[],sess); + expand_crate(sess,~[],crate_ast); } // these following tests are quite fragile, in that they don't test what @@ -679,13 +678,12 @@ mod test { let src = ~"fn bogus() {macro_rules! z (() => (3+4))}\ fn inty() -> int { z!() }"; let sess = parse::new_parse_sess(None); - let cfg = ~[]; let crate_ast = parse::parse_crate_from_source_str( ~"", @src, - cfg,sess); + ~[],sess); // should fail: - expand_crate(sess,cfg,crate_ast); + expand_crate(sess,~[],crate_ast); } // make sure that macros can leave scope for modules @@ -694,13 +692,12 @@ mod test { let src = ~"mod foo {macro_rules! z (() => (3+4))}\ fn inty() -> int { z!() }"; let sess = parse::new_parse_sess(None); - let cfg = ~[]; let crate_ast = parse::parse_crate_from_source_str( ~"", @src, - cfg,sess); + ~[],sess); // should fail: - expand_crate(sess,cfg,crate_ast); + expand_crate(sess,~[],crate_ast); } // macro_escape modules shouldn't cause macros to leave scope @@ -708,13 +705,12 @@ mod test { let src = ~"#[macro_escape] mod foo {macro_rules! z (() => (3+4))}\ fn inty() -> int { z!() }"; let sess = parse::new_parse_sess(None); - let cfg = ~[]; let crate_ast = parse::parse_crate_from_source_str( ~"", @src, - cfg,sess); + ~[], sess); // should fail: - expand_crate(sess,cfg,crate_ast); + expand_crate(sess,~[],crate_ast); } #[test] fn core_macros_must_parse () { diff --git a/src/libsyntax/parse/mod.rs b/src/libsyntax/parse/mod.rs index bbd93b71d36..9a8a6620652 100644 --- a/src/libsyntax/parse/mod.rs +++ b/src/libsyntax/parse/mod.rs @@ -351,15 +351,14 @@ mod test { use core::option::None; use core::int; use core::num::NumCast; - use core::path::Path; - use codemap::{dummy_sp, CodeMap, span, BytePos, spanned}; + use codemap::{CodeMap, span, BytePos, spanned}; use opt_vec; use ast; use abi; use ast_util::mk_ident; use parse::parser::Parser; - use parse::token::{ident_interner, mk_ident_interner, mk_fresh_ident_interner}; - use diagnostic::{span_handler, mk_span_handler, mk_handler, Emitter}; + use parse::token::{ident_interner, mk_fresh_ident_interner}; + use diagnostic::{mk_span_handler, mk_handler}; // add known names to interner for testing fn mk_testing_interner() -> @ident_interner { @@ -408,7 +407,7 @@ mod test { // map a string to tts, return the tt without its parsesess fn string_to_tts_only(source_str : @~str) -> ~[ast::token_tree] { - let (tts,ps) = string_to_tts_t(source_str); + let (tts,_ps) = string_to_tts_t(source_str); tts } @@ -483,7 +482,7 @@ mod test { }*/ #[test] fn string_to_tts_1 () { - let (tts,ps) = string_to_tts_t(@~"fn a (b : int) { b; }"); + let (tts,_ps) = string_to_tts_t(@~"fn a (b : int) { b; }"); assert_eq!(to_json_str(@tts), ~"[\ [\"tt_tok\",null,[\"IDENT\",\"fn\",false]],\ @@ -548,7 +547,7 @@ mod test { } fn parser_done(p: Parser){ - assert_eq!(*p.token,token::EOF); + assert_eq!(copy *p.token,token::EOF); } #[test] fn parse_ident_pat () { diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 2a7af36f6f2..e1fe20695c7 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -2388,7 +2388,7 @@ pub impl Parser { // preceded by unary-minus) or identifiers. let val = self.parse_literal_maybe_minus(); if self.eat(&token::DOTDOT) { - let end = if is_ident_or_path(&tok) { + let end = if is_ident_or_path(tok) { let path = self.parse_path_with_tps(true); let hi = self.span.hi; self.mk_expr(lo, hi, expr_path(path)) -- cgit 1.4.1-3-g733a5