diff options
| author | David Tolnay <dtolnay@chromium.org> | 2019-04-12 18:39:11 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2019-04-17 17:22:50 -0700 |
| commit | d0d46495a8ecac42b8228f913589efbca455b9e7 (patch) | |
| tree | 507bf86629e10f22f8116c420b4443fd78791326 | |
| parent | 3fbeda1d08b516478a6e7c88dabd24a251c11f35 (diff) | |
| download | crosvm-d0d46495a8ecac42b8228f913589efbca455b9e7.tar crosvm-d0d46495a8ecac42b8228f913589efbca455b9e7.tar.gz crosvm-d0d46495a8ecac42b8228f913589efbca455b9e7.tar.bz2 crosvm-d0d46495a8ecac42b8228f913589efbca455b9e7.tar.lz crosvm-d0d46495a8ecac42b8228f913589efbca455b9e7.tar.xz crosvm-d0d46495a8ecac42b8228f913589efbca455b9e7.tar.zst crosvm-d0d46495a8ecac42b8228f913589efbca455b9e7.zip | |
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>
| -rwxr-xr-x | bin/clippy | 1 | ||||
| -rw-r--r-- | devices/src/pic.rs | 8 |
2 files changed, 3 insertions, 6 deletions
diff --git a/bin/clippy b/bin/clippy index 7c155d1..8b38188 100755 --- a/bin/clippy +++ b/bin/clippy @@ -13,7 +13,6 @@ cd .. SUPPRESS=( # To be resolved. - collapsible_if const_static_lifetime extra_unused_lifetimes into_iter_on_array diff --git a/devices/src/pic.rs b/devices/src/pic.rs index 7fbd4af..baa98a0 100644 --- a/devices/src/pic.rs +++ b/devices/src/pic.rs @@ -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 } } |