Skip to content

Commit e62b14c

Browse files
eddybLegNeato
authored andcommitted
Shrink dupe deps via deny.toml, updating ash example in the process.
1 parent 1d76d59 commit e62b14c

File tree

6 files changed

+174
-185
lines changed

6 files changed

+174
-185
lines changed

Cargo.lock

+60-77
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/spirv-builder/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,4 @@ raw-string = "0.3.5"
3939
serde = { version = "1.0", features = ["derive"] }
4040
serde_json = "1.0"
4141

42-
notify = { version = "5.0.0-pre.11", optional = true }
42+
notify = { version = "7.0", optional = true }

deny.toml

+20-7
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,31 @@ deny = [
2626
# Certain crates/versions that will be skipped when doing duplicate detection.
2727
skip = [
2828
#{ name = "ansi_term", version = "=0.11.0" },
29+
30+
# HACK(eddyb) two versions coexist for interop, for the time being.
31+
{ name = "raw-window-handle", version = "=0.5.2" },
32+
{ name = "raw-window-handle", version = "=0.6.2" },
2933
]
3034
# Similarly to `skip` allows you to skip certain crates during duplicate
3135
# detection. Unlike skip, it also includes the entire tree of transitive
3236
# dependencies starting at the specified crate, up to a certain depth, which is
3337
# by default infinite
3438
skip-tree = [
35-
# we don't really care if our example brings in some duplicate dependencies, for now
36-
{ name = "example-runner-ash", version = "0.0.0", depth = 20 },
37-
{ name = "example-runner-cpu", version = "0.0.0", depth = 20 },
38-
{ name = "example-runner-wgpu", version = "0.0.0", depth = 20 },
39-
{ name = "compiletests", version = "0.0.0", depth = 20 },
40-
{ name = "compiletests-deps-helper", version = "0.0.0", depth = 20 },
39+
# HACK(eddyb) `jni` (an `android-activity` dep) uses older `windows-*`.
40+
{ name = "jni", version = "=0.21.1", depth = 4 },
41+
# HACK(eddyb) `plist` (an `ash-molten` build dep) uses older `quick-xml`.
42+
{ name = "plist", version = "=1.7.0", depth = 2 },
43+
# HACK(eddyb) `minifb` (an `example-runner-cpu` dep) uses older `wayland-*`.
44+
{ name = "minifb", version = "=0.25.0", depth = 3 },
45+
# HACK(eddyb) `num_cpus` (a `tester` dep) uses older `hermit-abi`.
46+
{ name = "num_cpus", version = "=1.16.0", depth = 2 },
47+
48+
# FIXME(eddyb) outdated `winit` version uses older `windows-*`,
49+
# requires an upgrade to `winit 0.30` to resolve.
50+
{ name = "winit", version = "=0.29.15", depth = 4 },
51+
52+
# FIXME(eddyb) resolve everything hidden by this.
53+
{ name = "rustc_codegen_spirv", depth = 2 },
4154
]
4255

4356

@@ -65,7 +78,7 @@ exceptions = [
6578
# CC0 is a permissive license but somewhat unclear status for source code
6679
# so we prefer to not have dependencies using it
6780
# https://tldrlegal.com/license/creative-commons-cc0-1.0-universal
68-
{ allow = ["CC0-1.0"], name = "notify", version = "5.0.0-pre.13" },
81+
{ allow = ["CC0-1.0"], name = "notify", version = "7.0.0" },
6982
{ allow = ["CC0-1.0"], name = "hexf-parse" },
7083
]
7184

0 commit comments

Comments
 (0)