Skip to content

Commit f69e74e

Browse files
committed
Update some dependency versions that allow better licensing
With the new resolver, a few dependencies get brought in twice with different licenses. For example, all dependencies from `wasm-tools` gained Apache-2.0 and MIT options, and with the v2 resolver we were using one version from before and one version from after this change. This made tidy's license check difficult. Update some minimum versions to remove duplicate dependencies and smooth out license checking.
1 parent 42b9cb1 commit f69e74e

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

compiler/rustc_codegen_llvm/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ bitflags = "2.4.1"
1212
itertools = "0.12"
1313
libc = "0.2"
1414
measureme = "11"
15-
object = { version = "0.36.2", default-features = false, features = ["std", "read"] }
15+
object = { version = "0.36.3", default-features = false, features = ["std", "read"] }
1616
rustc-demangle = "0.1.21"
1717
rustc_ast = { path = "../rustc_ast" }
1818
rustc_attr = { path = "../rustc_attr" }

compiler/rustc_codegen_ssa/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ tempfile = "3.2"
4141
thin-vec = "0.2.12"
4242
thorin-dwp = "0.7"
4343
tracing = "0.1"
44-
wasm-encoder = "0.210.0"
44+
wasm-encoder = "0.215.0"
4545
# tidy-alphabetical-end
4646

4747
[target.'cfg(unix)'.dependencies]

src/bootstrap/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ fd-lock = "4.0"
4747
home = "0.5"
4848
ignore = "0.4"
4949
libc = "0.2"
50-
object = { version = "0.32", default-features = false, features = ["archive", "coff", "read_core", "unaligned"] }
50+
object = { version = "0.36.3", default-features = false, features = ["archive", "coff", "read_core", "unaligned"] }
5151
opener = "0.5"
5252
semver = "1.0"
5353
serde = "1.0"

src/tools/run-make-support/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ edition = "2021"
77
bstr = "1.6.0"
88
object = "0.36.2"
99
similar = "2.5.0"
10-
wasmparser = { version = "0.214", default-features = false, features = ["std"] }
10+
wasmparser = { version = "0.215", default-features = false, features = ["std"] }
1111
regex = "1.8" # 1.8 to avoid memchr 2.6.0, as 2.5.0 is pinned in the workspace
1212
gimli = "0.31.0"
1313
build_helper = { path = "../build_helper" }

0 commit comments

Comments
 (0)