Skip to content

Commit 685734c

Browse files
committed
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. rust-lang/rust#79524 (comment) rust-lang/rust#88548
1 parent b69a54c commit 685734c

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

Diff for: src/lib.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -99,12 +99,12 @@ fn format_add_rem(f: &mut fmt::Formatter, added: &str, removed: &str) -> fmt::Re
9999
for diff in &diffs {
100100
match diff {
101101
Difference::Same(text) => {
102-
for blob in text.split('\n').intersperse(NL_LEFT) {
102+
for blob in Itertools::intersperse(text.split('\n'), NL_LEFT) {
103103
write!(f, "{}", red(blob))?;
104104
}
105105
}
106106
Difference::Rem(text) => {
107-
for blob in text.split('\n').intersperse(NL_LEFT) {
107+
for blob in Itertools::intersperse(text.split('\n'), NL_LEFT) {
108108
write!(f, "{}", on_red(blob))?;
109109
}
110110
}
@@ -118,12 +118,12 @@ fn format_add_rem(f: &mut fmt::Formatter, added: &str, removed: &str) -> fmt::Re
118118
for diff in &diffs {
119119
match diff {
120120
Difference::Same(text) => {
121-
for blob in text.split('\n').intersperse(NL_RIGHT) {
121+
for blob in Itertools::intersperse(text.split('\n'), NL_RIGHT) {
122122
write!(f, "{}", green(blob))?;
123123
}
124124
}
125125
Difference::Add(text) => {
126-
for blob in text.split('\n').intersperse(NL_RIGHT) {
126+
for blob in Itertools::intersperse(text.split('\n'), NL_RIGHT) {
127127
write!(f, "{}", on_green(blob))?;
128128
}
129129
}

0 commit comments

Comments
 (0)