clippy: Resolve collapsible_if

TEST=bin/clippy

Change-Id: I1884c90e2efce3b972802e68a0a9d9395faa0f4c
Reviewed-on: https://chromium-review.googlesource.com/1566660
Commit-Ready: David Tolnay <dtolnay@chromium.org>
Tested-by: David Tolnay <dtolnay@chromium.org>
Tested-by: kokoro <noreply+kokoro@google.com>
Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
This commit is contained in:
David Tolnay 2019-04-12 18:39:11 -07:00 committed by chrome-bot
parent 3fbeda1d08
commit d0d46495a8
2 changed files with 3 additions and 6 deletions

View file

@ -13,7 +13,6 @@ cd ..
SUPPRESS=(
# To be resolved.
collapsible_if
const_static_lifetime
extra_unused_lifetimes
into_iter_on_array

View file

@ -247,12 +247,10 @@ impl Pic {
}
ret
} else if self.pics[pic_type as usize].read_reg_select {
self.pics[pic_type as usize].isr
} else {
if self.pics[pic_type as usize].read_reg_select {
self.pics[pic_type as usize].isr
} else {
self.pics[pic_type as usize].irr
}
self.pics[pic_type as usize].irr
}
}