Skip to content

Commit 6a210a3

Browse files
committedMay 28, 2025
Auto merge of #141693 - lnicola:sync-from-ra, r=lnicola
Subtree update of `rust-analyzer` r? `@ghost`
2 parents 6f69710 + d08ab51 commit 6a210a3

File tree

62 files changed

+1513
-956
lines changed

Some content is hidden

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

62 files changed

+1513
-956
lines changed
 

‎src/tools/rust-analyzer/Cargo.lock

Lines changed: 18 additions & 223 deletions
Large diffs are not rendered by default.

‎src/tools/rust-analyzer/Cargo.toml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -132,11 +132,8 @@ pulldown-cmark-to-cmark = "10.0.4"
132132
pulldown-cmark = { version = "0.9.6", default-features = false }
133133
rayon = "1.10.0"
134134
rowan = "=0.15.15"
135-
salsa = { version = "0.21.1", default-features = false, features = [
136-
"rayon",
137-
"salsa_unstable",
138-
] }
139-
salsa-macros = "0.21.1"
135+
salsa = { version = "0.22.0", default-features = false, features = ["rayon","salsa_unstable"] }
136+
salsa-macros = "0.22.0"
140137
semver = "1.0.26"
141138
serde = { version = "1.0.219" }
142139
serde_derive = { version = "1.0.219" }

0 commit comments

Comments
 (0)