From 06776969d61ea59442823b59db073cd8a5aa40d4 Mon Sep 17 00:00:00 2001 From: Karol Herbst Date: Tue, 9 Sep 2025 02:41:27 +0200 Subject: [PATCH] rusticl: drop global allow statements Just to stay consistent. We might want to use them instead of declaring them inside meson, but I'd rather prefer we have a consistent list across all crates and that's easier done in meson. Reviewed-by: Eric Engestrom Part-of: --- src/gallium/frontends/rusticl/core/device.rs | 1 + src/gallium/frontends/rusticl/core/kernel.rs | 1 + src/gallium/frontends/rusticl/core/program.rs | 13 ++++++------- src/gallium/frontends/rusticl/lib.rs | 3 --- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/gallium/frontends/rusticl/core/device.rs b/src/gallium/frontends/rusticl/core/device.rs index 8770459e53a..5648a1732d2 100644 --- a/src/gallium/frontends/rusticl/core/device.rs +++ b/src/gallium/frontends/rusticl/core/device.rs @@ -501,6 +501,7 @@ impl DeviceBase { let exts: Vec<&str> = self.extension_string.split(' ').collect(); let mut res = CLVersion::Cl3_0; + #[allow(clippy::collapsible_if)] if self.embedded { if self.caps.has_images { let supports_array_writes = !FORMATS diff --git a/src/gallium/frontends/rusticl/core/kernel.rs b/src/gallium/frontends/rusticl/core/kernel.rs index 0f858e6ad1e..f942b842085 100644 --- a/src/gallium/frontends/rusticl/core/kernel.rs +++ b/src/gallium/frontends/rusticl/core/kernel.rs @@ -1073,6 +1073,7 @@ fn compile_nir_variant( nir.print(); } + #[allow(clippy::collapsible_if)] if dev.screen.finalize_nir(nir) { if Platform::dbg().nir { eprintln!( diff --git a/src/gallium/frontends/rusticl/core/program.rs b/src/gallium/frontends/rusticl/core/program.rs index 2684f105230..f884e0f0671 100644 --- a/src/gallium/frontends/rusticl/core/program.rs +++ b/src/gallium/frontends/rusticl/core/program.rs @@ -957,13 +957,12 @@ fn create_build_closure( let device_build = build_info.dev_build_mut(device); // skip compilation if we already have the right thing. - if program.is_bin() { - if device_build.bin_type == CL_PROGRAM_BINARY_TYPE_EXECUTABLE && !is_lib - || device_build.bin_type == CL_PROGRAM_BINARY_TYPE_LIBRARY && is_lib - { - device_build.status = CL_BUILD_SUCCESS as cl_build_status; - continue; - } + if program.is_bin() + && (device_build.bin_type == CL_PROGRAM_BINARY_TYPE_EXECUTABLE && !is_lib + || device_build.bin_type == CL_PROGRAM_BINARY_TYPE_LIBRARY && is_lib) + { + device_build.status = CL_BUILD_SUCCESS as cl_build_status; + continue; } let spirv = device_build.spirv.take().unwrap(); diff --git a/src/gallium/frontends/rusticl/lib.rs b/src/gallium/frontends/rusticl/lib.rs index 889c9816066..7c9ec0171e3 100644 --- a/src/gallium/frontends/rusticl/lib.rs +++ b/src/gallium/frontends/rusticl/lib.rs @@ -1,8 +1,5 @@ // Copyright 2020 Red Hat. // SPDX-License-Identifier: MIT -#![allow(clippy::collapsible_if)] -#![allow(clippy::needless_range_loop)] - mod api; pub mod core;