chore: move dependencies into the workspace and inherit from there

This commit is contained in:
Amaan Qureshi 2024-02-08 06:43:21 -05:00
parent 7980669267
commit a969fc428c
9 changed files with 122 additions and 95 deletions

BIN
Cargo.lock generated

Binary file not shown.

View file

@ -1,6 +1,6 @@
[workspace]
default-members = ["cli"]
members = ["cli", "lib"]
members = ["cli", "cli/config", "cli/loader", "lib", "tags", "highlight"]
resolver = "2"
[workspace.package]
@ -8,15 +8,61 @@ rust-version = "1.70"
[profile.optimize]
inherits = "release"
strip = true # Automatically strip symbols from the binary.
lto = true # Link-time optimization.
opt-level = 3 # Optimization level 3.
codegen-units = 1 # Maximum size reduction optimizations.
strip = true # Automatically strip symbols from the binary.
lto = true # Link-time optimization.
opt-level = 3 # Optimization level 3.
codegen-units = 1 # Maximum size reduction optimizations.
[profile.size]
inherits = "optimize"
opt-level = "s" # Optimize for size.
opt-level = "s" # Optimize for size.
[profile.profile]
inherits = "optimize"
strip = false
[workspace.dependencies]
ansi_term = "0.12.1"
anstyle = "1.0.6"
anyhow = "1.0.79"
cc = "1.0.83"
clap = { version = "4.4.18", features = [
"cargo",
"derive",
"env",
"help",
"unstable-styles",
] }
ctor = "0.2.6"
ctrlc = { version = "3.4.2", features = ["termination"] }
difference = "2.0.0"
dirs = "5.0.1"
glob = "0.3.1"
html-escape = "0.2.13"
indexmap = "2.2.2"
indoc = "2.0.4"
lazy_static = "1.4.0"
libloading = "0.8.1"
log = { version = "0.4.20", features = ["std"] }
memchr = "2.7.1"
once_cell = "1.19.0"
path-slash = "0.2.1"
pretty_assertions = "1.4.0"
rand = "0.8.5"
regex = "1.10.3"
regex-syntax = "0.8.2"
rustc-hash = "1.1.0"
semver = "1.0.21"
serde = { version = "1.0.196", features = ["derive"] }
serde_derive = "1.0.196"
serde_json = { version = "1.0.113", features = ["preserve_order"] }
smallbitvec = "2.5.1"
tempfile = "3.10.0"
thiserror = "1.0.56"
tiny_http = "0.12.0"
toml = "0.8.10"
unindent = "0.2.3"
walkdir = "2.4.0"
wasmparser = "0.121.0"
webbrowser = "0.8.12"
which = "6.0.0"

View file

@ -21,41 +21,36 @@ name = "benchmark"
harness = false
[features]
# default = ["wasm"]
wasm = ["tree-sitter/wasm", "tree-sitter-loader/wasm"]
[dependencies]
ansi_term = "0.12.1"
anstyle = "1.0.4"
anyhow = "1.0.72"
clap = { version = "4.4.18", features = [
"cargo",
"derive",
"env",
"help",
"unstable-styles",
] }
ctrlc = { version = "3.4.0", features = ["termination"] }
difference = "2.0.0"
dirs = "5.0.1"
glob = "0.3.1"
html-escape = "0.2.13"
indexmap = "2.0.0"
lazy_static = "1.4.0"
memchr = "2.7.1"
path-slash = "0.2.1"
regex = "1.9.1"
regex-syntax = "0.8"
rustc-hash = "1.1.0"
semver = "1.0.18"
serde = "1.0.188"
serde_derive = "1.0"
smallbitvec = "2.5.1"
tiny_http = "0.12.0"
walkdir = "2.3.3"
wasmparser = "0.121"
webbrowser = "0.8.10"
which = "6.0.0"
ansi_term.workspace = true
anstyle.workspace = true
anyhow.workspace = true
clap.workspace = true
ctrlc.workspace = true
difference.workspace = true
dirs.workspace = true
glob.workspace = true
html-escape.workspace = true
indexmap.workspace = true
lazy_static.workspace = true
log.workspace = true
memchr.workspace = true
path-slash.workspace = true
regex.workspace = true
regex-syntax.workspace = true
rustc-hash.workspace = true
semver.workspace = true
serde.workspace = true
serde_derive.workspace = true
serde_json.workspace = true
smallbitvec.workspace = true
tiny_http.workspace = true
walkdir.workspace = true
wasmparser.workspace = true
webbrowser.workspace = true
which.workspace = true
[dependencies.tree-sitter]
version = "0.20.10"
@ -66,34 +61,26 @@ version = "0.19.0"
path = "config"
[dependencies.tree-sitter-highlight]
version = "0.20"
version = "0.20.2"
path = "../highlight"
[dependencies.tree-sitter-loader]
version = "0.20"
version = "0.20.0"
path = "loader"
[dependencies.tree-sitter-tags]
version = "0.20"
version = "0.20.2"
path = "../tags"
[dependencies.serde_json]
version = "1.0"
features = ["preserve_order"]
[dependencies.log]
version = "0.4.19"
features = ["std"]
[dev-dependencies]
tree_sitter_proc_macro = { path = "src/tests/proc_macro", package = "tree-sitter-tests-proc-macro" }
rand = "0.8.5"
tempfile = "3.6.0"
pretty_assertions = "1.4.0"
ctor = "0.2.4"
unindent = "0.2.2"
indoc = "2.0.3"
rand.workspace = true
tempfile.workspace = true
pretty_assertions.workspace = true
ctor.workspace = true
unindent.workspace = true
indoc.workspace = true
[build-dependencies]
toml = "0.8.9"
toml.workspace = true

View file

@ -3,7 +3,7 @@ name = "tree-sitter-config"
description = "User configuration of tree-sitter's command line programs"
version = "0.19.0"
authors = ["Max Brunsfeld <maxbrunsfeld@gmail.com>"]
edition = "2018"
edition = "2021"
license = "MIT"
readme = "README.md"
keywords = ["incremental", "parsing"]
@ -12,10 +12,7 @@ repository = "https://github.com/tree-sitter/tree-sitter"
rust-version.workspace = true
[dependencies]
anyhow = "1.0"
dirs = "3.0"
serde = { version = "1.0", features = ["derive"] }
[dependencies.serde_json]
version = "1.0"
features = ["preserve_order"]
anyhow.workspace = true
dirs.workspace = true
serde.workspace = true
serde_json.workspace = true

View file

@ -3,7 +3,7 @@ name = "tree-sitter-loader"
description = "Locates, builds, and loads tree-sitter grammars at runtime"
version = "0.20.0"
authors = ["Max Brunsfeld <maxbrunsfeld@gmail.com>"]
edition = "2018"
edition = "2021"
license = "MIT"
readme = "README.md"
keywords = ["incremental", "parsing"]
@ -15,27 +15,24 @@ rust-version.workspace = true
wasm = ["tree-sitter/wasm"]
[dependencies]
anyhow = "1.0"
cc = "^1.0.58"
dirs = "3.0"
libloading = "0.7"
once_cell = "1.7"
regex = "1"
serde = { version = "1.0", features = ["derive"] }
which = "4.1.0"
[dependencies.serde_json]
version = "1.0"
features = ["preserve_order"]
anyhow.workspace = true
cc.workspace = true
dirs.workspace = true
libloading.workspace = true
once_cell.workspace = true
regex.workspace = true
serde.workspace = true
serde_json.workspace = true
which.workspace = true
[dependencies.tree-sitter]
version = "0.20"
version = "0.20.10"
path = "../../lib"
[dependencies.tree-sitter-highlight]
version = "0.20"
version = "0.20.2"
path = "../../highlight"
[dependencies.tree-sitter-tags]
version = "0.20"
version = "0.20.2"
path = "../../tags"

View file

@ -9,7 +9,7 @@ rust-version.workspace = true
proc-macro = true
[dependencies]
proc-macro2 = "1.0.63"
quote = "1"
proc-macro2 = "1.0.78"
quote = "1.0.35"
rand = "0.8.5"
syn = { version = "1", features = ["full"] }
syn = { version = "2.0.48", features = ["full"] }

View file

@ -8,7 +8,7 @@ authors = [
]
license = "MIT"
readme = "README.md"
edition = "2018"
edition = "2021"
keywords = ["incremental", "parsing", "syntax", "highlighting"]
categories = ["parsing", "text-editors"]
repository = "https://github.com/tree-sitter/tree-sitter"
@ -18,10 +18,10 @@ rust-version.workspace = true
crate-type = ["lib", "staticlib"]
[dependencies]
lazy_static = "1.4.0"
regex = "1.9.1"
thiserror = "1.0.43"
lazy_static.workspace = true
regex.workspace = true
thiserror.workspace = true
[dependencies.tree-sitter]
version = "0.20"
version = "0.20.10"
path = "../lib"

View file

@ -27,7 +27,7 @@ include = [
wasm = ["wasmtime", "wasmtime-c-api"]
[dependencies]
regex = "1.9.1"
regex.workspace = true
[dependencies.wasmtime]
git = "https://github.com/bytecodealliance/wasmtime"
@ -45,7 +45,7 @@ default-features = false
[build-dependencies]
bindgen = { version = "0.69.4", optional = true }
cc = "1.0.79"
cc.workspace = true
[lib]
path = "binding_rust/lib.rs"

View file

@ -8,7 +8,7 @@ authors = [
]
license = "MIT"
readme = "README.md"
edition = "2018"
edition = "2021"
keywords = ["incremental", "parsing", "syntax", "tagging"]
categories = ["parsing", "text-editors"]
repository = "https://github.com/tree-sitter/tree-sitter"
@ -18,10 +18,10 @@ rust-version.workspace = true
crate-type = ["lib", "staticlib"]
[dependencies]
regex = "1.9.1"
memchr = "2.5.0"
thiserror = "1.0.43"
regex.workspace = true
memchr.workspace = true
thiserror.workspace = true
[dependencies.tree-sitter]
version = "0.20"
version = "0.20.10"
path = "../lib"