From e9a9581252080853418d386992cdadecbce9f7dc Mon Sep 17 00:00:00 2001
From: Martin Haug <mhaug@live.de>
Date: Sat, 18 Jul 2020 16:57:58 +0200
Subject: =?UTF-8?q?Spanned=20object=20pairs=20and=20refactoring=20?=
 =?UTF-8?q?=F0=9F=A7=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/syntax/func/mod.rs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/syntax/func')

diff --git a/src/syntax/func/mod.rs b/src/syntax/func/mod.rs
index 53bbc14e..54d34531 100644
--- a/src/syntax/func/mod.rs
+++ b/src/syntax/func/mod.rs
@@ -56,11 +56,11 @@ impl FuncArgs {
     }
 }
 
-impl FromIterator<FuncArg> for FuncArgs {
-    fn from_iter<I: IntoIterator<Item=FuncArg>>(iter: I) -> Self {
+impl FromIterator<Spanned<FuncArg>> for FuncArgs {
+    fn from_iter<I: IntoIterator<Item=Spanned<FuncArg>>>(iter: I) -> Self {
         let mut args = FuncArgs::new();
         for item in iter.into_iter() {
-            args.add(item);
+            args.add(item.v);
         }
         args
     }
@@ -72,7 +72,7 @@ pub enum FuncArg {
     /// A positional argument.
     Pos(Spanned<Expr>),
     /// A keyword argument.
-    Key(Pair),
+    Key(Spanned<Pair>),
 }
 
 impl FuncArg {
@@ -83,7 +83,7 @@ impl FuncArg {
     pub fn span(&self) -> Span {
         match self {
             FuncArg::Pos(item) => item.span,
-            FuncArg::Key(Pair { key, value }) => Span::merge(key.span, value.span),
+            FuncArg::Key(item) => item.span,
         }
     }
 }
-- 
cgit v1.2.3