Skip to content
This repository was archived by the owner on May 28, 2025. It is now read-only.

Commit 7ebe7ac

Browse files
committed
Auto merge of rust-lang#15095 - davidlattimore:lib-workspace-deps, r=lnicola
Change in-tree libs to workspace dependencies and bump versions
2 parents 40ed61e + fb3e54e commit 7ebe7ac

File tree

11 files changed

+16
-12
lines changed

11 files changed

+16
-12
lines changed

Cargo.lock

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

Cargo.toml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,11 @@ toolchain = { path = "./crates/toolchain", version = "0.0.0" }
7575
tt = { path = "./crates/tt", version = "0.0.0" }
7676
vfs-notify = { path = "./crates/vfs-notify", version = "0.0.0" }
7777
vfs = { path = "./crates/vfs", version = "0.0.0" }
78-
line-index = { version = "0.1.0-pre.1", path = "./lib/line-index" }
78+
79+
# In-tree crates that are published separately and follow semver.
80+
line-index = { version = "0.1.0-pre.1", path = "lib/line-index" }
81+
la-arena = { version = "0.3.1", path = "lib/la-arena" }
82+
lsp-server = { version = "0.7.1", path = "lib/lsp-server" }
7983

8084
# non-local crates
8185
smallvec = { version = "1.10.0", features = [

crates/base-db/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ rustc-hash = "1.1.0"
1717

1818
triomphe.workspace = true
1919

20-
la-arena = { version = "0.3.0", path = "../../lib/la-arena" }
20+
la-arena.workspace = true
2121

2222
# local deps
2323
cfg.workspace = true

crates/hir-def/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ fst = { version = "0.4.7", default-features = false }
2424
hashbrown = { version = "0.12.1", default-features = false }
2525
indexmap = "1.9.1"
2626
itertools = "0.10.5"
27-
la-arena = { version = "0.3.0", path = "../../lib/la-arena" }
27+
la-arena.workspace = true
2828
once_cell = "1.17.0"
2929
rustc-hash = "1.1.0"
3030
smallvec.workspace = true

crates/hir-expand/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ cov-mark = "2.0.0-pre.1"
1616
tracing = "0.1.35"
1717
either = "1.7.0"
1818
rustc-hash = "1.1.0"
19-
la-arena = { version = "0.3.0", path = "../../lib/la-arena" }
19+
la-arena.workspace = true
2020
itertools = "0.10.5"
2121
hashbrown = { version = "0.12.1", features = [
2222
"inline-more",

crates/hir-ty/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ chalk-solve = { version = "0.91.0", default-features = false }
2626
chalk-ir = "0.91.0"
2727
chalk-recursive = { version = "0.91.0", default-features = false }
2828
chalk-derive = "0.91.0"
29-
la-arena = { version = "0.3.0", path = "../../lib/la-arena" }
29+
la-arena.workspace = true
3030
once_cell = "1.17.0"
3131
triomphe.workspace = true
3232
nohash-hasher.workspace = true

crates/profile/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ doctest = false
1515
once_cell = "1.17.0"
1616
cfg-if = "1.0.0"
1717
libc = "0.2.135"
18-
la-arena = { version = "0.3.0", path = "../../lib/la-arena" }
18+
la-arena.workspace = true
1919
countme = { version = "3.0.1", features = ["enable"] }
2020
jemalloc-ctl = { version = "0.5.0", package = "tikv-jemalloc-ctl", optional = true }
2121

crates/project-model/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ serde_json.workspace = true
2020
serde.workspace = true
2121
triomphe.workspace = true
2222
anyhow = "1.0.62"
23-
la-arena = { version = "0.3.0", path = "../../lib/la-arena" }
23+
la-arena.workspace = true
2424
itertools = "0.10.5"
2525

2626
# local deps

crates/rust-analyzer/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ serde.workspace = true
3434
rayon = "1.6.1"
3535
num_cpus = "1.15.0"
3636
mimalloc = { version = "0.1.30", default-features = false, optional = true }
37-
lsp-server = { version = "0.7.0", path = "../../lib/lsp-server" }
37+
lsp-server.workspace = true
3838
tracing = "0.1.35"
3939
tracing-subscriber = { version = "0.3.16", default-features = false, features = [
4040
"registry",

lib/la-arena/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "la-arena"
3-
version = "0.3.0"
3+
version = "0.3.1"
44
description = "Simple index-based arena without deletion."
55
license = "MIT OR Apache-2.0"
66
repository = "https://github.com/rust-lang/rust-analyzer/tree/master/lib/la-arena"

lib/lsp-server/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "lsp-server"
3-
version = "0.7.0"
3+
version = "0.7.1"
44
description = "Generic LSP server scaffold."
55
license = "MIT OR Apache-2.0"
66
repository = "https://github.com/rust-lang/rust-analyzer/tree/master/lib/lsp-server"

0 commit comments

Comments
 (0)