From 8f7a17e0f48e3586fae619be08351c6761b07596 Mon Sep 17 00:00:00 2001
From: Greg Brown <gmb60@cam.ac.uk>
Date: Tue, 19 Jan 2021 22:37:35 +0000
Subject: Remove usage of `extra-traits` feature of syn.

---
 src/nibble/convert.rs | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/nibble/convert.rs')

diff --git a/src/nibble/convert.rs b/src/nibble/convert.rs
index e3c8bfc..f7c20be 100644
--- a/src/nibble/convert.rs
+++ b/src/nibble/convert.rs
@@ -206,25 +206,25 @@ impl Convert for Cat {
         let mut iter = self.0.into_pairs();
 
         let (first, punct) = match iter.next().unwrap() {
-            Pair::Punctuated(t, p) => (t.convert(context)?, Some(p)),
+            Pair::Punctuated(t, p) => (t.convert(context)?, Some(p.span)),
             Pair::End(t) => (t.convert(context)?, None),
         };
 
         let mut rest = Vec::new();
         let (span, _) = iter.try_fold(
             (
-                first.span.and_then(|s| punct.and_then(|p| s.join(p.span))),
+                first.span.and_then(|s| punct.and_then(|p| s.join(p))),
                 punct,
             ),
             |(span, punct), pair| {
                 let (snd, p) = match pair {
-                    Pair::Punctuated(t, p) => (t.convert(context)?, Some(p)),
+                    Pair::Punctuated(t, p) => (t.convert(context)?, Some(p.span)),
                     Pair::End(t) => (t.convert(context)?, None),
                 };
 
                 let span = span
                     .and_then(|s| snd.span.and_then(|t| s.join(t)))
-                    .and_then(|s| p.and_then(|p| s.join(p.span)));
+                    .and_then(|s| p.and_then(|p| s.join(p)));
                 rest.push((punct, snd));
                 Ok((span, p))
             },
@@ -268,25 +268,25 @@ impl Convert for Alt {
         let mut iter = self.0.into_pairs();
 
         let (first, punct) = match iter.next().unwrap() {
-            Pair::Punctuated(t, p) => (t.convert(context)?, Some(p)),
+            Pair::Punctuated(t, p) => (t.convert(context)?, Some(p.span)),
             Pair::End(t) => (t.convert(context)?, None),
         };
 
         let mut rest = Vec::new();
         let (span, _) = iter.try_fold(
             (
-                first.span.and_then(|s| punct.and_then(|p| s.join(p.span))),
+                first.span.and_then(|s| punct.and_then(|p| s.join(p))),
                 punct,
             ),
             |(span, punct), pair| {
                 let (snd, p) = match pair {
-                    Pair::Punctuated(t, p) => (t.convert(context)?, Some(p)),
+                    Pair::Punctuated(t, p) => (t.convert(context)?, Some(p.span)),
                     Pair::End(t) => (t.convert(context)?, None),
                 };
 
                 let span = span
                     .and_then(|s| snd.span.and_then(|t| s.join(t)))
-                    .and_then(|s| p.and_then(|p| s.join(p.span)));
+                    .and_then(|s| p.and_then(|p| s.join(p)));
                 rest.push((punct, snd));
                 Ok((span, p))
             },
-- 
cgit v1.2.3