From e572558d5f66ae2e123192748d557b472677c445 Mon Sep 17 00:00:00 2001 From: Valentin Popov Date: Thu, 25 Jun 2026 08:26:14 +0400 Subject: fix(stage0-ci): satisfy strict clippy gates --- adapters/fparkan-render-vulkan/src/ffi/capabilities.rs | 8 ++++---- adapters/fparkan-render-vulkan/src/ffi/runtime.rs | 4 ++-- adapters/fparkan-render-vulkan/src/ffi/smoke.rs | 2 +- adapters/fparkan-render-vulkan/src/ffi/tests.rs | 2 +- adapters/fparkan-render-vulkan/src/policy.rs | 7 +++---- apps/fparkan-vulkan-smoke/src/main.rs | 6 +++++- 6 files changed, 16 insertions(+), 13 deletions(-) diff --git a/adapters/fparkan-render-vulkan/src/ffi/capabilities.rs b/adapters/fparkan-render-vulkan/src/ffi/capabilities.rs index 40cd232..3fd9aed 100644 --- a/adapters/fparkan-render-vulkan/src/ffi/capabilities.rs +++ b/adapters/fparkan-render-vulkan/src/ffi/capabilities.rs @@ -138,7 +138,7 @@ pub fn probe_vulkan_runtime_capabilities( instance, surface, drawable_extent, - &RenderRequest::conservative(), + RenderRequest::conservative(), )?; Ok(selected.runtime) } @@ -154,7 +154,7 @@ pub fn probe_vulkan_runtime_capabilities_for_request( instance: &VulkanInstanceProbe, surface: &VulkanSurfaceProbe, drawable_extent: (u32, u32), - render_request: &RenderRequest, + render_request: RenderRequest, ) -> Result { let selected = select_live_device_candidate_for_request( instance, @@ -169,7 +169,7 @@ pub(super) fn select_live_device_candidate_for_request( instance: &VulkanInstanceProbe, surface: &VulkanSurfaceProbe, drawable_extent: (u32, u32), - render_request: &RenderRequest, + render_request: RenderRequest, ) -> Result { let devices = { // SAFETY: The Vulkan instance is live for this query and no handles are retained. @@ -222,7 +222,7 @@ fn live_device_candidate( surface: &VulkanSurfaceProbe, device: vk::PhysicalDevice, index: usize, - render_request: &RenderRequest, + render_request: RenderRequest, ) -> Result { let properties = { // SAFETY: `device` was returned by this live instance and the result is copied by value. diff --git a/adapters/fparkan-render-vulkan/src/ffi/runtime.rs b/adapters/fparkan-render-vulkan/src/ffi/runtime.rs index 555c08c..d5a3c6a 100644 --- a/adapters/fparkan-render-vulkan/src/ffi/runtime.rs +++ b/adapters/fparkan-render-vulkan/src/ffi/runtime.rs @@ -130,7 +130,7 @@ pub fn create_vulkan_logical_device_probe( instance, surface, drawable_extent, - &RenderRequest::conservative(), + RenderRequest::conservative(), ) } @@ -144,7 +144,7 @@ pub fn create_vulkan_logical_device_probe_for_request( instance: &VulkanInstanceProbe, surface: &VulkanSurfaceProbe, drawable_extent: (u32, u32), - render_request: &RenderRequest, + render_request: RenderRequest, ) -> Result { let selected = select_live_device_candidate_for_request( instance, diff --git a/adapters/fparkan-render-vulkan/src/ffi/smoke.rs b/adapters/fparkan-render-vulkan/src/ffi/smoke.rs index 0274daf..c8bf792 100644 --- a/adapters/fparkan-render-vulkan/src/ffi/smoke.rs +++ b/adapters/fparkan-render-vulkan/src/ffi/smoke.rs @@ -110,7 +110,7 @@ impl VulkanSmokeRenderer { &instance, &surface, create_info.drawable_extent, - &create_info.render_request, + create_info.render_request, ) .map_err(VulkanSmokeRendererError::LogicalDevice)?; if let Some(progress) = bootstrap_progress { diff --git a/adapters/fparkan-render-vulkan/src/ffi/tests.rs b/adapters/fparkan-render-vulkan/src/ffi/tests.rs index d472a28..b04ce8c 100644 --- a/adapters/fparkan-render-vulkan/src/ffi/tests.rs +++ b/adapters/fparkan-render-vulkan/src/ffi/tests.rs @@ -310,7 +310,7 @@ fn capability_gate_respects_request_specific_depth_profiles() { ..RenderRequest::conservative() }; - let report = select_physical_device_for_request(&[no_stencil], &relaxed_request) + let report = select_physical_device_for_request(&[no_stencil], relaxed_request) .expect("selected device for depth-only request"); assert_eq!(report.device_name, "No stencil"); diff --git a/adapters/fparkan-render-vulkan/src/policy.rs b/adapters/fparkan-render-vulkan/src/policy.rs index 3615aae..38650c6 100644 --- a/adapters/fparkan-render-vulkan/src/policy.rs +++ b/adapters/fparkan-render-vulkan/src/policy.rs @@ -362,7 +362,7 @@ impl std::error::Error for VulkanCapabilityError {} pub fn select_physical_device( devices: &[VulkanPhysicalDeviceRecord], ) -> Result { - select_physical_device_for_request(devices, &RenderRequest::conservative()) + select_physical_device_for_request(devices, RenderRequest::conservative()) } /// Selects a Vulkan physical device for a specific Stage 0 render request. @@ -374,7 +374,7 @@ pub fn select_physical_device( /// requirements for the requested profile. pub fn select_physical_device_for_request( devices: &[VulkanPhysicalDeviceRecord], - render_request: &RenderRequest, + render_request: RenderRequest, ) -> Result { if devices.is_empty() { return Err(VulkanCapabilityError::NoPhysicalDevice); @@ -675,7 +675,7 @@ fn select_image_count(capabilities: VulkanSwapchainSurfaceCapabilities) -> u32 { pub(crate) fn validate_device_for_request( device: &VulkanPhysicalDeviceRecord, - render_request: &RenderRequest, + render_request: RenderRequest, ) -> Result { if device.api_version < MIN_VULKAN_API_VERSION { return Err(VulkanCapabilityError::ApiVersionTooLow { @@ -830,7 +830,6 @@ fn informational_capabilities( fn required_depth_stencil_formats(depth: DepthStencilSupport) -> &'static [vk::Format] { match (depth.depth_bits, depth.stencil_bits) { - (0, 0) => &[], (16, 0) => &[vk::Format::D16_UNORM, vk::Format::D32_SFLOAT], (24, 0) => &[vk::Format::X8_D24_UNORM_PACK32, vk::Format::D32_SFLOAT], (32, 0) => &[vk::Format::D32_SFLOAT], diff --git a/apps/fparkan-vulkan-smoke/src/main.rs b/apps/fparkan-vulkan-smoke/src/main.rs index 320eb59..6339352 100644 --- a/apps/fparkan-vulkan-smoke/src/main.rs +++ b/apps/fparkan-vulkan-smoke/src/main.rs @@ -729,7 +729,11 @@ impl AtomicWindowPhase { } fn status(&self) -> &'static str { - WindowPhase::from_u8(self.0.load(Ordering::SeqCst) as u8).status() + match u8::try_from(self.0.load(Ordering::SeqCst)) { + Ok(value) => WindowPhase::from_u8(value), + Err(_) => WindowPhase::NotStarted, + } + .status() } } -- cgit v1.2.3