Skip to content

Commit a2b3aef

Browse files
bors[bot]phimuemue
andauthored
Merge #492
492: Use try_for_each r=jswrenn a=phimuemue Similar to `for_each`, we can use `try_for_each` in some places. Co-authored-by: philipp <descpl@yahoo.de>
2 parents b1fbc51 + f654f0a commit a2b3aef

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

src/format.rs

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,12 @@ impl<'a, I, F> fmt::Display for FormatWith<'a, I, F>
5959

6060
if let Some(fst) = iter.next() {
6161
format(fst, &mut |disp: &dyn fmt::Display| disp.fmt(f))?;
62-
for elt in iter {
62+
iter.try_for_each(|elt| {
6363
if !self.sep.is_empty() {
64-
6564
f.write_str(self.sep)?;
6665
}
67-
format(elt, &mut |disp: &dyn fmt::Display| disp.fmt(f))?;
68-
}
66+
format(elt, &mut |disp: &dyn fmt::Display| disp.fmt(f))
67+
})?;
6968
}
7069
Ok(())
7170
}
@@ -84,12 +83,12 @@ impl<'a, I> Format<'a, I>
8483

8584
if let Some(fst) = iter.next() {
8685
cb(&fst, f)?;
87-
for elt in iter {
86+
iter.try_for_each(|elt| {
8887
if !self.sep.is_empty() {
8988
f.write_str(self.sep)?;
9089
}
91-
cb(&elt, f)?;
92-
}
90+
cb(&elt, f)
91+
})?;
9392
}
9493
Ok(())
9594
}

0 commit comments

Comments
 (0)