Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update cfg_aliases in order to fix unexpected cfg condition warnings #6348

Open
wants to merge 2 commits into
base: trunk
Choose a base branch
from
Open

Update cfg_aliases in order to fix unexpected cfg condition warnings #6348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
afd3fd3
Update `cfg_aliases`
Wumpf Oct 1, 2024
1379080
allow unused `wgpu_validate_locks`
Wumpf Oct 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 13 additions & 7 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ bincode = "1"
bit-vec = "0.8"
bitflags = "2.6"
bytemuck = { version = "1.18", features = ["derive"] }
cfg_aliases = "0.1"
cfg_aliases = "0.2.1"
cfg-if = "1"
criterion = "0.5"
codespan-reporting = "0.11"
Expand Down
5 changes: 5 additions & 0 deletions wgpu-core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,11 @@ targets = [
# Cargo machete can't check build.rs dependencies. See https://github.com/bnjbvr/cargo-machete/issues/100
ignored = ["cfg_aliases"]

[lints.rust]
# The `wgpu_validate_locks` config is supposed to be set via `RUSTFLAGS='--cfg wgpu_validate_locks'`
# If set, `wgpu-core` uses the [`ranked`] module's locks. We hope to make this the default for debug builds soon.
unexpected_cfgs = { level = "allow", check-cfg = ['cfg(wgpu_validate_locks)'] }

Comment on lines +32 to +36
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thought: I've implemented something similar to this in this commit in #6105 as build.rs output instead:

println!("cargo::rustc-check-cfg=cfg(wgpu_validate_locks)");

The reason I did this was because I felt it made more sense to keep the cfg config (😆) in one place.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🤷 no preference really, but I see you found one more than me.
So I can just cherry-pick your commit over

[lib]

[features]
Expand Down