commit 8875fcaba82c38a7e814bb76cd746951bcfc310e
author David Tolnay <dtolnay@gmail.com> Sun Dec 31 13:52:37 2017 -0500
committer David Tolnay <dtolnay@gmail.com> Sun Dec 31 13:52:37 2017 -0500
tree 8d32797e05a9b386fa705569293a82f588898842
parent 3bc597fc3f0855e7ae329675fb59f6ad3d30cfbc

Parse delimiter before contents

src/ty.rs

diff --git a/src/ty.rs b/src/ty.rs
index 69d7d21..dc520df 100644
--- a/src/ty.rs
+++ b/src/ty.rs
@@ -400,7 +400,7 @@
     impl Synom for TypeSlice {
         named!(parse -> Self, map!(
             brackets!(syn!(Type)),
-            |(ty, b)| TypeSlice {
+            |(b, ty)| TypeSlice {
                 elem: Box::new(ty),
                 bracket_token: b,
             }
@@ -419,7 +419,7 @@
                     len: syn!(Expr) >>
                     (elem, semi, len)
             )),
-            |((elem, semi, len), brackets)| {
+            |(brackets, (elem, semi, len))| {
                 TypeArray {
                     elem: Box::new(elem),
                     len: len,
@@ -493,10 +493,10 @@
                 abi: abi,
                 lifetimes: lifetimes,
                 output: output,
-                variadic: (parens.0).1,
+                variadic: (parens.1).1,
                 fn_token: fn_,
-                paren_token: parens.1,
-                inputs: (parens.0).0,
+                paren_token: parens.0,
+                inputs: (parens.1).0,
             })
         ));
 
@@ -531,8 +531,8 @@
         named!(parse -> Self, do_parse!(
             data: parens!(Delimited::parse_terminated) >>
             (TypeTuple {
-                elems: data.0,
-                paren_token: data.1,
+                paren_token: data.0,
+                elems: data.1,
             })
         ));
 
@@ -611,8 +611,8 @@
             data: parens!(Delimited::parse_terminated) >>
             output: syn!(ReturnType) >>
             (ParenthesizedGenericArguments {
-                paren_token: data.1,
-                inputs: data.0,
+                paren_token: data.0,
+                inputs: data.1,
                 output: output,
             })
         ));
@@ -689,8 +689,8 @@
         named!(parse -> Self, do_parse!(
             data: grouped!(syn!(Type)) >>
             (TypeGroup {
-                group_token: data.1,
-                elem: Box::new(data.0),
+                group_token: data.0,
+                elem: Box::new(data.1),
             })
         ));
     }
@@ -704,8 +704,8 @@
             data: parens!(syn!(Type)) >>
             cond!(allow_plus, not!(punct!(+))) >>
             (TypeParen {
-                paren_token: data.1,
-                elem: Box::new(data.0),
+                paren_token: data.0,
+                elem: Box::new(data.1),
             })
         ));
     }