Auto merge of #15095 - davidlattimore:lib-workspace-deps, r=lnicola

Change in-tree libs to workspace dependencies and bump versions
This commit is contained in:
bors 2023-06-20 05:35:56 +00:00
commit 7ebe7ac908
11 changed files with 16 additions and 12 deletions

4
Cargo.lock generated
View File

@ -878,7 +878,7 @@ dependencies = [
[[package]]
name = "la-arena"
version = "0.3.0"
version = "0.3.1"
[[package]]
name = "lazy_static"
@ -945,7 +945,7 @@ dependencies = [
[[package]]
name = "lsp-server"
version = "0.7.0"
version = "0.7.1"
dependencies = [
"crossbeam-channel",
"log",

View File

@ -75,7 +75,11 @@ toolchain = { path = "./crates/toolchain", version = "0.0.0" }
tt = { path = "./crates/tt", version = "0.0.0" }
vfs-notify = { path = "./crates/vfs-notify", version = "0.0.0" }
vfs = { path = "./crates/vfs", version = "0.0.0" }
line-index = { version = "0.1.0-pre.1", path = "./lib/line-index" }
# In-tree crates that are published separately and follow semver.
line-index = { version = "0.1.0-pre.1", path = "lib/line-index" }
la-arena = { version = "0.3.1", path = "lib/la-arena" }
lsp-server = { version = "0.7.1", path = "lib/lsp-server" }
# non-local crates
smallvec = { version = "1.10.0", features = [

View File

@ -17,7 +17,7 @@ rustc-hash = "1.1.0"
triomphe.workspace = true
la-arena = { version = "0.3.0", path = "../../lib/la-arena" }
la-arena.workspace = true
# local deps
cfg.workspace = true

View File

@ -24,7 +24,7 @@ fst = { version = "0.4.7", default-features = false }
hashbrown = { version = "0.12.1", default-features = false }
indexmap = "1.9.1"
itertools = "0.10.5"
la-arena = { version = "0.3.0", path = "../../lib/la-arena" }
la-arena.workspace = true
once_cell = "1.17.0"
rustc-hash = "1.1.0"
smallvec.workspace = true

View File

@ -16,7 +16,7 @@ cov-mark = "2.0.0-pre.1"
tracing = "0.1.35"
either = "1.7.0"
rustc-hash = "1.1.0"
la-arena = { version = "0.3.0", path = "../../lib/la-arena" }
la-arena.workspace = true
itertools = "0.10.5"
hashbrown = { version = "0.12.1", features = [
"inline-more",

View File

@ -26,7 +26,7 @@ chalk-solve = { version = "0.91.0", default-features = false }
chalk-ir = "0.91.0"
chalk-recursive = { version = "0.91.0", default-features = false }
chalk-derive = "0.91.0"
la-arena = { version = "0.3.0", path = "../../lib/la-arena" }
la-arena.workspace = true
once_cell = "1.17.0"
triomphe.workspace = true
nohash-hasher.workspace = true

View File

@ -15,7 +15,7 @@ doctest = false
once_cell = "1.17.0"
cfg-if = "1.0.0"
libc = "0.2.135"
la-arena = { version = "0.3.0", path = "../../lib/la-arena" }
la-arena.workspace = true
countme = { version = "3.0.1", features = ["enable"] }
jemalloc-ctl = { version = "0.5.0", package = "tikv-jemalloc-ctl", optional = true }

View File

@ -20,7 +20,7 @@ serde_json.workspace = true
serde.workspace = true
triomphe.workspace = true
anyhow = "1.0.62"
la-arena = { version = "0.3.0", path = "../../lib/la-arena" }
la-arena.workspace = true
itertools = "0.10.5"
# local deps

View File

@ -34,7 +34,7 @@ serde.workspace = true
rayon = "1.6.1"
num_cpus = "1.15.0"
mimalloc = { version = "0.1.30", default-features = false, optional = true }
lsp-server = { version = "0.7.0", path = "../../lib/lsp-server" }
lsp-server.workspace = true
tracing = "0.1.35"
tracing-subscriber = { version = "0.3.16", default-features = false, features = [
"registry",

View File

@ -1,6 +1,6 @@
[package]
name = "la-arena"
version = "0.3.0"
version = "0.3.1"
description = "Simple index-based arena without deletion."
license = "MIT OR Apache-2.0"
repository = "https://github.com/rust-lang/rust-analyzer/tree/master/lib/la-arena"

View File

@ -1,6 +1,6 @@
[package]
name = "lsp-server"
version = "0.7.0"
version = "0.7.1"
description = "Generic LSP server scaffold."
license = "MIT OR Apache-2.0"
repository = "https://github.com/rust-lang/rust-analyzer/tree/master/lib/lsp-server"