From d379ad111ccef354730e51edea8119341a8e7871 Mon Sep 17 00:00:00 2001 From: Eduard Burtescu Date: Sat, 5 Apr 2014 16:24:28 +0300 Subject: syntax: tests: fix fallout from using ptr::P. --- src/libsyntax/ext/expand.rs | 3 ++- src/libsyntax/fold.rs | 2 +- src/libsyntax/parse/mod.rs | 16 ++++++++-------- src/libsyntax/print/pprust.rs | 7 ++++--- src/libsyntax/util/parser_testing.rs | 4 +--- 5 files changed, 16 insertions(+), 16 deletions(-) (limited to 'src/libsyntax') diff --git a/src/libsyntax/ext/expand.rs b/src/libsyntax/ext/expand.rs index db28872de37..310f7c4f303 100644 --- a/src/libsyntax/ext/expand.rs +++ b/src/libsyntax/ext/expand.rs @@ -1130,6 +1130,7 @@ mod test { use fold::Folder; use parse; use parse::token; + use ptr::P; use util::parser_testing::{string_to_parser}; use util::parser_testing::{string_to_pat, string_to_crate, strs_to_idents}; use visit; @@ -1239,7 +1240,7 @@ mod test { let attr1 = make_dummy_attr ("foo"); let attr2 = make_dummy_attr ("bar"); let escape_attr = make_dummy_attr ("macro_escape"); - let attrs1 = vec!(attr1, escape_attr, attr2); + let attrs1 = vec!(attr1.clone(), escape_attr, attr2.clone()); assert_eq!(contains_macro_escape(attrs1.as_slice()),true); let attrs2 = vec!(attr1,attr2); assert_eq!(contains_macro_escape(attrs2.as_slice()),false); diff --git a/src/libsyntax/fold.rs b/src/libsyntax/fold.rs index e86ce6e868c..44ed347d70c 100644 --- a/src/libsyntax/fold.rs +++ b/src/libsyntax/fold.rs @@ -1236,7 +1236,7 @@ mod test { fn fold_ident(&mut self, _: ast::Ident) -> ast::Ident { token::str_to_ident("zz") } - fn fold_mac(&mut self, macro: &ast::Mac) -> ast::Mac { + fn fold_mac(&mut self, macro: ast::Mac) -> ast::Mac { fold::noop_fold_mac(macro, self) } } diff --git a/src/libsyntax/parse/mod.rs b/src/libsyntax/parse/mod.rs index c4ee1b60da4..e5b6359000b 100644 --- a/src/libsyntax/parse/mod.rs +++ b/src/libsyntax/parse/mod.rs @@ -702,7 +702,6 @@ pub fn integer_lit(s: &str, sd: &SpanHandler, sp: Span) -> ast::Lit_ { mod test { use super::*; use serialize::json; - use std::gc::GC; use codemap::{Span, BytePos, Spanned}; use owned_slice::OwnedSlice; use ast; @@ -711,6 +710,7 @@ mod test { use attr::AttrMetaMethods; use parse::parser::Parser; use parse::token::{str_to_ident}; + use ptr::P; use util::parser_testing::{string_to_tts, string_to_parser}; use util::parser_testing::{string_to_expr, string_to_item}; use util::parser_testing::string_to_stmt; @@ -1023,10 +1023,10 @@ mod test { P(ast::Item{ident:str_to_ident("a"), attrs:Vec::new(), id: ast::DUMMY_NODE_ID, - node: ast::ItemFn(ast::P(ast::FnDecl { + node: ast::ItemFn(P(ast::FnDecl { inputs: vec!(ast::Arg{ - ty: ast::P(ast::Ty{id: ast::DUMMY_NODE_ID, - node: ast::TyPath(ast::Path{ + ty: P(ast::Ty{id: ast::DUMMY_NODE_ID, + node: ast::TyPath(ast::Path{ span:sp(10,13), global:false, segments: vec!( @@ -1053,9 +1053,9 @@ mod test { }), id: ast::DUMMY_NODE_ID }), - output: ast::P(ast::Ty{id: ast::DUMMY_NODE_ID, - node: ast::TyNil, - span:sp(15,15)}), // not sure + output: P(ast::Ty{id: ast::DUMMY_NODE_ID, + node: ast::TyNil, + span:sp(15,15)}), // not sure cf: ast::Return, variadic: false }), @@ -1069,7 +1069,7 @@ mod test { predicates: Vec::new(), } }, - ast::P(ast::Block { + P(ast::Block { view_items: Vec::new(), stmts: vec!(P(Spanned{ node: ast::StmtSemi(P(ast::Expr{ diff --git a/src/libsyntax/print/pprust.rs b/src/libsyntax/print/pprust.rs index 4d46da8d835..d0df95d711e 100644 --- a/src/libsyntax/print/pprust.rs +++ b/src/libsyntax/print/pprust.rs @@ -2786,6 +2786,7 @@ mod test { use ast_util; use codemap; use parse::token; + use ptr::P; #[test] fn test_fun_to_string() { @@ -2793,9 +2794,9 @@ mod test { let decl = ast::FnDecl { inputs: Vec::new(), - output: ast::P(ast::Ty {id: 0, - node: ast::TyNil, - span: codemap::DUMMY_SP}), + output: P(ast::Ty {id: 0, + node: ast::TyNil, + span: codemap::DUMMY_SP}), cf: ast::Return, variadic: false }; diff --git a/src/libsyntax/util/parser_testing.rs b/src/libsyntax/util/parser_testing.rs index bc5b9bc6c18..d0faa3c6820 100644 --- a/src/libsyntax/util/parser_testing.rs +++ b/src/libsyntax/util/parser_testing.rs @@ -9,14 +9,12 @@ // except according to those terms. use ast; -use ast::P; use parse::{new_parse_sess}; use parse::{ParseSess,string_to_filemap,filemap_to_tts}; use parse::{new_parser_from_source_str}; use parse::parser::Parser; use parse::token; - -use std::gc::Gc; +use ptr::P; /// Map a string to tts, using a made-up filename: pub fn string_to_tts(source_str: String) -> Vec { -- cgit 1.4.1-3-g733a5