Unnamed repository; edit this file 'description' to name the repository.
Auto merge of #15095 - davidlattimore:lib-workspace-deps, r=lnicola
Change in-tree libs to workspace dependencies and bump versions
| -rw-r--r-- | Cargo.lock | 4 | ||||
| -rw-r--r-- | Cargo.toml | 6 | ||||
| -rw-r--r-- | crates/base-db/Cargo.toml | 2 | ||||
| -rw-r--r-- | crates/hir-def/Cargo.toml | 2 | ||||
| -rw-r--r-- | crates/hir-expand/Cargo.toml | 2 | ||||
| -rw-r--r-- | crates/hir-ty/Cargo.toml | 2 | ||||
| -rw-r--r-- | crates/profile/Cargo.toml | 2 | ||||
| -rw-r--r-- | crates/project-model/Cargo.toml | 2 | ||||
| -rw-r--r-- | crates/rust-analyzer/Cargo.toml | 2 | ||||
| -rw-r--r-- | lib/la-arena/Cargo.toml | 2 | ||||
| -rw-r--r-- | lib/lsp-server/Cargo.toml | 2 |
11 files changed, 16 insertions, 12 deletions
diff --git a/Cargo.lock b/Cargo.lock index 1fe451c2f3..2bdd25af34 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -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", diff --git a/Cargo.toml b/Cargo.toml index 3050cf764a..f34809a1cd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -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 = [ diff --git a/crates/base-db/Cargo.toml b/crates/base-db/Cargo.toml index 6001772c86..171c113a95 100644 --- a/crates/base-db/Cargo.toml +++ b/crates/base-db/Cargo.toml @@ -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 diff --git a/crates/hir-def/Cargo.toml b/crates/hir-def/Cargo.toml index 83c7051646..49f8604de7 100644 --- a/crates/hir-def/Cargo.toml +++ b/crates/hir-def/Cargo.toml @@ -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 diff --git a/crates/hir-expand/Cargo.toml b/crates/hir-expand/Cargo.toml index 40d8659f25..2bb855d230 100644 --- a/crates/hir-expand/Cargo.toml +++ b/crates/hir-expand/Cargo.toml @@ -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", diff --git a/crates/hir-ty/Cargo.toml b/crates/hir-ty/Cargo.toml index 247e6466d8..10d65afde4 100644 --- a/crates/hir-ty/Cargo.toml +++ b/crates/hir-ty/Cargo.toml @@ -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 diff --git a/crates/profile/Cargo.toml b/crates/profile/Cargo.toml index 602e742751..937834a82a 100644 --- a/crates/profile/Cargo.toml +++ b/crates/profile/Cargo.toml @@ -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 } diff --git a/crates/project-model/Cargo.toml b/crates/project-model/Cargo.toml index 3abff64a83..75977fc5b0 100644 --- a/crates/project-model/Cargo.toml +++ b/crates/project-model/Cargo.toml @@ -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 diff --git a/crates/rust-analyzer/Cargo.toml b/crates/rust-analyzer/Cargo.toml index dc8962064b..26bc439e94 100644 --- a/crates/rust-analyzer/Cargo.toml +++ b/crates/rust-analyzer/Cargo.toml @@ -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", diff --git a/lib/la-arena/Cargo.toml b/lib/la-arena/Cargo.toml index ec5ba8ba00..01f2b87b39 100644 --- a/lib/la-arena/Cargo.toml +++ b/lib/la-arena/Cargo.toml @@ -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" diff --git a/lib/lsp-server/Cargo.toml b/lib/lsp-server/Cargo.toml index e78a9d2eb1..7183cbac63 100644 --- a/lib/lsp-server/Cargo.toml +++ b/lib/lsp-server/Cargo.toml @@ -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" |