From 94dd3a7dc7f996345261d3aa256dccfc0ac7c49d Mon Sep 17 00:00:00 2001 From: sagudev <16504129+sagudev@users.noreply.github.com> Date: Tue, 25 Mar 2025 13:25:59 +0100 Subject: [PATCH] Fix some cfg guards (#7418) All guards should actually refer to `wgpu_core` instead of `native` Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com> --- wgpu/src/api/instance.rs | 4 ++-- wgpu/src/backend/wgpu_core.rs | 2 +- wgpu/src/cmp.rs | 4 ++-- wgpu/src/util/init.rs | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/wgpu/src/api/instance.rs b/wgpu/src/api/instance.rs index c27e72927..dc34a7817 100644 --- a/wgpu/src/api/instance.rs +++ b/wgpu/src/api/instance.rs @@ -1,4 +1,4 @@ -#[cfg(native)] +#[cfg(wgpu_core)] use alloc::vec::Vec; use core::future::Future; @@ -213,7 +213,7 @@ impl Instance { /// # Arguments /// /// - `backends` - Backends from which to enumerate adapters. - #[cfg(native)] + #[cfg(wgpu_core)] pub fn enumerate_adapters(&self, backends: Backends) -> Vec { let Some(core_instance) = self.inner.as_core_opt() else { return Vec::new(); diff --git a/wgpu/src/backend/wgpu_core.rs b/wgpu/src/backend/wgpu_core.rs index e81d02c24..926d7ddc2 100644 --- a/wgpu/src/backend/wgpu_core.rs +++ b/wgpu/src/backend/wgpu_core.rs @@ -61,7 +61,7 @@ impl ContextWgpuCore { Self(unsafe { Arc::new(wgc::global::Global::from_instance(core_instance)) }) } - #[cfg(native)] + #[cfg(wgpu_core)] pub fn enumerate_adapters(&self, backends: wgt::Backends) -> Vec { self.0.enumerate_adapters(backends) } diff --git a/wgpu/src/cmp.rs b/wgpu/src/cmp.rs index 94d362b7b..07e05f49e 100644 --- a/wgpu/src/cmp.rs +++ b/wgpu/src/cmp.rs @@ -67,7 +67,7 @@ macro_rules! impl_eq_ord_hash_proxy { /// ```ignore /// impl_eq_ord_hash_arc_address!(MyType => .field); /// ``` -#[cfg_attr(not(wgpu_core), expect(unused_macros))] +#[cfg_attr(not(any(wgpu_core, custom)), expect(unused_macros))] macro_rules! impl_eq_ord_hash_arc_address { ($type:ty => $($access:tt)*) => { impl PartialEq for $type { @@ -105,5 +105,5 @@ macro_rules! impl_eq_ord_hash_arc_address { }; } -#[cfg_attr(not(wgpu_core), expect(unused_imports))] +#[cfg_attr(not(any(wgpu_core, custom)), expect(unused_imports))] pub(crate) use {impl_eq_ord_hash_arc_address, impl_eq_ord_hash_proxy}; diff --git a/wgpu/src/util/init.rs b/wgpu/src/util/init.rs index be5c41986..5a22670c6 100644 --- a/wgpu/src/util/init.rs +++ b/wgpu/src/util/init.rs @@ -4,7 +4,7 @@ use crate::{Adapter, Instance, RequestAdapterOptions, Surface}; use crate::Backends; /// Initialize the adapter obeying the `WGPU_ADAPTER_NAME` environment variable. -#[cfg(native)] +#[cfg(wgpu_core)] pub fn initialize_adapter_from_env( instance: &Instance, compatible_surface: Option<&Surface<'_>>, @@ -36,7 +36,7 @@ pub fn initialize_adapter_from_env( } /// Initialize the adapter obeying the `WGPU_ADAPTER_NAME` environment variable. -#[cfg(not(native))] +#[cfg(not(wgpu_core))] pub fn initialize_adapter_from_env( _instance: &Instance, _compatible_surface: Option<&Surface<'_>>,