diff options
| author | Mazdak Farrokhzad <twingoow@gmail.com> | 2019-08-22 15:15:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-22 15:15:45 +0200 |
| commit | 3068064430322888279b60ccec258d7f4bcd4a32 (patch) | |
| tree | 4a06a284e9cdeb6656744b45fa5f183507221105 /src/libcore | |
| parent | aa9490bd7b646f7b62cf831c462cde45598b468f (diff) | |
| parent | edabcddf4dbcc70228ac1db03b10df60decaf83a (diff) | |
Rollup merge of #63805 - mati865:clippy, r=Centril
Apply few Clippy suggestions Somewhat follow-up of https://github.com/rust-lang/rust/pull/62806 Changes per commit are rather small so I can squash them if that's preferred.
Diffstat (limited to 'src/libcore')
| -rw-r--r-- | src/libcore/iter/adapters/mod.rs | 4 | ||||
| -rw-r--r-- | src/libcore/slice/mod.rs | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/libcore/iter/adapters/mod.rs b/src/libcore/iter/adapters/mod.rs index a63434abd6c..f50781890ab 100644 --- a/src/libcore/iter/adapters/mod.rs +++ b/src/libcore/iter/adapters/mod.rs @@ -1309,7 +1309,7 @@ impl<I> DoubleEndedIterator for Peekable<I> where I: DoubleEndedIterator { Self: Sized, F: FnMut(B, Self::Item) -> R, R: Try<Ok=B> { match self.peeked.take() { - Some(None) => return Try::from_ok(init), + Some(None) => Try::from_ok(init), Some(Some(v)) => match self.iter.try_rfold(init, &mut f).into_result() { Ok(acc) => f(acc, v), Err(e) => { @@ -1326,7 +1326,7 @@ impl<I> DoubleEndedIterator for Peekable<I> where I: DoubleEndedIterator { where Fold: FnMut(Acc, Self::Item) -> Acc, { match self.peeked { - Some(None) => return init, + Some(None) => init, Some(Some(v)) => { let acc = self.iter.rfold(init, &mut fold); fold(acc, v) diff --git a/src/libcore/slice/mod.rs b/src/libcore/slice/mod.rs index bfbbb15c8d4..931768564ca 100644 --- a/src/libcore/slice/mod.rs +++ b/src/libcore/slice/mod.rs @@ -3026,8 +3026,7 @@ macro_rules! len { if size == 0 { // This _cannot_ use `unchecked_sub` because we depend on wrapping // to represent the length of long ZST slice iterators. - let diff = ($self.end as usize).wrapping_sub(start as usize); - diff + ($self.end as usize).wrapping_sub(start as usize) } else { // We know that `start <= end`, so can do better than `offset_from`, // which needs to deal in signed. By setting appropriate flags here |
