Skip to content

Commit cb08d77

Browse files
authored
Merge pull request #2512 from rust-lang/rustc-pull
Rustc pull update
2 parents ebd6111 + de49ed5 commit cb08d77

File tree

110 files changed

+3732
-1187
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

110 files changed

+3732
-1187
lines changed

Cargo.lock

Lines changed: 55 additions & 27 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ exclude = ["crates/proc-macro-srv/proc-macro-test/imp"]
44
resolver = "2"
55

66
[workspace.package]
7-
rust-version = "1.86"
7+
rust-version = "1.88"
88
edition = "2024"
99
license = "MIT OR Apache-2.0"
1010
authors = ["rust-analyzer team"]
@@ -89,11 +89,11 @@ vfs-notify = { path = "./crates/vfs-notify", version = "0.0.0" }
8989
vfs = { path = "./crates/vfs", version = "0.0.0" }
9090
edition = { path = "./crates/edition", version = "0.0.0" }
9191

92-
ra-ap-rustc_lexer = { version = "0.116", default-features = false }
93-
ra-ap-rustc_parse_format = { version = "0.116", default-features = false }
94-
ra-ap-rustc_index = { version = "0.116", default-features = false }
95-
ra-ap-rustc_abi = { version = "0.116", default-features = false }
96-
ra-ap-rustc_pattern_analysis = { version = "0.116", default-features = false }
92+
ra-ap-rustc_lexer = { version = "0.121", default-features = false }
93+
ra-ap-rustc_parse_format = { version = "0.121", default-features = false }
94+
ra-ap-rustc_index = { version = "0.121", default-features = false }
95+
ra-ap-rustc_abi = { version = "0.121", default-features = false }
96+
ra-ap-rustc_pattern_analysis = { version = "0.121", default-features = false }
9797

9898
# local crates that aren't published to crates.io. These should not have versions.
9999

@@ -106,7 +106,7 @@ lsp-server = { version = "0.7.8" }
106106
anyhow = "1.0.98"
107107
arrayvec = "0.7.6"
108108
bitflags = "2.9.1"
109-
cargo_metadata = "0.20.0"
109+
cargo_metadata = "0.21.0"
110110
camino = "1.1.10"
111111
chalk-solve = { version = "0.103.0", default-features = false }
112112
chalk-ir = "0.103.0"
@@ -138,7 +138,11 @@ rayon = "1.10.0"
138138
rowan = "=0.15.15"
139139
# Ideally we'd not enable the macros feature but unfortunately the `tracked` attribute does not work
140140
# on impls without it
141-
salsa = { version = "0.23.0", default-features = true, features = ["rayon","salsa_unstable", "macros"] }
141+
salsa = { version = "0.23.0", default-features = true, features = [
142+
"rayon",
143+
"salsa_unstable",
144+
"macros",
145+
] }
142146
salsa-macros = "0.23.0"
143147
semver = "1.0.26"
144148
serde = { version = "1.0.219" }

0 commit comments

Comments
 (0)