From 1cbee42df4868a92de5b18a174592497d451a814 Mon Sep 17 00:00:00 2001
From: Ceri Storey
Date: Sat, 27 Mar 2021 10:47:00 +0000
Subject: Avoid ambiguity from use of Itertools::intersperse.

---
 dhall/src/builtins.rs           | 7 ++++---
 dhall/src/syntax/text/parser.rs | 4 +---
 2 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'dhall')

diff --git a/dhall/src/builtins.rs b/dhall/src/builtins.rs
index 123e03d..82cb5ff 100644
--- a/dhall/src/builtins.rs
+++ b/dhall/src/builtins.rs
@@ -451,9 +451,10 @@ fn apply_builtin<'cx>(
                             );
 
                             Ret::Nir(Nir::from_kind(NirKind::TextLit(
-                                nze::nir::TextLit::new(
-                                    parts.intersperse(replacement),
-                                ),
+                                nze::nir::TextLit::new(Itertools::intersperse(
+                                    parts,
+                                    replacement,
+                                )),
                             )))
                         }
                     } else {
diff --git a/dhall/src/syntax/text/parser.rs b/dhall/src/syntax/text/parser.rs
index 07921b5..d17ac61 100644
--- a/dhall/src/syntax/text/parser.rs
+++ b/dhall/src/syntax/text/parser.rs
@@ -279,9 +279,7 @@ impl DhallParser {
 
                 trim_indent(&mut lines);
 
-                lines
-                    .into_iter()
-                    .intersperse(newline)
+                Itertools::intersperse(lines.into_iter(), newline)
                     .flat_map(InterpolatedText::into_iter)
                     .collect::<ParsedText>()
             }
-- 
cgit v1.2.3