Skip to content

Commit

Permalink
Rationalize dependencies in Cargo.toml files
Browse files Browse the repository at this point in the history
* Remove unused dependencies
* Move dependencies for single crates from workspace Cargo.toml to crate Cargo.toml
* Remove cruft and comments from Cargo.toml files and fix formatting a bit
  • Loading branch information
jlapeyre committed Jan 13, 2024
1 parent 15d9220 commit eb73739
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 42 deletions.
15 changes: 0 additions & 15 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,3 @@ oq3_syntax = { path = "./crates/oq3_syntax", version = "0.0.0" }
semantics = { path = "./crates/semantics", version = "0.0.0" }
source_file = { path = "./crates/source_file", version = "0.0.0" }
sourcegen = { path = "./crates/sourcegen", version = "0.0.0" }

# non-local crates
limit = { version = "0.0.188", package = "ra_ap_limit" }
stdx = { version = "0.0.188", package = "ra_ap_stdx"}
triomphe = { version = "0.1.8", default-features = false, features = ["std"] }
smallvec = { version = "1.10.0", features = [
"const_new",
"union",
"const_generics",
] }
smol_str = "0.2.0"
nohash-hasher = "0.2.0"
text-size = "1.1.0"
# can't upgrade due to dashmap depending on 0.12.3 currently
hashbrown = { version = "0.12.3", features = ["inline-more"], default-features = false }
26 changes: 6 additions & 20 deletions crates/oq3_syntax/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,26 +12,22 @@ rust-version.workspace = true
doctest = false

[dependencies]

# external crates
cov-mark = "2.0.0-pre.1"
either = "1.7.0"
indexmap = "2.0.0"
itertools = "0.10.5"
once_cell = "1.17.0"
rowan = "0.15.11"
rustc-hash = "1.1.0"
once_cell = "1.17.0"
indexmap = "2.0.0"
smol_str.workspace = true
triomphe.workspace = true
smol_str = "0.2.0"
triomphe = { version = "0.1.8", default-features = false, features = ["std"] }

# local crates

# rustc_lexer.workspace = true
lexer.workspace = true
parser.workspace = true
# profile.workspace = true
stdx.workspace = true
# text-edit.workspace = true
sourcegen.workspace = true
stdx = { version = "0.0.188", package = "ra_ap_stdx"}

[dev-dependencies]
rayon = "1.6.1"
Expand All @@ -40,13 +36,3 @@ proc-macro2 = "1.0.47"
quote = "1.0.20"
ungrammar = "1.16.1"
clap = { version = "4.0", features = ["derive"] }

# local crate

sourcegen.workspace = true

# This brings in tons of things
#test-utils.workspace = true

# [features]
# in-rust-tree = []
5 changes: 1 addition & 4 deletions crates/parser/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,13 @@ name = "parser"
version = "0.1.0"
edition = "2021"

# Added this explicit target just so I could disable the doc tests (GJL Sept 2023)
[lib]
name = "parser"
doctest = false

[dependencies]
lexer.workspace = true
drop_bomb = "0.1.5"

limit.workspace = true
limit = { version = "0.0.188", package = "ra_ap_limit" }

[dev-dependencies]
expect-test = "1.4.0"
2 changes: 1 addition & 1 deletion crates/semantics/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ rust-version.workspace = true
doctest = false

[dependencies]
oq3_syntax.workspace = true
source_file.workspace = true
hashbrown = { version = "0.14" }
rowan = "0.15.11"
oq3_syntax.workspace = true
boolenum = "0.1"

[dev-dependencies]
Expand Down
2 changes: 0 additions & 2 deletions crates/source_file/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,5 @@ doctest = false
[dependencies]
ariadne = { version = "0.3.0", features = ["auto-color"] }
oq3_syntax.workspace = true

source-span = { version = "2.7.0" }

[dev-dependencies]

0 comments on commit eb73739

Please sign in to comment.