Skip to content

Commit c9e3934

Browse files
authored
Merge pull request #21015 from ShoyuVanilla/cargo-config-origin
fix: Parse cargo config files with origins
2 parents c937fcc + 8d18080 commit c9e3934

File tree

9 files changed

+319
-256
lines changed

9 files changed

+319
-256
lines changed

Cargo.lock

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

Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ lsp-server = { version = "0.7.9" }
106106
anyhow = "1.0.98"
107107
arrayvec = "0.7.6"
108108
bitflags = "2.9.1"
109-
cargo_metadata = "0.21.0"
109+
cargo_metadata = "0.23.0"
110110
camino = "1.1.10"
111111
crossbeam-channel = "0.5.15"
112112
dissimilar = "1.0.10"
@@ -155,6 +155,7 @@ smallvec = { version = "1.15.1", features = [
155155
smol_str = "0.3.2"
156156
temp-dir = "0.1.16"
157157
text-size = "1.1.1"
158+
toml = "0.9.8"
158159
tracing = "0.1.41"
159160
tracing-tree = "0.4.0"
160161
tracing-subscriber = { version = "0.3.20", default-features = false, features = [

crates/proc-macro-srv/proc-macro-test/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ license = "MIT OR Apache-2.0"
1010
doctest = false
1111

1212
[build-dependencies]
13-
cargo_metadata = "0.20.0"
13+
cargo_metadata = "0.23.0"

crates/project-model/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ serde_json.workspace = true
2121
serde.workspace = true
2222
serde_derive.workspace = true
2323
temp-dir.workspace = true
24+
toml.workspace = true
2425
tracing.workspace = true
2526
triomphe.workspace = true
2627
la-arena.workspace = true

0 commit comments

Comments
 (0)