Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

drm/panic: allow verbose boolean for clarity

Clippy complains about a non-minimal boolean expression with
`nonminimal_bool`:

error: this boolean expression can be simplified
--> drivers/gpu/drm/drm_panic_qr.rs:722:9
|
722 | (x < 8 && y < 8) || (x < 8 && y >= end) || (x >= end && y < 8)
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
= help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#nonminimal_bool
= note: `-D clippy::nonminimal-bool` implied by `-D warnings`
= help: to override `-D warnings` add `#[allow(clippy::nonminimal_bool)]`
help: try
|
722 | !(x >= 8 || y >= 8 && y < end) || (x >= end && y < 8)
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
722 | (y >= end || y < 8) && x < 8 || (x >= end && y < 8)
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~

While this can be useful in a lot of cases, it isn't here because the
line expresses clearly what the intention is. Simplifying the expression
means losing clarity, so opt-out of this lint for the offending line.

Fixes: cb5164ac43d0 ("drm/panic: Add a QR code panic screen")
Reported-by: Miguel Ojeda <ojeda@kernel.org>
Link: https://github.com/Rust-for-Linux/linux/issues/1123
Signed-off-by: Thomas Böhler <witcher@wiredspace.de>
Reviewed-by: Jocelyn Falempe <jfalempe@redhat.com>
Link: https://lore.kernel.org/r/20241019084048.22336-7-witcher@wiredspace.de
Signed-off-by: Miguel Ojeda <ojeda@kernel.org>

authored by

Thomas Böhler and committed by
Miguel Ojeda
27aef8a5 5bb698e6

+4 -1
+4 -1
drivers/gpu/drm/drm_panic_qr.rs
··· 719 719 720 720 fn is_finder(&self, x: u8, y: u8) -> bool { 721 721 let end = self.width - 8; 722 - (x < 8 && y < 8) || (x < 8 && y >= end) || (x >= end && y < 8) 722 + #[expect(clippy::nonminimal_bool)] 723 + { 724 + (x < 8 && y < 8) || (x < 8 && y >= end) || (x >= end && y < 8) 725 + } 723 726 } 724 727 725 728 // Alignment pattern: 5x5 squares in a grid.