Skip to content

Commit

Permalink
Auto merge of #128722 - tgross35:new-resolver-root, r=Mark-Simulacrum
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
bors committed Aug 19, 2024
2 parents e3f909b + 3701687 commit 45fbf41
Show file tree
Hide file tree
Showing 15 changed files with 3,437 additions and 1,933 deletions.
657 changes: 326 additions & 331 deletions Cargo.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[workspace]
resolver = "1"
resolver = "2"
members = [
"compiler/rustc",
"src/etc/test-float-parse",
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_codegen_llvm/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ bitflags = "2.4.1"
itertools = "0.12"
libc = "0.2"
measureme = "11"
object = { version = "0.36.2", default-features = false, features = ["std", "read"] }
object = { version = "0.36.3", default-features = false, features = ["std", "read"] }
rustc-demangle = "0.1.21"
rustc_ast = { path = "../rustc_ast" }
rustc_attr = { path = "../rustc_attr" }
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_codegen_ssa/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ tempfile = "3.2"
thin-vec = "0.2.12"
thorin-dwp = "0.7"
tracing = "0.1"
wasm-encoder = "0.210.0"
wasm-encoder = "0.215.0"
# tidy-alphabetical-end

[target.'cfg(unix)'.dependencies]
Expand Down
Loading

0 comments on commit 45fbf41

Please sign in to comment.