Skip to content

Commit 58de0b1

Browse files
committed
Auto merge of rust-lang#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

+121-143
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+19-3
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

+2-2
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

+2-2
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

+5-5
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

+3-3
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

+11-13
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

+2-2
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

+2-2
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

+1-1
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

crates/ide-db/Cargo.toml

+7-7
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,16 @@ doctest = false
1313

1414
[dependencies]
1515
cov-mark = "2.0.0-pre.1"
16-
tracing = "0.1.35"
17-
rayon = "1.6.1"
16+
tracing.workspace = true
17+
rayon.workspace = true
1818
fst = { version = "0.4.7", default-features = false }
1919
rustc-hash = "1.1.0"
2020
once_cell = "1.17.0"
21-
either = "1.7.0"
22-
itertools = "0.10.5"
21+
either.workspace = true
22+
itertools.workspace = true
2323
arrayvec = "0.7.2"
24-
indexmap = "2.0.0"
25-
memchr = "2.5.0"
24+
indexmap.workspace = true
25+
memchr = "2.6.4"
2626
triomphe.workspace = true
2727
nohash-hasher.workspace = true
2828

@@ -43,7 +43,7 @@ line-index.workspace = true
4343
[dev-dependencies]
4444
expect-test = "1.4.0"
4545
oorandom = "11.1.3"
46-
xshell = "0.2.2"
46+
xshell.workspace = true
4747

4848
# local deps
4949
test-utils.workspace = true

crates/ide-db/src/source_change.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -140,10 +140,10 @@ impl SnippetEdit {
140140
.with_position()
141141
.map(|pos| {
142142
let (snippet, index) = match pos {
143-
itertools::Position::First(it) | itertools::Position::Middle(it) => it,
143+
(itertools::Position::First, it) | (itertools::Position::Middle, it) => it,
144144
// last/only snippet gets index 0
145-
itertools::Position::Last((snippet, _))
146-
| itertools::Position::Only((snippet, _)) => (snippet, 0),
145+
(itertools::Position::Last, (snippet, _))
146+
| (itertools::Position::Only, (snippet, _)) => (snippet, 0),
147147
};
148148

149149
let range = match snippet {

crates/ide-diagnostics/Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ doctest = false
1313

1414
[dependencies]
1515
cov-mark = "2.0.0-pre.1"
16-
either = "1.7.0"
17-
itertools = "0.10.5"
18-
serde_json = "1.0.86"
16+
either.workspace = true
17+
itertools.workspace = true
18+
serde_json.workspace = true
1919
once_cell = "1.17.0"
2020

2121
# local deps

crates/ide-ssr/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ doctest = false
1414

1515
[dependencies]
1616
cov-mark = "2.0.0-pre.1"
17-
itertools = "0.10.5"
17+
itertools.workspace = true
1818
triomphe.workspace = true
1919
nohash-hasher.workspace = true
2020

crates/ide/Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ doctest = false
1414
[dependencies]
1515
cov-mark = "2.0.0-pre.1"
1616
crossbeam-channel = "0.5.5"
17-
either = "1.7.0"
18-
itertools = "0.10.5"
19-
tracing = "0.1.35"
17+
either.workspace = true
18+
itertools.workspace = true
19+
tracing.workspace = true
2020
oorandom = "11.1.3"
2121
pulldown-cmark-to-cmark = "10.0.4"
2222
pulldown-cmark = { version = "0.9.1", default-features = false }

crates/load-cargo/Cargo.toml

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ authors.workspace = true
1111
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
1212

1313
[dependencies]
14-
anyhow = "1.0.62"
14+
anyhow.workspace = true
1515
crossbeam-channel = "0.5.5"
16-
itertools = "0.10.5"
17-
tracing = "0.1.35"
16+
itertools.workspace = true
17+
tracing.workspace = true
1818

1919
ide.workspace = true
20-
ide-db.workspace =true
20+
ide-db.workspace = true
2121
proc-macro-api.workspace = true
2222
project-model.workspace = true
2323
tt.workspace = true

crates/mbe/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ doctest = false
1515
cov-mark = "2.0.0-pre.1"
1616
rustc-hash = "1.1.0"
1717
smallvec.workspace = true
18-
tracing = "0.1.35"
18+
tracing.workspace = true
1919

2020
# local deps
2121
syntax.workspace = true

crates/proc-macro-api/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ object = { version = "0.32.0", default-features = false, features = [
2121
] }
2222
serde.workspace = true
2323
serde_json = { workspace = true, features = ["unbounded_depth"] }
24-
tracing = "0.1.37"
24+
tracing.workspace = true
2525
triomphe.workspace = true
2626
memmap2 = "0.5.4"
2727
snap = "1.1.0"

crates/proc-macro-test/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ rust-version.workspace = true
1212
doctest = false
1313

1414
[build-dependencies]
15-
cargo_metadata = "0.15.0"
15+
cargo_metadata.workspace = true
1616

1717
proc-macro-test-impl = { path = "imp", version = "0.0.0" }
1818

crates/project-model/Cargo.toml

+4-4
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@ rust-version.workspace = true
1212
doctest = false
1313

1414
[dependencies]
15-
tracing = "0.1.35"
15+
anyhow.workspace = true
16+
cargo_metadata.workspace = true
1617
rustc-hash = "1.1.0"
17-
cargo_metadata = "0.15.0"
1818
semver = "1.0.14"
1919
serde_json.workspace = true
2020
serde.workspace = true
21+
tracing.workspace = true
2122
triomphe.workspace = true
22-
anyhow = "1.0.62"
2323
la-arena.workspace = true
24-
itertools = "0.10.5"
24+
itertools.workspace = true
2525

2626
# local deps
2727
base-db.workspace = true

crates/rust-analyzer/Cargo.toml

+9-13
Original file line numberDiff line numberDiff line change
@@ -19,30 +19,26 @@ name = "rust-analyzer"
1919
path = "src/bin/main.rs"
2020

2121
[dependencies]
22-
anyhow = "1.0.62"
22+
anyhow.workspace = true
2323
crossbeam-channel = "0.5.5"
24-
dissimilar = "1.0.4"
25-
itertools = "0.10.5"
24+
dissimilar.workspace = true
25+
itertools.workspace = true
2626
scip = "0.3.1"
2727
lsp-types = { version = "=0.94.0", features = ["proposed"] }
2828
parking_lot = "0.12.1"
2929
xflags = "0.3.0"
3030
oorandom = "11.1.3"
31+
rayon.workspace = true
3132
rustc-hash = "1.1.0"
3233
serde_json = { workspace = true, features = ["preserve_order"] }
3334
serde.workspace = true
34-
rayon = "1.6.1"
3535
num_cpus = "1.15.0"
3636
mimalloc = { version = "0.1.30", default-features = false, optional = true }
3737
lsp-server.workspace = true
38-
tracing = "0.1.35"
39-
tracing-subscriber = { version = "0.3.16", default-features = false, features = [
40-
"registry",
41-
"fmt",
42-
"tracing-log",
43-
] }
44-
tracing-log = "0.1.3"
45-
tracing-tree = "0.2.1"
38+
tracing.workspace = true
39+
tracing-subscriber.workspace = true
40+
tracing-log = "0.2.0"
41+
tracing-tree.workspace = true
4642
triomphe.workspace = true
4743
nohash-hasher.workspace = true
4844
always-assert = "0.1.2"
@@ -81,7 +77,7 @@ jemallocator = { version = "0.5.0", package = "tikv-jemallocator", optional = tr
8177

8278
[dev-dependencies]
8379
expect-test = "1.4.0"
84-
xshell = "0.2.2"
80+
xshell.workspace = true
8581

8682
test-utils.workspace = true
8783
sourcegen.workspace = true

crates/rustc-dependencies/Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ authors.workspace = true
1111
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
1212

1313
[dependencies]
14-
ra-ap-rustc_lexer = { version = "0.18.0" }
14+
ra-ap-rustc_lexer = { version = "0.19.0" }
1515
ra-ap-rustc_parse_format = { version = "0.14.0", default-features = false }
16-
ra-ap-rustc_index = { version = "0.18.0", default-features = false }
17-
ra-ap-rustc_abi = { version = "0.18.0", default-features = false }
16+
ra-ap-rustc_index = { version = "0.19.0", default-features = false }
17+
ra-ap-rustc_abi = { version = "0.19.0", default-features = false }
1818

1919
[features]
2020
in-rust-tree = []

crates/sourcegen/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ rust-version.workspace = true
1212
doctest = false
1313

1414
[dependencies]
15-
xshell = "0.2.2"
15+
xshell.workspace = true

0 commit comments

Comments
 (0)