[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <13f6f904-bd2c-4b0a-914e-0715d22a7ff5@redhat.com>
Date: Mon, 14 Oct 2024 10:54:18 +0200
From: Jocelyn Falempe <jfalempe@...hat.com>
To: Thomas Böhler <witcher@...edspace.de>,
Miguel Ojeda <ojeda@...nel.org>, Alex Gaynor <alex.gaynor@...il.com>
Cc: Boqun Feng <boqun.feng@...il.com>, Gary Guo <gary@...yguo.net>,
Björn Roy Baron <bjorn3_gh@...tonmail.com>,
Benno Lossin <benno.lossin@...ton.me>,
Andreas Hindborg <a.hindborg@...nel.org>, Alice Ryhl <aliceryhl@...gle.com>,
Trevor Gross <tmgross@...ch.edu>, rust-for-linux@...r.kernel.org,
Maarten Lankhorst <maarten.lankhorst@...ux.intel.com>,
Maxime Ripard <mripard@...nel.org>, Thomas Zimmermann <tzimmermann@...e.de>,
David Airlie <airlied@...il.com>, Simona Vetter <simona@...ll.ch>,
dri-devel@...ts.freedesktop.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH 6/7] drm/panic: allow verbose boolean for clarity
On 12/10/2024 09:52, Thomas Böhler wrote:
> 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.
Thanks, I also prefer to keep the non-minimal boolean.
With the suggestions from Alice Ryhl to not introduce a return, and use
expect:
Reviewed-by: Jocelyn Falempe <jfalempe@...hat.com>
>
> Reported-by: Miguel Ojeda <ojeda@...nel.org>
> Closes: https://github.com/Rust-for-Linux/linux/issues/1123
> Signed-off-by: Thomas Böhler <witcher@...edspace.de>
> ---
> drivers/gpu/drm/drm_panic_qr.rs | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/drm_panic_qr.rs b/drivers/gpu/drm/drm_panic_qr.rs
> index 58c46f366f76..226107c02679 100644
> --- a/drivers/gpu/drm/drm_panic_qr.rs
> +++ b/drivers/gpu/drm/drm_panic_qr.rs
> @@ -719,7 +719,8 @@ fn draw_finders(&mut self) {
>
> fn is_finder(&self, x: u8, y: u8) -> bool {
> let end = self.width - 8;
> - (x < 8 && y < 8) || (x < 8 && y >= end) || (x >= end && y < 8)
> + #[allow(clippy::nonminimal_bool)]
> + return (x < 8 && y < 8) || (x < 8 && y >= end) || (x >= end && y < 8);
> }
>
> // Alignment pattern: 5x5 squares in a grid.
Powered by blists - more mailing lists