From 8d4cb6e783c076829568bb82dcd5a0c888a09cb7 Mon Sep 17 00:00:00 2001 From: Ruben Schmidmeister Date: Sat, 18 May 2019 11:42:49 +0200 Subject: [PATCH] Use peek() instead of checking indexes --- src/attr/doc_comment.rs | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/attr/doc_comment.rs b/src/attr/doc_comment.rs index e687492fb892..1affc7bc910d 100644 --- a/src/attr/doc_comment.rs +++ b/src/attr/doc_comment.rs @@ -16,14 +16,12 @@ impl<'a> DocCommentFormatter<'a> { impl Display for DocCommentFormatter<'_> { fn fmt(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result { let opener = self.style.opener().trim_end(); - let literal_as_str = self.literal.as_str().get(); - let line_count = literal_as_str.lines().count(); - let last_line_index = line_count - 1; - let lines = literal_as_str.lines().enumerate(); - for (index, line) in lines { - if index == last_line_index { + let mut lines = literal_as_str.lines().peekable(); + while let Some(line) = lines.next() { + let is_last_line = lines.peek().is_none(); + if is_last_line { write!(formatter, "{}{}", opener, line)?; } else { writeln!(formatter, "{}{}", opener, line)?;