Skip to content

Commit 18b7e8a

Browse files
committed
Remove bad formatting from wrong fmt version
1 parent 0c5e398 commit 18b7e8a

File tree

2 files changed

+6
-30
lines changed

2 files changed

+6
-30
lines changed

library/core/src/iter/adapters/mod.rs

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -679,11 +679,7 @@ where
679679
fn next_back_index(&self) -> usize {
680680
let rem = self.iter.len() % (self.step + 1);
681681
if self.first_take {
682-
if rem == 0 {
683-
self.step
684-
} else {
685-
rem - 1
686-
}
682+
if rem == 0 { self.step } else { rem - 1 }
687683
} else {
688684
rem
689685
}
@@ -2213,11 +2209,7 @@ where
22132209
I: DoubleEndedIterator + ExactSizeIterator,
22142210
{
22152211
fn next_back(&mut self) -> Option<Self::Item> {
2216-
if self.len() > 0 {
2217-
self.iter.next_back()
2218-
} else {
2219-
None
2220-
}
2212+
if self.len() > 0 { self.iter.next_back() } else { None }
22212213
}
22222214

22232215
#[inline]
@@ -2247,11 +2239,7 @@ where
22472239
move |acc, x| {
22482240
n -= 1;
22492241
let r = fold(acc, x);
2250-
if n == 0 {
2251-
LoopState::Break(r)
2252-
} else {
2253-
LoopState::from_try(r)
2254-
}
2242+
if n == 0 { LoopState::Break(r) } else { LoopState::from_try(r) }
22552243
}
22562244
}
22572245

@@ -2362,11 +2350,7 @@ where
23622350
move |acc, x| {
23632351
*n -= 1;
23642352
let r = fold(acc, x);
2365-
if *n == 0 {
2366-
LoopState::Break(r)
2367-
} else {
2368-
LoopState::from_try(r)
2369-
}
2353+
if *n == 0 { LoopState::Break(r) } else { LoopState::from_try(r) }
23702354
}
23712355
}
23722356

library/core/tests/iter.rs

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -226,11 +226,7 @@ impl Iterator for Toggle {
226226
}
227227

228228
fn size_hint(&self) -> (usize, Option<usize>) {
229-
if self.is_empty {
230-
(0, Some(0))
231-
} else {
232-
(1, Some(1))
233-
}
229+
if self.is_empty { (0, Some(0)) } else { (1, Some(1)) }
234230
}
235231
}
236232

@@ -1607,11 +1603,7 @@ fn test_find_map() {
16071603
assert_eq!(iter.next(), Some(&7));
16081604

16091605
fn half_if_even(x: &isize) -> Option<isize> {
1610-
if x % 2 == 0 {
1611-
Some(x / 2)
1612-
} else {
1613-
None
1614-
}
1606+
if x % 2 == 0 { Some(x / 2) } else { None }
16151607
}
16161608
}
16171609

0 commit comments

Comments
 (0)