Auto merge of #13969 - Veykril:workspace.dependencies, r=Veykril

Use workspace.dependencies to declare local dependencies
This commit is contained in:
bors 2023-01-17 10:29:27 +00:00
commit fa874627f0
27 changed files with 240 additions and 168 deletions

View file

@ -38,3 +38,39 @@ debug = 0
# ungrammar = { path = "../ungrammar" }
# salsa = { path = "../salsa" }
[workspace.dependencies]
# local crates
base-db = { path = "./crates/base-db", version = "0.0.0" }
cfg = { path = "./crates/cfg", version = "0.0.0" }
flycheck = { path = "./crates/flycheck", version = "0.0.0" }
hir = { path = "./crates/hir", version = "0.0.0" }
hir-def = { path = "./crates/hir-def", version = "0.0.0" }
hir-expand = { path = "./crates/hir-expand", version = "0.0.0" }
hir-ty = { path = "./crates/hir-ty", version = "0.0.0" }
ide = { path = "./crates/ide", version = "0.0.0" }
ide-assists = { path = "./crates/ide-assists", version = "0.0.0" }
ide-completion = { path = "./crates/ide-completion", version = "0.0.0" }
ide-db = { path = "./crates/ide-db", version = "0.0.0" }
ide-diagnostics = { path = "./crates/ide-diagnostics", version = "0.0.0" }
ide-ssr = { path = "./crates/ide-ssr", version = "0.0.0" }
intern = { path = "./crates/intern", version = "0.0.0" }
limit = { path = "./crates/limit", version = "0.0.0" }
mbe = { path = "./crates/mbe", version = "0.0.0" }
parser = { path = "./crates/parser", version = "0.0.0" }
paths = { path = "./crates/paths", version = "0.0.0" }
proc-macro-api = { path = "./crates/proc-macro-api", version = "0.0.0" }
proc-macro-srv = { path = "./crates/proc-macro-srv", version = "0.0.0" }
proc-macro-srv-cli = { path = "./crates/proc-macro-srv-cli", version = "0.0.0" }
proc-macro-test = { path = "./crates/proc-macro-test", version = "0.0.0" }
profile = { path = "./crates/profile", version = "0.0.0" }
project-model = { path = "./crates/project-model", version = "0.0.0" }
sourcegen = { path = "./crates/sourcegen", version = "0.0.0" }
stdx = { path = "./crates/stdx", version = "0.0.0" }
syntax = { path = "./crates/syntax", version = "0.0.0" }
test-utils = { path = "./crates/test-utils", version = "0.0.0" }
text-edit = { path = "./crates/text-edit", version = "0.0.0" }
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" }

View file

@ -15,10 +15,11 @@ doctest = false
salsa = "0.17.0-pre.2"
rustc-hash = "1.1.0"
syntax = { path = "../syntax", version = "0.0.0" }
stdx = { path = "../stdx", version = "0.0.0" }
cfg = { path = "../cfg", version = "0.0.0" }
profile = { path = "../profile", version = "0.0.0" }
tt = { path = "../tt", version = "0.0.0" }
test-utils = { path = "../test-utils", version = "0.0.0" }
vfs = { path = "../vfs", version = "0.0.0" }
# local deps
cfg.workspace = true
profile.workspace = true
stdx.workspace = true
syntax.workspace = true
test-utils.workspace = true
tt.workspace = true
vfs.workspace = true

View file

@ -14,11 +14,10 @@ doctest = false
[dependencies]
rustc-hash = "1.1.0"
tt = { path = "../tt", version = "0.0.0" }
# locals deps
tt.workspace = true
[dev-dependencies]
mbe = { path = "../mbe" }
syntax = { path = "../syntax" }
expect-test = "1.4.0"
oorandom = "11.1.3"
# We depend on both individually instead of using `features = ["derive"]` to microoptimize the
@ -26,3 +25,7 @@ oorandom = "11.1.3"
# supports `arbitrary`. This way, we avoid feature unification.
arbitrary = "1.1.7"
derive_arbitrary = "1.1.6"
# local deps
mbe.workspace = true
syntax.workspace = true

View file

@ -21,6 +21,7 @@ serde_json = "1.0.86"
jod-thread = "0.1.2"
command-group = "2.0.1"
toolchain = { path = "../toolchain", version = "0.0.0" }
stdx = { path = "../stdx", version = "0.0.0" }
paths = { path = "../paths", version = "0.0.0" }
# local deps
paths.workspace = true
stdx.workspace = true
toolchain.workspace = true

View file

@ -30,19 +30,23 @@ rustc-hash = "1.1.0"
smallvec = "1.10.0"
tracing = "0.1.35"
stdx = { path = "../stdx", version = "0.0.0" }
intern = { path = "../intern", version = "0.0.0" }
base-db = { path = "../base-db", version = "0.0.0" }
syntax = { path = "../syntax", version = "0.0.0" }
profile = { path = "../profile", version = "0.0.0" }
hir-expand = { path = "../hir-expand", version = "0.0.0" }
rustc_abi = { version = "0.0.20221221", package = "hkalbasi-rustc-ap-rustc_abi", default-features = false }
rustc_index = { version = "0.0.20221221", package = "hkalbasi-rustc-ap-rustc_index", default-features = false }
mbe = { path = "../mbe", version = "0.0.0" }
cfg = { path = "../cfg", version = "0.0.0" }
tt = { path = "../tt", version = "0.0.0" }
limit = { path = "../limit", version = "0.0.0" }
# local deps
stdx.workspace = true
intern.workspace = true
base-db.workspace = true
syntax.workspace = true
profile.workspace = true
hir-expand.workspace = true
mbe.workspace = true
cfg.workspace = true
tt.workspace = true
limit.workspace = true
[dev-dependencies]
test-utils = { path = "../test-utils" }
expect-test = "1.4.0"
# local deps
test-utils.workspace = true

View file

@ -23,15 +23,16 @@ hashbrown = { version = "0.12.1", features = [
], default-features = false }
smallvec = { version = "1.10.0", features = ["const_new"] }
stdx = { path = "../stdx", version = "0.0.0" }
intern = { path = "../intern", version = "0.0.0" }
base-db = { path = "../base-db", version = "0.0.0" }
cfg = { path = "../cfg", version = "0.0.0" }
syntax = { path = "../syntax", version = "0.0.0" }
profile = { path = "../profile", version = "0.0.0" }
tt = { path = "../tt", version = "0.0.0" }
mbe = { path = "../mbe", version = "0.0.0" }
limit = { path = "../limit", version = "0.0.0" }
# local deps
stdx.workspace = true
intern.workspace = true
base-db.workspace = true
cfg.workspace = true
syntax.workspace = true
profile.workspace = true
tt.workspace = true
mbe.workspace = true
limit.workspace = true
[dev-dependencies]
expect-test = "1.4.0"

View file

@ -30,17 +30,17 @@ once_cell = "1.15.0"
typed-arena = "2.0.1"
rustc_index = { version = "0.0.20221221", package = "hkalbasi-rustc-ap-rustc_index", default-features = false }
stdx = { path = "../stdx", version = "0.0.0" }
intern = { path = "../intern", version = "0.0.0" }
hir-def = { path = "../hir-def", version = "0.0.0" }
hir-expand = { path = "../hir-expand", version = "0.0.0" }
base-db = { path = "../base-db", version = "0.0.0" }
profile = { path = "../profile", version = "0.0.0" }
syntax = { path = "../syntax", version = "0.0.0" }
limit = { path = "../limit", version = "0.0.0" }
# local deps
stdx.workspace = true
intern.workspace = true
hir-def.workspace = true
hir-expand.workspace = true
base-db.workspace = true
profile.workspace = true
syntax.workspace = true
limit.workspace = true
[dev-dependencies]
test-utils = { path = "../test-utils" }
expect-test = "1.4.0"
tracing = "0.1.35"
tracing-subscriber = { version = "0.3.16", default-features = false, features = [
@ -48,3 +48,6 @@ tracing-subscriber = { version = "0.3.16", default-features = false, features =
"registry",
] }
tracing-tree = "0.2.1"
# local deps
test-utils.workspace = true

View file

@ -19,12 +19,13 @@ itertools = "0.10.5"
smallvec = "1.10.0"
once_cell = "1.15.0"
stdx = { path = "../stdx", version = "0.0.0" }
syntax = { path = "../syntax", version = "0.0.0" }
base-db = { path = "../base-db", version = "0.0.0" }
profile = { path = "../profile", version = "0.0.0" }
hir-expand = { path = "../hir-expand", version = "0.0.0" }
hir-def = { path = "../hir-def", version = "0.0.0" }
hir-ty = { path = "../hir-ty", version = "0.0.0" }
tt = { path = "../tt", version = "0.0.0" }
cfg = { path = "../cfg", version = "0.0.0" }
# local deps
base-db.workspace = true
cfg.workspace = true
hir-def.workspace = true
hir-expand.workspace = true
hir-ty.workspace = true
profile.workspace = true
stdx.workspace = true
syntax.workspace = true
tt.workspace = true

View file

@ -18,17 +18,20 @@ itertools = "0.10.5"
either = "1.7.0"
smallvec = "1.10.0"
stdx = { path = "../stdx", version = "0.0.0" }
syntax = { path = "../syntax", version = "0.0.0" }
text-edit = { path = "../text-edit", version = "0.0.0" }
profile = { path = "../profile", version = "0.0.0" }
ide-db = { path = "../ide-db", version = "0.0.0" }
hir = { path = "../hir", version = "0.0.0" }
# local deps
stdx.workspace = true
syntax.workspace = true
text-edit.workspace = true
profile.workspace = true
ide-db.workspace = true
hir.workspace = true
[dev-dependencies]
test-utils = { path = "../test-utils" }
sourcegen = { path = "../sourcegen" }
expect-test = "1.4.0"
# local deps
test-utils.workspace = true
sourcegen.workspace = true
[features]
in-rust-tree = []

View file

@ -18,18 +18,20 @@ itertools = "0.10.5"
once_cell = "1.15.0"
smallvec = "1.10.0"
stdx = { path = "../stdx", version = "0.0.0" }
syntax = { path = "../syntax", version = "0.0.0" }
text-edit = { path = "../text-edit", version = "0.0.0" }
base-db = { path = "../base-db", version = "0.0.0" }
ide-db = { path = "../ide-db", version = "0.0.0" }
profile = { path = "../profile", version = "0.0.0" }
# local deps
base-db.workspace = true
ide-db.workspace = true
profile.workspace = true
stdx.workspace = true
syntax.workspace = true
text-edit.workspace = true
# completions crate should depend only on the top-level `hir` package. if you need
# something from some `hir-xxx` subpackage, reexport the API via `hir`.
hir = { path = "../hir", version = "0.0.0" }
hir.workspace = true
[dev-dependencies]
expect-test = "1.4.0"
test-utils = { path = "../test-utils" }
# local deps
test-utils.workspace = true

View file

@ -24,19 +24,22 @@ arrayvec = "0.7.2"
indexmap = "1.9.1"
memchr = "2.5.0"
stdx = { path = "../stdx", version = "0.0.0" }
parser = { path = "../parser", version = "0.0.0" }
syntax = { path = "../syntax", version = "0.0.0" }
text-edit = { path = "../text-edit", version = "0.0.0" }
base-db = { path = "../base-db", version = "0.0.0" }
profile = { path = "../profile", version = "0.0.0" }
# local deps
base-db.workspace = true
limit.workspace = true
parser.workspace = true
profile.workspace = true
stdx.workspace = true
syntax.workspace = true
text-edit .workspace = true
# ide should depend only on the top-level `hir` package. if you need
# something from some `hir-xxx` subpackage, reexport the API via `hir`.
hir = { path = "../hir", version = "0.0.0" }
limit = { path = "../limit", version = "0.0.0" }
hir.workspace = true
[dev-dependencies]
test-utils = { path = "../test-utils" }
sourcegen = { path = "../sourcegen" }
xshell = "0.2.2"
expect-test = "1.4.0"
# local deps
test-utils.workspace = true
sourcegen.workspace = true

View file

@ -17,19 +17,21 @@ either = "1.7.0"
itertools = "0.10.5"
serde_json = "1.0.86"
profile = { path = "../profile", version = "0.0.0" }
stdx = { path = "../stdx", version = "0.0.0" }
syntax = { path = "../syntax", version = "0.0.0" }
text-edit = { path = "../text-edit", version = "0.0.0" }
cfg = { path = "../cfg", version = "0.0.0" }
hir = { path = "../hir", version = "0.0.0" }
ide-db = { path = "../ide-db", version = "0.0.0" }
# local deps
profile.workspace = true
stdx.workspace = true
syntax.workspace = true
text-edit.workspace = true
cfg.workspace = true
hir.workspace = true
ide-db.workspace = true
[dev-dependencies]
expect-test = "1.4.0"
test-utils = { path = "../test-utils" }
sourcegen = { path = "../sourcegen" }
# local deps
test-utils.workspace = true
sourcegen.workspace = true
[features]
in-rust-tree = []

View file

@ -16,13 +16,16 @@ doctest = false
cov-mark = "2.0.0-pre.1"
itertools = "0.10.5"
text-edit = { path = "../text-edit", version = "0.0.0" }
parser = { path = "../parser", version = "0.0.0" }
syntax = { path = "../syntax", version = "0.0.0" }
ide-db = { path = "../ide-db", version = "0.0.0" }
hir = { path = "../hir", version = "0.0.0" }
stdx = { path = "../stdx", version = "0.0.0" }
# local deps
hir.workspace = true
ide-db.workspace = true
parser.workspace = true
stdx.workspace = true
syntax.workspace = true
text-edit.workspace = true
[dev-dependencies]
test-utils = { path = "../test-utils" }
expect-test = "1.4.0"
# local deps
test-utils.workspace = true

View file

@ -24,27 +24,29 @@ url = "2.3.1"
dot = "0.1.4"
smallvec = "1.10.0"
stdx = { path = "../stdx", version = "0.0.0" }
syntax = { path = "../syntax", version = "0.0.0" }
text-edit = { path = "../text-edit", version = "0.0.0" }
ide-db = { path = "../ide-db", version = "0.0.0" }
cfg = { path = "../cfg", version = "0.0.0" }
profile = { path = "../profile", version = "0.0.0" }
ide-assists = { path = "../ide-assists", version = "0.0.0" }
ide-diagnostics = { path = "../ide-diagnostics", version = "0.0.0" }
ide-ssr = { path = "../ide-ssr", version = "0.0.0" }
ide-completion = { path = "../ide-completion", version = "0.0.0" }
# local deps
cfg.workspace = true
ide-assists.workspace = true
ide-completion.workspace = true
ide-db.workspace = true
ide-diagnostics.workspace = true
ide-ssr.workspace = true
profile.workspace = true
stdx.workspace = true
syntax.workspace = true
text-edit.workspace = true
# ide should depend only on the top-level `hir` package. if you need
# something from some `hir-xxx` subpackage, reexport the API via `hir`.
hir = { path = "../hir", version = "0.0.0" }
hir.workspace = true
[target.'cfg(not(any(target_arch = "wasm32", target_os = "emscripten")))'.dependencies]
toolchain = { path = "../toolchain", version = "0.0.0" }
toolchain.workspace = true
[dev-dependencies]
test-utils = { path = "../test-utils" }
expect-test = "1.4.0"
# local deps
test-utils.workspace = true
[features]
in-rust-tree = ["ide-assists/in-rust-tree", "ide-diagnostics/in-rust-tree"]

View file

@ -17,10 +17,11 @@ rustc-hash = "1.1.0"
smallvec = "1.10.0"
tracing = "0.1.35"
syntax = { path = "../syntax", version = "0.0.0" }
parser = { path = "../parser", version = "0.0.0" }
tt = { path = "../tt", version = "0.0.0" }
stdx = { path = "../stdx", version = "0.0.0" }
# local deps
syntax.workspace = true
parser.workspace = true
tt.workspace = true
stdx.workspace = true
[dev-dependencies]
test-utils = { path = "../test-utils" }
test-utils.workspace = true

View file

@ -14,8 +14,10 @@ doctest = false
[dependencies]
drop_bomb = "0.1.5"
rustc_lexer = { version = "725.0.0", package = "rustc-ap-rustc_lexer" }
limit = { path = "../limit", version = "0.0.0" }
limit.workspace = true
[dev-dependencies]
expect-test = "1.4.0"
sourcegen = { path = "../sourcegen" }
sourcegen.workspace = true

View file

@ -25,9 +25,10 @@ tracing = "0.1.37"
memmap2 = "0.5.4"
snap = "1.0.5"
paths = { path = "../paths", version = "0.0.0" }
tt = { path = "../tt", version = "0.0.0" }
stdx = { path = "../stdx", version = "0.0.0" }
profile = { path = "../profile", version = "0.0.0" }
# local deps
paths.workspace = true
tt.workspace = true
stdx.workspace = true
profile.workspace = true
# Intentionally *not* depend on anything salsa-related
# base-db = { path = "../base-db", version = "0.0.0" }
# base-db.workspace = true

View file

@ -9,7 +9,7 @@ license.workspace = true
rust-version.workspace = true
[dependencies]
proc-macro-srv = { version = "0.0.0", path = "../proc-macro-srv" }
proc-macro-srv.workspace = true
[features]
sysroot-abi = ["proc-macro-srv/sysroot-abi"]

View file

@ -22,16 +22,16 @@ object = { version = "0.29.0", default-features = false, features = [
libloading = "0.7.3"
memmap2 = "0.5.4"
tt = { path = "../tt", version = "0.0.0" }
mbe = { path = "../mbe", version = "0.0.0" }
paths = { path = "../paths", version = "0.0.0" }
proc-macro-api = { path = "../proc-macro-api", version = "0.0.0" }
tt.workspace = true
mbe.workspace = true
paths.workspace = true
proc-macro-api.workspace = true
[dev-dependencies]
expect-test = "1.4.0"
# used as proc macro test targets
proc-macro-test = { path = "../proc-macro-test" }
proc-macro-test.workspace = true
[features]
sysroot-abi = []

View file

@ -12,6 +12,9 @@ rust-version.workspace = true
doctest = false
[build-dependencies]
proc-macro-test-impl = { path = "imp", version = "0.0.0" }
toolchain = { path = "../toolchain", version = "0.0.0" }
cargo_metadata = "0.15.0"
proc-macro-test-impl = { path = "imp", version = "0.0.0" }
# local deps
toolchain.workspace = true

View file

@ -21,12 +21,13 @@ serde_json = "1.0.86"
anyhow = "1.0.62"
la-arena = { version = "0.3.0", path = "../../lib/la-arena" }
cfg = { path = "../cfg", version = "0.0.0" }
base-db = { path = "../base-db", version = "0.0.0" }
toolchain = { path = "../toolchain", version = "0.0.0" }
paths = { path = "../paths", version = "0.0.0" }
stdx = { path = "../stdx", version = "0.0.0" }
profile = { path = "../profile", version = "0.0.0" }
# local deps
base-db.workspace = true
cfg.workspace = true
paths.workspace = true
profile.workspace = true
stdx.workspace = true
toolchain.workspace = true
[dev-dependencies]
expect-test = "1.4.0"

View file

@ -47,26 +47,25 @@ tracing-log = "0.1.3"
tracing-tree = "0.2.1"
always-assert = "0.1.2"
stdx = { path = "../stdx", version = "0.0.0" }
flycheck = { path = "../flycheck", version = "0.0.0" }
ide = { path = "../ide", version = "0.0.0" }
ide-db = { path = "../ide-db", version = "0.0.0" }
profile = { path = "../profile", version = "0.0.0" }
project-model = { path = "../project-model", version = "0.0.0" }
syntax = { path = "../syntax", version = "0.0.0" }
vfs = { path = "../vfs", version = "0.0.0" }
vfs-notify = { path = "../vfs-notify", version = "0.0.0" }
cfg = { path = "../cfg", version = "0.0.0" }
toolchain = { path = "../toolchain", version = "0.0.0" }
tt = { path = "../tt", version = "0.0.0" }
proc-macro-api = { path = "../proc-macro-api", version = "0.0.0" }
cfg.workspace = true
flycheck.workspace = true
hir-def.workspace = true
hir-ty.workspace = true
hir.workspace = true
ide-db.workspace = true
# This should only be used in CLI
ide-ssr = { path = "../ide-ssr", version = "0.0.0" }
hir = { path = "../hir", version = "0.0.0" }
hir-def = { path = "../hir-def", version = "0.0.0" }
hir-ty = { path = "../hir-ty", version = "0.0.0" }
proc-macro-srv = { path = "../proc-macro-srv", version = "0.0.0" }
ide-ssr.workspace = true
ide.workspace = true
proc-macro-api.workspace = true
proc-macro-srv.workspace = true
profile.workspace = true
project-model.workspace = true
stdx.workspace = true
syntax.workspace = true
toolchain.workspace = true
tt.workspace = true
vfs-notify.workspace = true
vfs.workspace = true
[target.'cfg(windows)'.dependencies]
winapi = "0.3.9"
@ -79,9 +78,9 @@ expect-test = "1.4.0"
jod-thread = "0.1.2"
xshell = "0.2.2"
test-utils = { path = "../test-utils" }
sourcegen = { path = "../sourcegen" }
mbe = { path = "../mbe" }
test-utils.workspace = true
sourcegen.workspace = true
mbe.workspace = true
[features]
jemalloc = ["jemallocator", "profile/jemalloc"]

View file

@ -22,10 +22,10 @@ once_cell = "1.15.0"
indexmap = "1.9.1"
smol_str = "0.1.23"
stdx = { path = "../stdx", version = "0.0.0" }
text-edit = { path = "../text-edit", version = "0.0.0" }
parser = { path = "../parser", version = "0.0.0" }
profile = { path = "../profile", version = "0.0.0" }
parser.workspace = true
profile.workspace = true
stdx.workspace = true
text-edit.workspace = true
[dev-dependencies]
rayon = "1.5.3"
@ -34,8 +34,8 @@ proc-macro2 = "1.0.47"
quote = "1.0.20"
ungrammar = "1.16.1"
test-utils = { path = "../test-utils" }
sourcegen = { path = "../sourcegen" }
test-utils.workspace = true
sourcegen.workspace = true
[features]
in-rust-tree = []

View file

@ -17,5 +17,5 @@ dissimilar = "1.0.4"
text-size = "1.1.0"
rustc-hash = "1.1.0"
stdx = { path = "../stdx", version = "0.0.0" }
profile = { path = "../profile", version = "0.0.0" }
stdx.workspace = true
profile.workspace = true

View file

@ -14,4 +14,4 @@ doctest = false
[dependencies]
smol_str = "0.1.23"
stdx = { path = "../stdx", version = "0.0.0" }
stdx.workspace = true

View file

@ -18,5 +18,5 @@ walkdir = "2.3.2"
crossbeam-channel = "0.5.5"
notify = "5.0"
vfs = { path = "../vfs", version = "0.0.0" }
paths = { path = "../paths", version = "0.0.0" }
vfs.workspace = true
paths.workspace = true

View file

@ -16,5 +16,5 @@ rustc-hash = "1.1.0"
fst = "0.4.7"
indexmap = "1.9.1"
paths = { path = "../paths", version = "0.0.0" }
stdx = { path = "../stdx", version = "0.0.0" }
paths.workspace = true
stdx.workspace = true