diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index eb17c9bf8..6b676760d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -304,7 +304,7 @@ jobs: # Check with all compatible features cargo clippy --target ${{ matrix.target }} ${{ matrix.extra-flags }} -p wgpu-types --no-default-features --features strict_asserts,fragile-send-sync-non-atomic-wasm,serde,counters - cargo clippy --target ${{ matrix.target }} ${{ matrix.extra-flags }} -p naga --no-default-features --features dot-out,compact + cargo clippy --target ${{ matrix.target }} ${{ matrix.extra-flags }} -p naga --no-default-features --features dot-out cargo clippy --target ${{ matrix.target }} ${{ matrix.extra-flags }} -p wgpu-hal --no-default-features --features fragile-send-sync-non-atomic-wasm cargo clippy --target ${{ matrix.target }} ${{ matrix.extra-flags }} -p wgpu --no-default-features --features serde diff --git a/naga-cli/Cargo.toml b/naga-cli/Cargo.toml index 53ddae80e..1ffadd64f 100644 --- a/naga-cli/Cargo.toml +++ b/naga-cli/Cargo.toml @@ -25,7 +25,6 @@ test = false [dependencies] naga = { workspace = true, features = [ - "compact", "wgsl-in", "wgsl-out", "glsl-in", diff --git a/naga/Cargo.toml b/naga/Cargo.toml index 85cd2a54a..5dc433890 100644 --- a/naga/Cargo.toml +++ b/naga/Cargo.toml @@ -59,7 +59,7 @@ arbitrary = [ ] spv-in = ["dep:petgraph", "petgraph/graphmap", "dep:spirv"] spv-out = ["dep:spirv"] -wgsl-in = ["dep:hexf-parse", "dep:unicode-ident", "compact"] +wgsl-in = ["dep:hexf-parse", "dep:unicode-ident"] wgsl-out = [] ## Enables outputting to HLSL (Microsoft's High-Level Shader Language). @@ -73,8 +73,6 @@ hlsl-out = [] ## If you want to enable HLSL output it regardless of the target platform, use `naga/hlsl-out`. hlsl-out-if-target-windows = [] -compact = [] - ## Enables colored output through codespan-reporting and termcolor. termcolor = ["codespan-reporting/termcolor"] diff --git a/naga/src/arena/mod.rs b/naga/src/arena/mod.rs index 4fbfe7cc6..84abf92a7 100644 --- a/naga/src/arena/mod.rs +++ b/naga/src/arena/mod.rs @@ -234,7 +234,6 @@ impl Arena { Ok(()) } - #[cfg(feature = "compact")] pub(crate) fn retain_mut

(&mut self, mut predicate: P) where P: FnMut(Handle, &mut T) -> bool, diff --git a/naga/src/arena/unique_arena.rs b/naga/src/arena/unique_arena.rs index a5db7d339..49d481b2c 100644 --- a/naga/src/arena/unique_arena.rs +++ b/naga/src/arena/unique_arena.rs @@ -72,7 +72,6 @@ impl UniqueArena { .unwrap_or(&Span::default()) } - #[cfg(feature = "compact")] pub(crate) fn drain_all(&mut self) -> UniqueArenaDrain { UniqueArenaDrain { inner_elts: self.set.drain(..), @@ -82,14 +81,12 @@ impl UniqueArena { } } -#[cfg(feature = "compact")] pub struct UniqueArenaDrain<'a, T> { inner_elts: indexmap::set::Drain<'a, T>, inner_spans: alloc::vec::Drain<'a, Span>, index: Index, } -#[cfg(feature = "compact")] impl Iterator for UniqueArenaDrain<'_, T> { type Item = (Handle, T, Span); diff --git a/naga/src/lib.rs b/naga/src/lib.rs index 62ec1a5d0..731b2bc2d 100644 --- a/naga/src/lib.rs +++ b/naga/src/lib.rs @@ -109,7 +109,6 @@ mod arena; mod as_diagnostic_file_path; pub mod back; pub mod common; -#[cfg(feature = "compact")] pub mod compact; pub mod diagnostic_filter; pub mod error; diff --git a/naga/tests/naga/snapshots.rs b/naga/tests/naga/snapshots.rs index 1abbb502d..6c105c858 100644 --- a/naga/tests/naga/snapshots.rs +++ b/naga/tests/naga/snapshots.rs @@ -422,7 +422,6 @@ fn check_targets(input: &Input, module: &mut naga::Module, source_code: Option<& ); }); - #[cfg(feature = "compact")] let info = { naga::compact::compact(module);