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/tokenstream.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/tokenstream.rs')
| -rw-r--r-- | src/libsyntax/tokenstream.rs | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/libsyntax/tokenstream.rs b/src/libsyntax/tokenstream.rs index 35377d14bab..f0f0a7bc580 100644 --- a/src/libsyntax/tokenstream.rs +++ b/src/libsyntax/tokenstream.rs @@ -21,6 +21,8 @@ use parse::lexer::comments::{doc_comment_style, strip_doc_comment_decoration}; use parse::lexer; use parse::token; +use std::rc::Rc; + /// A delimited sequence of token trees #[derive(Clone, PartialEq, Eq, RustcEncodable, RustcDecodable, Hash, Debug)] pub struct Delimited { @@ -94,13 +96,13 @@ pub enum TokenTree { /// A single token Token(Span, token::Token), /// A delimited sequence of token trees - Delimited(Span, Delimited), + Delimited(Span, Rc<Delimited>), // This only makes sense in MBE macros. /// A kleene-style repetition sequence with a span // FIXME(eddyb) #12938 Use DST. - Sequence(Span, SequenceRepetition), + Sequence(Span, Rc<SequenceRepetition>), } impl TokenTree { @@ -149,7 +151,7 @@ impl TokenTree { Some(*cnt) }).max().unwrap_or(0); - TokenTree::Delimited(sp, Delimited { + TokenTree::Delimited(sp, Rc::new(Delimited { delim: token::Bracket, open_span: sp, tts: vec![TokenTree::Token(sp, token::Ident(token::str_to_ident("doc"))), @@ -157,7 +159,7 @@ impl TokenTree { TokenTree::Token(sp, token::Literal( token::StrRaw(token::intern(&stripped), num_of_hashes), None))], close_span: sp, - }) + })) } (&TokenTree::Delimited(_, ref delimed), _) => { if index == 0 { |
