Skip to content

Commit

Permalink
Run cargo-sort on the whole workspace (#550)
Browse files Browse the repository at this point in the history
@robert3005 and I talked, trying to automate some minor chores
  • Loading branch information
AdamGS authored Aug 5, 2024
1 parent c7f78f4 commit 65fe3b1
Show file tree
Hide file tree
Showing 20 changed files with 86 additions and 87 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ members = [
"vortex-error",
"vortex-expr",
"vortex-flatbuffers",
"vortex-serde",
"vortex-sampling-compressor",
"vortex-serde",
]
resolver = "2"

Expand Down
18 changes: 9 additions & 9 deletions build-vortex/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
[package]
name = "build-vortex"
publish = false
version.workspace = true
homepage.workspace = true
repository.workspace = true
authors.workspace = true
license.workspace = true
keywords.workspace = true
include.workspace = true
edition.workspace = true
rust-version.workspace = true
version = { workspace = true }
homepage = { workspace = true }
repository = { workspace = true }
authors = { workspace = true }
license = { workspace = true }
keywords = { workspace = true }
include = { workspace = true }
edition = { workspace = true }
rust-version = { workspace = true }

[dependencies]
cargo_metadata = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion encodings/alp/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ itertools = { workspace = true }
num-traits = { workspace = true }
serde = { workspace = true, features = ["derive"] }
vortex-array = { path = "../../vortex-array" }
vortex-error = { path = "../../vortex-error" }
vortex-dtype = { path = "../../vortex-dtype" }
vortex-error = { path = "../../vortex-error" }
vortex-scalar = { path = "../../vortex-scalar" }

[dev-dependencies]
Expand Down
4 changes: 2 additions & 2 deletions encodings/byte-bool/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ num-traits = { workspace = true }
serde = { workspace = true, features = ["derive"] }
vortex-array = { path = "../../vortex-array" }
vortex-buffer = { path = "../../vortex-buffer" }
vortex-error = { path = "../../vortex-error" }
vortex-dtype = { path = "../../vortex-dtype" }
vortex-scalar = { path = "../../vortex-scalar" }
vortex-error = { path = "../../vortex-error" }
vortex-expr = { path = "../../vortex-expr" }
vortex-scalar = { path = "../../vortex-scalar" }

[dev-dependencies]
divan = { workspace = true }
6 changes: 3 additions & 3 deletions encodings/datetime-parts/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ license = { workspace = true }
workspace = true

[dependencies]
log = { workspace = true }
serde = { workspace = true, features = ["derive"] }
vortex-array = { "path" = "../../vortex-array" }
vortex-error = { path = "../../vortex-error" }
vortex-dtype = { "path" = "../../vortex-dtype" }
vortex-error = { path = "../../vortex-error" }
vortex-scalar = { path = "../../vortex-scalar" }
log = { workspace = true }
serde = { workspace = true, features = ["derive"] }
4 changes: 2 additions & 2 deletions encodings/dict/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ hashbrown = { workspace = true }
num-traits = { workspace = true }
serde = { workspace = true }
vortex-array = { path = "../../vortex-array" }
vortex-error = { path = "../../vortex-error" }
vortex-dtype = { path = "../../vortex-dtype" }
vortex-error = { path = "../../vortex-error" }
vortex-scalar = { path = "../../vortex-scalar" }

[lints]
Expand All @@ -32,4 +32,4 @@ simplelog = { workspace = true }

[[bench]]
name = "dict_compress"
harness = false
harness = false
2 changes: 1 addition & 1 deletion encodings/fastlanes/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ itertools = { workspace = true }
num-traits = { workspace = true }
serde = { workspace = true }
vortex-array = { path = "../../vortex-array" }
vortex-error = { path = "../../vortex-error" }
vortex-dtype = { path = "../../vortex-dtype" }
vortex-error = { path = "../../vortex-error" }
vortex-scalar = { path = "../../vortex-scalar" }

[dev-dependencies]
Expand Down
10 changes: 5 additions & 5 deletions encodings/roaring/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ rust-version = { workspace = true }

[dependencies]
arrow-buffer = { workspace = true }
croaring = { workspace = true }
log = { workspace = true }
num-traits = { workspace = true }
serde = { workspace = true }
vortex-array = { path = "../../vortex-array" }
vortex-buffer = { path = "../../vortex-buffer" }
vortex-error = { path = "../../vortex-error" }
vortex-dtype = { path = "../../vortex-dtype" }
vortex-error = { path = "../../vortex-error" }
vortex-scalar = { path = "../../vortex-scalar" }
croaring = { workspace = true }
num-traits = { workspace = true }
log = { workspace = true }
serde = { workspace = true }

[lints]
workspace = true
5 changes: 2 additions & 3 deletions encodings/runend-bool/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,17 @@ itertools = { workspace = true }
num-traits = { workspace = true }
serde = { workspace = true }
vortex-array = { path = "../../vortex-array" }
vortex-error = { path = "../../vortex-error" }
vortex-dtype = { path = "../../vortex-dtype" }
vortex-error = { path = "../../vortex-error" }
vortex-scalar = { path = "../../vortex-scalar" }

[dev-dependencies]
criterion = { workspace = true }
rand = { workspace = true }


[lints]
workspace = true

[[bench]]
name = "ree_bool_compress"
harness = false
harness = false
2 changes: 1 addition & 1 deletion encodings/runend/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ itertools = { workspace = true }
num-traits = { workspace = true }
serde = { workspace = true }
vortex-array = { path = "../../vortex-array" }
vortex-error = { path = "../../vortex-error" }
vortex-dtype = { path = "../../vortex-dtype" }
vortex-error = { path = "../../vortex-error" }
vortex-scalar = { path = "../../vortex-scalar" }

[lints]
Expand Down
4 changes: 2 additions & 2 deletions encodings/zigzag/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ edition = { workspace = true }
rust-version = { workspace = true }

[dependencies]
serde = { workspace = true, features = ["derive"] }
vortex-array = { path = "../../vortex-array" }
vortex-error = { path = "../../vortex-error" }
vortex-dtype = { path = "../../vortex-dtype" }
vortex-error = { path = "../../vortex-error" }
vortex-scalar = { path = "../../vortex-scalar" }
zigzag = { workspace = true }
serde = { workspace = true, features = ["derive"] }

[dev-dependencies]
vortex-fastlanes = { path = "../fastlanes" }
Expand Down
14 changes: 7 additions & 7 deletions pyvortex/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,19 @@ crate-type = ["rlib", "cdylib"]

[dependencies]
arrow = { workspace = true }
vortex-array = { path = "../vortex-array" }
log = { workspace = true }
paste = { workspace = true }
pyo3 = { workspace = true }
pyo3-log = { workspace = true }
vortex-alp = { path = "../encodings/alp" }
vortex-array = { path = "../vortex-array" }
vortex-dict = { path = "../encodings/dict" }
vortex-dtype = { path = "../vortex-dtype" }
vortex-error = { path = "../vortex-error" }
vortex-fastlanes = { path = "../encodings/fastlanes" }
vortex-runend = { path = "../encodings/runend" }
vortex-roaring = { path = "../encodings/roaring" }
vortex-dtype = { path = "../vortex-dtype" }
vortex-runend = { path = "../encodings/runend" }
vortex-zigzag = { path = "../encodings/zigzag" }
log = { workspace = true }
paste = { workspace = true }
pyo3 = { workspace = true }
pyo3-log = { workspace = true }

# We may need this workaround?
# https://pyo3.rs/v0.20.2/faq.html#i-cant-run-cargo-test-or-i-cant-build-in-a-cargo-workspace-im-having-linker-issues-like-symbol-not-found-or-undefined-reference-to-_pyexc_systemerror
8 changes: 4 additions & 4 deletions vortex-array/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ path = "src/lib.rs"
workspace = true

[dependencies]
arrow-arith = { workspace = true }
arrow-array = { workspace = true }
arrow-buffer = { workspace = true }
arrow-cast = { workspace = true }
arrow-select = { workspace = true }
arrow-schema = { workspace = true }
arrow-ord = { workspace = true }
arrow-arith = { workspace = true }
arrow-schema = { workspace = true }
arrow-select = { workspace = true }
bytes = { workspace = true }
enum-iterator = { workspace = true }
flatbuffers = { workspace = true }
Expand All @@ -40,6 +40,7 @@ num_enum = { workspace = true }
paste = { workspace = true }
pin-project = { workspace = true }
rand = { workspace = true }
serde = { workspace = true, features = ["derive"] }
vortex-buffer = { path = "../vortex-buffer" }
vortex-dtype = { path = "../vortex-dtype", features = ["flatbuffers", "serde"] }
vortex-error = { path = "../vortex-error", features = ["flexbuffers"] }
Expand All @@ -49,7 +50,6 @@ vortex-scalar = { path = "../vortex-scalar", features = [
"flatbuffers",
"serde",
] }
serde = { workspace = true, features = ["derive"] }

[target.'cfg(target_arch = "wasm32")'.dependencies]
# Enable the JS feature of getrandom (via rand) to supprt wasm32 target
Expand Down
18 changes: 9 additions & 9 deletions vortex-buffer/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
[package]
name = "vortex-buffer"
description = "A byte buffer implementation for Vortex"
version.workspace = true
homepage.workspace = true
repository.workspace = true
authors.workspace = true
license.workspace = true
keywords.workspace = true
include.workspace = true
edition.workspace = true
rust-version.workspace = true
version = { workspace = true }
homepage = { workspace = true }
repository = { workspace = true }
authors = { workspace = true }
license = { workspace = true }
keywords = { workspace = true }
include = { workspace = true }
edition = { workspace = true }
rust-version = { workspace = true }

[dependencies]
arrow-buffer = { workspace = true }
Expand Down
30 changes: 15 additions & 15 deletions vortex-datafusion/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,36 +1,36 @@
[package]
name = "vortex-datafusion"
version.workspace = true
homepage.workspace = true
repository.workspace = true
authors.workspace = true
license.workspace = true
keywords.workspace = true
include.workspace = true
edition.workspace = true
rust-version.workspace = true
version = { workspace = true }
homepage = { workspace = true }
repository = { workspace = true }
authors = { workspace = true }
license = { workspace = true }
keywords = { workspace = true }
include = { workspace = true }
edition = { workspace = true }
rust-version = { workspace = true }

[dependencies]
vortex-array = { path = "../vortex-array" }
vortex-dtype = { path = "../vortex-dtype" }
vortex-expr = { path = "../vortex-expr" }
vortex-error = { path = "../vortex-error" }
vortex-scalar = { path = "../vortex-scalar", features = ["datafusion"] }

arrow-array = { workspace = true }
arrow-schema = { workspace = true }
async-trait = { workspace = true }

datafusion = { workspace = true }
datafusion-common = { workspace = true }
datafusion-expr = { workspace = true }
datafusion-execution = { workspace = true }
datafusion-expr = { workspace = true }
datafusion-physical-expr = { workspace = true }
datafusion-physical-plan = { workspace = true }
futures = { workspace = true }
itertools = { workspace = true }
lazy_static = { workspace = true }
pin-project = { workspace = true }
vortex-array = { path = "../vortex-array" }
vortex-dtype = { path = "../vortex-dtype" }
vortex-error = { path = "../vortex-error" }
vortex-expr = { path = "../vortex-expr" }
vortex-scalar = { path = "../vortex-scalar", features = ["datafusion"] }

[dev-dependencies]
tokio = { workspace = true, features = ["test-util"] }
Expand Down
2 changes: 1 addition & 1 deletion vortex-dtype/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,4 @@ workspace = true
# default = ["flatbuffers", "proto", "serde"]
flatbuffers = ["dep:flatbuffers"]
proto = ["dep:prost"]
serde = ["dep:serde"]
serde = ["dep:serde"]
2 changes: 1 addition & 1 deletion vortex-error/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ path = "src/lib.rs"
arrow-schema = { workspace = true }
flatbuffers = { workspace = true }
flexbuffers = { workspace = true, optional = true }
object_store = { workspace = true, optional = true }
parquet = { workspace = true, optional = true }
thiserror = { workspace = true }
worker = { workspace = true, optional = true }
object_store = { workspace = true, optional = true }

[lints]
workspace = true
4 changes: 2 additions & 2 deletions vortex-expr/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ workspace = true
datafusion-common = { workspace = true, optional = true }
datafusion-expr = { workspace = true, optional = true }
prost = { workspace = true, optional = true }
serde = { workspace = true, optional = true, features = ["derive"] }
vortex-dtype = { path = "../vortex-dtype" }
vortex-error = { path = "../vortex-error" }
vortex-scalar = { path = "../vortex-scalar" }
serde = { workspace = true, optional = true, features = ["derive"] }

[build-dependencies]
build-vortex = { path = "../build-vortex" }
Expand All @@ -30,4 +30,4 @@ build-vortex = { path = "../build-vortex" }
default = ["proto"]
datafusion = ["dep:datafusion-common", "dep:datafusion-expr", "vortex-scalar/datafusion"]
proto = ["dep:prost", "vortex-dtype/proto", "vortex-scalar/proto"]
serde = ["dep:serde", "vortex-dtype/serde", "vortex-scalar/serde"]
serde = ["dep:serde", "vortex-dtype/serde", "vortex-scalar/serde"]
18 changes: 9 additions & 9 deletions vortex-flatbuffers/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
[package]
name = "vortex-flatbuffers"
version.workspace = true
homepage.workspace = true
repository.workspace = true
authors.workspace = true
license.workspace = true
keywords.workspace = true
include.workspace = true
edition.workspace = true
rust-version.workspace = true
version = { workspace = true }
homepage = { workspace = true }
repository = { workspace = true }
authors = { workspace = true }
license = { workspace = true }
keywords = { workspace = true }
include = { workspace = true }
edition = { workspace = true }
rust-version = { workspace = true }

[dependencies]
flatbuffers = { workspace = true }
Expand Down
18 changes: 9 additions & 9 deletions vortex-sampling-compressor/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
[package]
name = "vortex-sampling-compressor"
version.workspace = true
description = "Vortex compressor that uses statistical sampling"
homepage.workspace = true
repository.workspace = true
authors.workspace = true
license.workspace = true
keywords.workspace = true
include.workspace = true
edition.workspace = true
rust-version.workspace = true
version = { workspace = true }
homepage = { workspace = true }
repository = { workspace = true }
authors = { workspace = true }
license = { workspace = true }
keywords = { workspace = true }
include = { workspace = true }
edition = { workspace = true }
rust-version = { workspace = true }

[dependencies]
log = { workspace = true }
Expand Down

0 comments on commit 65fe3b1

Please sign in to comment.