Skip to content

Commit 45fbf41

Browse files
committed
Auto merge of #128722 - tgross35:new-resolver-root, r=Mark-Simulacrum
Switch to using the v2 resolver in most workspaces Pinning the resolver to v1 was done in 5abff37 ("Explicit set workspace.resolver ...") in order to suppress warnings. Since there is no specific reason not to use the new resolver and since it fixes issues, change to `resolver = "2"` everywhere except library.
2 parents e3f909b + 3701687 commit 45fbf41

File tree

15 files changed

+3437
-1933
lines changed

15 files changed

+3437
-1933
lines changed

Cargo.lock

+326-331
Large diffs are not rendered by default.

Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[workspace]
2-
resolver = "1"
2+
resolver = "2"
33
members = [
44
"compiler/rustc",
55
"src/etc/test-float-parse",

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]

0 commit comments

Comments
 (0)