Skip to content

Commit 58de0b1

Browse files
committed
Auto merge of #15902 - lnicola:bump-deps, r=Veykril
internal: Bump deps pt. 1
2 parents bae9c08 + da24b6f commit 58de0b1

File tree

31 files changed

+222
-235
lines changed

31 files changed

+222
-235
lines changed

Cargo.lock

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

Cargo.toml

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,18 +90,34 @@ la-arena = { version = "0.3.1" }
9090
lsp-server = { version = "0.7.4" }
9191

9292
# non-local crates
93+
anyhow = "1.0.75"
94+
bitflags = "2.4.1"
95+
cargo_metadata = "0.18.1"
96+
dissimilar = "1.0.7"
97+
either = "1.9.0"
98+
indexmap = "2.1.0"
99+
itertools = "0.12.0"
93100
smallvec = { version = "1.10.0", features = [
94101
"const_new",
95102
"union",
96103
"const_generics",
97104
] }
105+
tracing = "0.1.40"
106+
tracing-tree = "0.3.0"
107+
tracing-subscriber = { version = "0.3.18", default-features = false, features = [
108+
"registry",
109+
"fmt",
110+
"tracing-log",
111+
] }
98112
smol_str = "0.2.0"
99113
nohash-hasher = "0.2.0"
100-
text-size = "1.1.0"
101-
serde = { version = "1.0.156", features = ["derive"] }
102-
serde_json = "1.0.96"
114+
text-size = "1.1.1"
115+
rayon = "1.8.0"
116+
serde = { version = "1.0.192", features = ["derive"] }
117+
serde_json = "1.0.108"
103118
triomphe = { version = "0.1.8", default-features = false, features = ["std"] }
104119
# can't upgrade due to dashmap depending on 0.12.3 currently
105120
hashbrown = { version = "0.12.3", features = [
106121
"inline-more",
107122
], default-features = false }
123+
xshell = "0.2.5"

crates/cfg/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ oorandom = "11.1.3"
2323
# We depend on both individually instead of using `features = ["derive"]` to microoptimize the
2424
# build graph: if the feature was enabled, syn would be built early on in the graph if `smolstr`
2525
# supports `arbitrary`. This way, we avoid feature unification.
26-
arbitrary = "1.3.0"
27-
derive_arbitrary = "1.3.1"
26+
arbitrary = "1.3.2"
27+
derive_arbitrary = "1.3.2"
2828

2929
# local deps
3030
mbe.workspace = true

crates/flycheck/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ rust-version.workspace = true
1212
doctest = false
1313

1414
[dependencies]
15+
cargo_metadata.workspace = true
1516
crossbeam-channel = "0.5.8"
16-
tracing = "0.1.37"
17-
cargo_metadata = "0.15.4"
17+
tracing.workspace = true
1818
rustc-hash = "1.1.0"
1919
serde_json.workspace = true
2020
serde.workspace = true

crates/hir-def/Cargo.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,19 @@ doctest = false
1313

1414
[dependencies]
1515
arrayvec = "0.7.2"
16-
bitflags = "2.1.0"
16+
bitflags.workspace = true
1717
cov-mark = "2.0.0-pre.1"
1818
# We need to freeze the version of the crate, as the raw-api feature is considered unstable
1919
dashmap = { version = "=5.4.0", features = ["raw-api"] }
2020
drop_bomb = "0.1.5"
21-
either = "1.7.0"
21+
either.workspace = true
2222
fst = { version = "0.4.7", default-features = false }
23-
indexmap = "2.0.0"
24-
itertools = "0.10.5"
23+
indexmap.workspace = true
24+
itertools.workspace = true
2525
la-arena.workspace = true
2626
once_cell = "1.17.0"
2727
rustc-hash = "1.1.0"
28-
tracing = "0.1.35"
28+
tracing.workspace = true
2929
smallvec.workspace = true
3030
hashbrown.workspace = true
3131
triomphe.workspace = true

crates/hir-expand/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ doctest = false
1313

1414
[dependencies]
1515
cov-mark = "2.0.0-pre.1"
16-
tracing = "0.1.35"
17-
either = "1.7.0"
16+
tracing.workspace = true
17+
either.workspace = true
1818
rustc-hash = "1.1.0"
1919
la-arena.workspace = true
20-
itertools = "0.10.5"
20+
itertools.workspace = true
2121
hashbrown.workspace = true
2222
smallvec.workspace = true
2323
triomphe.workspace = true

crates/hir-ty/Cargo.toml

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,20 @@ doctest = false
1313

1414
[dependencies]
1515
cov-mark = "2.0.0-pre.1"
16-
itertools = "0.10.5"
16+
itertools.workspace = true
1717
arrayvec = "0.7.2"
18-
bitflags = "2.1.0"
18+
bitflags.workspace = true
1919
smallvec.workspace = true
2020
ena = "0.14.0"
21-
either = "1.7.0"
21+
either.workspace = true
2222
oorandom = "11.1.3"
23-
tracing = "0.1.35"
23+
tracing.workspace = true
2424
rustc-hash = "1.1.0"
2525
scoped-tls = "1.0.0"
26-
chalk-solve = { version = "0.93.0", default-features = false }
27-
chalk-ir = "0.93.0"
28-
chalk-recursive = { version = "0.93.0", default-features = false }
29-
chalk-derive = "0.93.0"
26+
chalk-solve = { version = "0.94.0", default-features = false }
27+
chalk-ir = "0.94.0"
28+
chalk-recursive = { version = "0.94.0", default-features = false }
29+
chalk-derive = "0.94.0"
3030
la-arena.workspace = true
3131
once_cell = "1.17.0"
3232
triomphe.workspace = true
@@ -47,11 +47,9 @@ limit.workspace = true
4747

4848
[dev-dependencies]
4949
expect-test = "1.4.0"
50-
tracing = "0.1.35"
51-
tracing-subscriber = { version = "0.3.16", default-features = false, features = [
52-
"registry",
53-
] }
54-
tracing-tree = "0.2.1"
50+
tracing.workspace = true
51+
tracing-subscriber.workspace = true
52+
tracing-tree.workspace = true
5553
project-model = { path = "../project-model" }
5654

5755
# local deps

crates/hir/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ doctest = false
1313

1414
[dependencies]
1515
rustc-hash = "1.1.0"
16-
either = "1.7.0"
16+
either.workspace = true
1717
arrayvec = "0.7.2"
18-
itertools = "0.10.5"
18+
itertools.workspace = true
1919
smallvec.workspace = true
2020
triomphe.workspace = true
2121
once_cell = "1.17.1"

crates/ide-assists/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ doctest = false
1414
[dependencies]
1515
cov-mark = "2.0.0-pre.1"
1616

17-
itertools = "0.10.5"
18-
either = "1.7.0"
17+
itertools.workspace = true
18+
either.workspace = true
1919
smallvec.workspace = true
2020

2121
# local deps

crates/ide-completion/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ doctest = false
1313

1414
[dependencies]
1515
cov-mark = "2.0.0-pre.1"
16-
itertools = "0.10.5"
16+
itertools.workspace = true
1717

1818
once_cell = "1.17.0"
1919
smallvec.workspace = true

0 commit comments

Comments
 (0)