From 8e4c20da80eb31b57abcb695d76cc8720c95e395 Mon Sep 17 00:00:00 2001 From: Shotaro Yamada Date: Fri, 29 Mar 2019 17:30:39 +0900 Subject: [PATCH] Write seperator beforehand --- src/imports.rs | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/imports.rs b/src/imports.rs index aa2459f7f86..b0ead7a87b9 100644 --- a/src/imports.rs +++ b/src/imports.rs @@ -205,11 +205,10 @@ impl fmt::Display for UseSegment { UseSegment::List(ref list) => { write!(f, "{{")?; for (i, item) in list.iter().enumerate() { - let is_last = i == list.len() - 1; - write!(f, "{}", item)?; - if !is_last { + if i != 0 { write!(f, ", ")?; } + write!(f, "{}", item)?; } write!(f, "}}") } @@ -219,11 +218,10 @@ impl fmt::Display for UseSegment { impl fmt::Display for UseTree { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { for (i, segment) in self.path.iter().enumerate() { - let is_last = i == self.path.len() - 1; - write!(f, "{}", segment)?; - if !is_last { + if i != 0 { write!(f, "::")?; } + write!(f, "{}", segment)?; } Ok(()) }