diff options
| author | Jeffrey Seyfried <jeffrey.seyfried@gmail.com> | 2016-07-04 10:25:50 +0000 |
|---|---|---|
| committer | Jeffrey Seyfried <jeffrey.seyfried@gmail.com> | 2016-07-04 23:42:35 +0000 |
| commit | 547a930835be262ebea5e499dba7555a8a47b992 (patch) | |
| tree | cb767c17cf669224da4461a41aff4aee07e647bf /src/libsyntax/parse/mod.rs | |
| parent | c2b56fb7a0c24e04227318ca7e5950e9289ee3e4 (diff) | |
| download | rust-547a930835be262ebea5e499dba7555a8a47b992.tar.gz rust-547a930835be262ebea5e499dba7555a8a47b992.zip | |
Revert "Change `fold_tt` and `fold_tts` to take token trees by value (instead of by reference)"
This reverts commit 5bf7970ac70b4e7781e7b2f3816720aa62fac6fd.
Diffstat (limited to 'src/libsyntax/parse/mod.rs')
| -rw-r--r-- | src/libsyntax/parse/mod.rs | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/libsyntax/parse/mod.rs b/src/libsyntax/parse/mod.rs index bbcc044d43c..9502bc48a3e 100644 --- a/src/libsyntax/parse/mod.rs +++ b/src/libsyntax/parse/mod.rs @@ -662,6 +662,7 @@ pub fn integer_lit(s: &str, #[cfg(test)] mod tests { use super::*; + use std::rc::Rc; use syntax_pos::{Span, BytePos, Pos, NO_EXPANSION}; use codemap::Spanned; use ast::{self, PatKind}; @@ -763,7 +764,7 @@ mod tests { ) if first_delimed.delim == token::Paren && ident.name.as_str() == "a" => {}, - _ => panic!("value 3: {:?}", *first_delimed), + _ => panic!("value 3: {:?}", **first_delimed), } let tts = &second_delimed.tts[..]; match (tts.len(), tts.get(0), tts.get(1)) { @@ -774,10 +775,10 @@ mod tests { ) if second_delimed.delim == token::Paren && ident.name.as_str() == "a" => {}, - _ => panic!("value 4: {:?}", *second_delimed), + _ => panic!("value 4: {:?}", **second_delimed), } }, - _ => panic!("value 2: {:?}", *macro_delimed), + _ => panic!("value 2: {:?}", **macro_delimed), } }, _ => panic!("value: {:?}",tts), @@ -793,7 +794,7 @@ mod tests { TokenTree::Token(sp(3, 4), token::Ident(str_to_ident("a"))), TokenTree::Delimited( sp(5, 14), - tokenstream::Delimited { + Rc::new(tokenstream::Delimited { delim: token::DelimToken::Paren, open_span: sp(5, 6), tts: vec![ @@ -802,10 +803,10 @@ mod tests { TokenTree::Token(sp(10, 13), token::Ident(str_to_ident("i32"))), ], close_span: sp(13, 14), - }), + })), TokenTree::Delimited( sp(15, 21), - tokenstream::Delimited { + Rc::new(tokenstream::Delimited { delim: token::DelimToken::Brace, open_span: sp(15, 16), tts: vec![ @@ -813,7 +814,7 @@ mod tests { TokenTree::Token(sp(18, 19), token::Semi), ], close_span: sp(20, 21), - }) + })) ]; assert_eq!(tts, expected); |
