commit d7d8ec404977db2596a5e5c5e7e08195f98bee61
author David Tolnay <dtolnay@gmail.com> Thu Jun 01 22:37:32 2017 -0700
committer David Tolnay <dtolnay@gmail.com> Thu Jun 01 22:37:32 2017 -0700
tree 3e8f7bd82c693990c78347a70ac5257b2661f1a1
parent 75a1d4a8be3a505fcd090bde40fbf7d75b5b79dc

New syntex

Cargo.toml

diff --git a/Cargo.toml b/Cargo.toml
index a0a4dba..2571383 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -28,7 +28,7 @@
 synom = { version = "0.11", path = "synom" }
 
 [dev-dependencies]
-syntex_pos = "0.58"
-syntex_syntax = "0.58"
+syntex_pos = "0.59"
+syntex_syntax = "0.59"
 tempdir = "0.3.5"
 walkdir = "1.0.1"

tests/test_round_trip.rs

diff --git a/tests/test_round_trip.rs b/tests/test_round_trip.rs
index 21bc51b..517639b 100644
--- a/tests/test_round_trip.rs
+++ b/tests/test_round_trip.rs
@@ -11,6 +11,7 @@
 use syntex_pos::Span;
 use syntex_syntax::ast;
 use syntex_syntax::parse::{self, ParseSess, PResult};
+use syntex_syntax::codemap::FilePathMapping;
 use walkdir::{DirEntry, WalkDir, WalkDirIterator};
 
 use std::fs::File;
@@ -133,7 +134,7 @@
         let back = quote!(#krate).to_string();
 
         let equal = panic::catch_unwind(|| {
-            let sess = ParseSess::new();
+            let sess = ParseSess::new(FilePathMapping::empty());
             let before = match syntex_parse(content, &sess) {
                 Ok(before) => before,
                 Err(mut diagnostic) => {
@@ -194,7 +195,7 @@
     use syntex_syntax::parse::token::{Lit, Token};
     use syntex_syntax::ptr::P;
     use syntex_syntax::symbol::Symbol;
-    use syntex_syntax::tokenstream::{Delimited, SequenceRepetition, TokenTree};
+    use syntex_syntax::tokenstream::{Delimited, TokenTree};
     use syntex_syntax::util::move_map::MoveMap;
     use syntex_syntax::util::small_vector::SmallVector;
 
@@ -376,27 +377,17 @@
             fold::noop_fold_mac(mac, self)
         }
 
-        fn fold_tt(&mut self, tt: &TokenTree) -> TokenTree {
-            match *tt {
+        fn fold_tt(&mut self, tt: TokenTree) -> TokenTree {
+            match tt {
                 TokenTree::Token(span, ref tok) => {
                     TokenTree::Token(self.new_span(span), self.fold_token(tok.clone()))
                 }
                 TokenTree::Delimited(span, ref delimed) => {
                     TokenTree::Delimited(self.new_span(span),
-                                         Rc::new(Delimited {
-                                                     delim: delimed.delim,
-                                                     tts: self.fold_tts(&delimed.tts),
-                                                 }))
-                }
-                TokenTree::Sequence(span, ref seq) => {
-                    TokenTree::Sequence(self.new_span(span),
-                                        Rc::new(SequenceRepetition {
-                                            tts: self.fold_tts(&seq.tts),
-                                            separator: seq.separator
-                                                .clone()
-                                                .map(|tok| self.fold_token(tok)),
-                                            ..**seq
-                                        }))
+                                         Delimited {
+                                             delim: delimed.delim,
+                                             tts: self.fold_tts(delimed.tts.clone().into()).into(),
+                                         })
                 }
             }
         }
@@ -415,9 +406,6 @@
                     Token::Interpolated(Rc::new(self.fold_interpolated(nt)))
                 }
                 Token::SubstNt(ident) => Token::SubstNt(self.fold_ident(ident)),
-                Token::MatchNt(name, kind) => {
-                    Token::MatchNt(self.fold_ident(name), self.fold_ident(kind))
-                }
                 _ => t,
             }
         }