From 685734caab8d291e4e7a8af93a845e54a9a0a9b9 Mon Sep 17 00:00:00 2001 From: Billie Thompson Date: Sat, 2 Oct 2021 08:29:57 +0200 Subject: [PATCH] Support stablised iter_intersperse iter_intersperse was stablised in nightly, meaning we get a conflicting implementation of interspersed. This feels like the easiest way to maintain the functionality while supporting both stable and keeping the path clear for when nightly becomes stable. https://github.com/rust-lang/rust/issues/79524#issuecomment-909663616 https://github.com/rust-lang/rust/pull/88548 --- src/lib.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index a82a592..217dc0d 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -99,12 +99,12 @@ fn format_add_rem(f: &mut fmt::Formatter, added: &str, removed: &str) -> fmt::Re for diff in &diffs { match diff { Difference::Same(text) => { - for blob in text.split('\n').intersperse(NL_LEFT) { + for blob in Itertools::intersperse(text.split('\n'), NL_LEFT) { write!(f, "{}", red(blob))?; } } Difference::Rem(text) => { - for blob in text.split('\n').intersperse(NL_LEFT) { + for blob in Itertools::intersperse(text.split('\n'), NL_LEFT) { write!(f, "{}", on_red(blob))?; } } @@ -118,12 +118,12 @@ fn format_add_rem(f: &mut fmt::Formatter, added: &str, removed: &str) -> fmt::Re for diff in &diffs { match diff { Difference::Same(text) => { - for blob in text.split('\n').intersperse(NL_RIGHT) { + for blob in Itertools::intersperse(text.split('\n'), NL_RIGHT) { write!(f, "{}", green(blob))?; } } Difference::Add(text) => { - for blob in text.split('\n').intersperse(NL_RIGHT) { + for blob in Itertools::intersperse(text.split('\n'), NL_RIGHT) { write!(f, "{}", on_green(blob))?; } }