Skip to content

Commit 096f1f1

Browse files
andyleisersonErichDonGubler
authored andcommitted
[naga] Remove the compact feature
1 parent 611a2bb commit 096f1f1

7 files changed

Lines changed: 2 additions & 11 deletions

File tree

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ jobs:
304304
305305
# Check with all compatible features
306306
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
307-
cargo clippy --target ${{ matrix.target }} ${{ matrix.extra-flags }} -p naga --no-default-features --features dot-out,compact
307+
cargo clippy --target ${{ matrix.target }} ${{ matrix.extra-flags }} -p naga --no-default-features --features dot-out
308308
cargo clippy --target ${{ matrix.target }} ${{ matrix.extra-flags }} -p wgpu-hal --no-default-features --features fragile-send-sync-non-atomic-wasm
309309
cargo clippy --target ${{ matrix.target }} ${{ matrix.extra-flags }} -p wgpu --no-default-features --features serde
310310

naga-cli/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ test = false
2525

2626
[dependencies]
2727
naga = { workspace = true, features = [
28-
"compact",
2928
"wgsl-in",
3029
"wgsl-out",
3130
"glsl-in",

naga/Cargo.toml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ arbitrary = [
5959
]
6060
spv-in = ["dep:petgraph", "petgraph/graphmap", "dep:spirv"]
6161
spv-out = ["dep:spirv"]
62-
wgsl-in = ["dep:hexf-parse", "dep:unicode-ident", "compact"]
62+
wgsl-in = ["dep:hexf-parse", "dep:unicode-ident"]
6363
wgsl-out = []
6464

6565
## Enables outputting to HLSL (Microsoft's High-Level Shader Language).
@@ -73,8 +73,6 @@ hlsl-out = []
7373
## If you want to enable HLSL output it regardless of the target platform, use `naga/hlsl-out`.
7474
hlsl-out-if-target-windows = []
7575

76-
compact = []
77-
7876
## Enables colored output through codespan-reporting and termcolor.
7977
termcolor = ["codespan-reporting/termcolor"]
8078

naga/src/arena/mod.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,6 @@ impl<T> Arena<T> {
234234
Ok(())
235235
}
236236

237-
#[cfg(feature = "compact")]
238237
pub(crate) fn retain_mut<P>(&mut self, mut predicate: P)
239238
where
240239
P: FnMut(Handle<T>, &mut T) -> bool,

naga/src/arena/unique_arena.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ impl<T> UniqueArena<T> {
7272
.unwrap_or(&Span::default())
7373
}
7474

75-
#[cfg(feature = "compact")]
7675
pub(crate) fn drain_all(&mut self) -> UniqueArenaDrain<T> {
7776
UniqueArenaDrain {
7877
inner_elts: self.set.drain(..),
@@ -82,14 +81,12 @@ impl<T> UniqueArena<T> {
8281
}
8382
}
8483

85-
#[cfg(feature = "compact")]
8684
pub struct UniqueArenaDrain<'a, T> {
8785
inner_elts: indexmap::set::Drain<'a, T>,
8886
inner_spans: alloc::vec::Drain<'a, Span>,
8987
index: Index,
9088
}
9189

92-
#[cfg(feature = "compact")]
9390
impl<T> Iterator for UniqueArenaDrain<'_, T> {
9491
type Item = (Handle<T>, T, Span);
9592

naga/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,6 @@ mod arena;
109109
mod as_diagnostic_file_path;
110110
pub mod back;
111111
pub mod common;
112-
#[cfg(feature = "compact")]
113112
pub mod compact;
114113
pub mod diagnostic_filter;
115114
pub mod error;

naga/tests/naga/snapshots.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -422,7 +422,6 @@ fn check_targets(input: &Input, module: &mut naga::Module, source_code: Option<&
422422
);
423423
});
424424

425-
#[cfg(feature = "compact")]
426425
let info = {
427426
naga::compact::compact(module);
428427

0 commit comments

Comments
 (0)