From 65fe3b1d9e647375808744991735483cc2f0f442 Mon Sep 17 00:00:00 2001
From: Adam Gutglick <adam@spiraldb.com>
Date: Mon, 5 Aug 2024 17:50:47 +0100
Subject: [PATCH] Run cargo-sort on the whole workspace (#550)

@robert3005 and I talked, trying to automate some minor chores
---
 Cargo.toml                            |  2 +-
 build-vortex/Cargo.toml               | 18 ++++++++--------
 encodings/alp/Cargo.toml              |  2 +-
 encodings/byte-bool/Cargo.toml        |  4 ++--
 encodings/datetime-parts/Cargo.toml   |  6 +++---
 encodings/dict/Cargo.toml             |  4 ++--
 encodings/fastlanes/Cargo.toml        |  2 +-
 encodings/roaring/Cargo.toml          | 10 ++++-----
 encodings/runend-bool/Cargo.toml      |  5 ++---
 encodings/runend/Cargo.toml           |  2 +-
 encodings/zigzag/Cargo.toml           |  4 ++--
 pyvortex/Cargo.toml                   | 14 ++++++-------
 vortex-array/Cargo.toml               |  8 +++----
 vortex-buffer/Cargo.toml              | 18 ++++++++--------
 vortex-datafusion/Cargo.toml          | 30 +++++++++++++--------------
 vortex-dtype/Cargo.toml               |  2 +-
 vortex-error/Cargo.toml               |  2 +-
 vortex-expr/Cargo.toml                |  4 ++--
 vortex-flatbuffers/Cargo.toml         | 18 ++++++++--------
 vortex-sampling-compressor/Cargo.toml | 18 ++++++++--------
 20 files changed, 86 insertions(+), 87 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index e4d019b361..a584aa3ca4 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,8 +11,8 @@ members = [
     "vortex-error",
     "vortex-expr",
     "vortex-flatbuffers",
-    "vortex-serde",
     "vortex-sampling-compressor",
+    "vortex-serde",
 ]
 resolver = "2"
 
diff --git a/build-vortex/Cargo.toml b/build-vortex/Cargo.toml
index cff6438393..8d5db09018 100644
--- a/build-vortex/Cargo.toml
+++ b/build-vortex/Cargo.toml
@@ -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 }
diff --git a/encodings/alp/Cargo.toml b/encodings/alp/Cargo.toml
index ef0e435525..0f0a0649a4 100644
--- a/encodings/alp/Cargo.toml
+++ b/encodings/alp/Cargo.toml
@@ -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]
diff --git a/encodings/byte-bool/Cargo.toml b/encodings/byte-bool/Cargo.toml
index 9f610ddc3d..08468f135c 100644
--- a/encodings/byte-bool/Cargo.toml
+++ b/encodings/byte-bool/Cargo.toml
@@ -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 }
diff --git a/encodings/datetime-parts/Cargo.toml b/encodings/datetime-parts/Cargo.toml
index 83be524aa4..12513b2a56 100644
--- a/encodings/datetime-parts/Cargo.toml
+++ b/encodings/datetime-parts/Cargo.toml
@@ -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"] }
diff --git a/encodings/dict/Cargo.toml b/encodings/dict/Cargo.toml
index 2868553510..faf64a316c 100644
--- a/encodings/dict/Cargo.toml
+++ b/encodings/dict/Cargo.toml
@@ -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]
@@ -32,4 +32,4 @@ simplelog = { workspace = true }
 
 [[bench]]
 name = "dict_compress"
-harness = false
\ No newline at end of file
+harness = false
diff --git a/encodings/fastlanes/Cargo.toml b/encodings/fastlanes/Cargo.toml
index 7690ad7912..b1bef832d8 100644
--- a/encodings/fastlanes/Cargo.toml
+++ b/encodings/fastlanes/Cargo.toml
@@ -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]
diff --git a/encodings/roaring/Cargo.toml b/encodings/roaring/Cargo.toml
index 1f14d4bac2..8b0271dc19 100644
--- a/encodings/roaring/Cargo.toml
+++ b/encodings/roaring/Cargo.toml
@@ -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
diff --git a/encodings/runend-bool/Cargo.toml b/encodings/runend-bool/Cargo.toml
index 0055113d4e..28fc1cb48f 100644
--- a/encodings/runend-bool/Cargo.toml
+++ b/encodings/runend-bool/Cargo.toml
@@ -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
\ No newline at end of file
+harness = false
diff --git a/encodings/runend/Cargo.toml b/encodings/runend/Cargo.toml
index 89ef4e2ed3..7cba5e8a8f 100644
--- a/encodings/runend/Cargo.toml
+++ b/encodings/runend/Cargo.toml
@@ -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]
diff --git a/encodings/zigzag/Cargo.toml b/encodings/zigzag/Cargo.toml
index 20aefbdbda..bce8288d5d 100644
--- a/encodings/zigzag/Cargo.toml
+++ b/encodings/zigzag/Cargo.toml
@@ -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" }
diff --git a/pyvortex/Cargo.toml b/pyvortex/Cargo.toml
index 10ba3f5f5a..089fc8df1e 100644
--- a/pyvortex/Cargo.toml
+++ b/pyvortex/Cargo.toml
@@ -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
diff --git a/vortex-array/Cargo.toml b/vortex-array/Cargo.toml
index e0d0f46ea8..33a865057a 100644
--- a/vortex-array/Cargo.toml
+++ b/vortex-array/Cargo.toml
@@ -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 }
@@ -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"] }
@@ -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
diff --git a/vortex-buffer/Cargo.toml b/vortex-buffer/Cargo.toml
index 48bf440ace..66e63441bc 100644
--- a/vortex-buffer/Cargo.toml
+++ b/vortex-buffer/Cargo.toml
@@ -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 }
diff --git a/vortex-datafusion/Cargo.toml b/vortex-datafusion/Cargo.toml
index abe626d007..177c3025d8 100644
--- a/vortex-datafusion/Cargo.toml
+++ b/vortex-datafusion/Cargo.toml
@@ -1,21 +1,16 @@
 [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 }
@@ -23,14 +18,19 @@ 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"] }
diff --git a/vortex-dtype/Cargo.toml b/vortex-dtype/Cargo.toml
index 5c38ea9f38..e3bf205f76 100644
--- a/vortex-dtype/Cargo.toml
+++ b/vortex-dtype/Cargo.toml
@@ -40,4 +40,4 @@ workspace = true
 # default = ["flatbuffers", "proto", "serde"]
 flatbuffers = ["dep:flatbuffers"]
 proto = ["dep:prost"]
-serde = ["dep:serde"]
\ No newline at end of file
+serde = ["dep:serde"]
diff --git a/vortex-error/Cargo.toml b/vortex-error/Cargo.toml
index c3df57a1bc..a36a426160 100644
--- a/vortex-error/Cargo.toml
+++ b/vortex-error/Cargo.toml
@@ -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
diff --git a/vortex-expr/Cargo.toml b/vortex-expr/Cargo.toml
index 1fda5a040d..9536ce0515 100644
--- a/vortex-expr/Cargo.toml
+++ b/vortex-expr/Cargo.toml
@@ -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" }
@@ -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"]
\ No newline at end of file
+serde = ["dep:serde", "vortex-dtype/serde", "vortex-scalar/serde"]
diff --git a/vortex-flatbuffers/Cargo.toml b/vortex-flatbuffers/Cargo.toml
index 85f3eb334b..509f73f4ec 100644
--- a/vortex-flatbuffers/Cargo.toml
+++ b/vortex-flatbuffers/Cargo.toml
@@ -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 }
diff --git a/vortex-sampling-compressor/Cargo.toml b/vortex-sampling-compressor/Cargo.toml
index a800136be4..b96a166834 100644
--- a/vortex-sampling-compressor/Cargo.toml
+++ b/vortex-sampling-compressor/Cargo.toml
@@ -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 }