ci: install cargo-sort and check if dependencies are sorted

.github/workflows/rust.yml

@@ -228,3 +228,5 @@ jobs:
 
       - name: Format
         run: cargo fmt -- --check
+      - name: Sort dependencies
+        run: cargo install cargo-sort && cargo sort --workspace --check

Cargo.toml

@@ -16,48 +16,51 @@ readme = "README.md"
 [workspace.dependencies]
 async-trait = "0.1.58"
 base64 = "0.22"
-log = "0.4"
-time = { version = "0.3.36", features = [
-  "serde-human-readable",
-  "macros",
-  "local-offset",
-] }
 clap = { version = "4.5.7", features = ["derive"] }
 config = { version = "0.15.8", default-features = false, features = ["toml"] }
 directories = "6.0.0"
 eyre = "0.6"
 fs-err = "3.1"
 interim = { version = "0.2.0", features = ["time_0_3"] }
 itertools = "0.13.0"
+log = "0.4"
+minijinja = "2.9.0"
+pretty_assertions = "1.3.0"
 rand = { version = "0.8.5", features = ["std"] }
+reqwest = { version = "0.12", features = [
+  "json",
+  "rustls-tls-native-roots",
+], default-features = false }
+rustix = { version = "0.38.34", features = ["process", "fs"] }
 semver = "1.0.20"
 serde = { version = "1.0.202", features = ["derive"] }
 serde_json = "1.0.119"
-tokio = { version = "1", features = ["full"] }
-uuid = { version = "1.9", features = ["v4", "v7", "serde"] }
-whoami = "1.5.1"
-typed-builder = "0.18.2"
-pretty_assertions = "1.3.0"
+sql-builder = "3"
+sqlx = { version = "0.8", features = [
+  "runtime-tokio-rustls",
+  "time",
+  "postgres",
+  "uuid",
+] }
+tempfile = { version = "3.19" }
 thiserror = "1.0"
-rustix = { version = "0.38.34", features = ["process", "fs"] }
+time = { version = "0.3.36", features = [
+  "serde-human-readable",
+  "macros",
+  "local-offset",
+] }
+tokio = { version = "1", features = ["full"] }
 tower = "0.5"
 tracing = "0.1"
-sql-builder = "3"
-tempfile = { version = "3.19" }
-minijinja = "2.9.0"
-
-[workspace.dependencies.tracing-subscriber]
-version = "0.3"
-features = ["ansi", "fmt", "registry", "env-filter"]
-
-[workspace.dependencies.reqwest]
-version = "0.12"
-features = ["json", "rustls-tls-native-roots"]
-default-features = false
-
-[workspace.dependencies.sqlx]
-version = "0.8"
-features = ["runtime-tokio-rustls", "time", "postgres", "uuid"]
+tracing-subscriber = { version = "0.3", features = [
+  "ansi",
+  "fmt",
+  "registry",
+  "env-filter",
+] }
+typed-builder = "0.18.2"
+uuid = { version = "1.9", features = ["v4", "v7", "serde"] }
+whoami = "1.5.1"
 
 # The profile that 'cargo dist' will build with
 [profile.dist]

crates/atuin-client/Cargo.toml

@@ -19,62 +19,62 @@ daemon = []
 check-update = []
 
 [dependencies]
+async-trait = { workspace = true }
 atuin-common = { path = "../atuin-common", version = "18.10.0" }
-
-log = { workspace = true }
 base64 = { workspace = true }
-time = { workspace = true, features = ["macros", "formatting", "parsing"] }
 clap = { workspace = true }
-eyre = { workspace = true }
-directories = { workspace = true }
-uuid = { workspace = true }
-whoami = { workspace = true }
-interim = { workspace = true }
 config = { workspace = true }
-serde = { workspace = true }
-serde_json = { workspace = true }
+
+# theme
+crossterm = { version = "0.28.1", features = ["serde"] }
+crypto_secretbox = "0.1.1"
+directories = { workspace = true }
+eyre = { workspace = true }
+fs-err = { workspace = true }
+futures = "0.3"
+generic-array = { version = "0.14", features = ["serde"] }
+hex = { version = "0.4", optional = true }
 humantime = "2.1.0"
-async-trait = { workspace = true }
+indicatif = "0.18.0"
+interim = { workspace = true }
 itertools = { workspace = true }
-rand = { workspace = true }
-shellexpand = "3"
-sqlx = { workspace = true, features = ["sqlite", "regexp"] }
+lazy_static = "1.4.0"
+
+log = { workspace = true }
+memchr = "2.7"
 minspan = "0.1.5"
+palette = { version = "0.7.5", features = ["serializing"] }
+rand = { workspace = true }
 regex = "1.10.5"
-serde_regex = "1.1.0"
-fs-err = { workspace = true }
-sql-builder = { workspace = true }
-memchr = "2.7"
+reqwest = { workspace = true, optional = true }
 rmp = { version = "0.8.14" }
-typed-builder = { workspace = true }
-tokio = { workspace = true }
-semver = { workspace = true }
-thiserror = { workspace = true }
-futures = "0.3"
-crypto_secretbox = "0.1.1"
-generic-array = { version = "0.14", features = ["serde"] }
-serde_with = "3.8.1"
+rusty_paserk = { version = "0.5.0", default-features = false, features = ["v4", "serde"] }
 
 # encryption
 rusty_paseto = { version = "0.8.0", default-features = false }
-rusty_paserk = { version = "0.5.0", default-features = false, features = ["v4", "serde"] }
-
-# sync
-urlencoding = { version = "2.1.0", optional = true }
-reqwest = { workspace = true, optional = true }
-hex = { version = "0.4", optional = true }
+semver = { workspace = true }
+serde = { workspace = true }
+serde_json = { workspace = true }
+serde_regex = "1.1.0"
+serde_with = "3.8.1"
 sha2 = { version = "0.10", optional = true }
-indicatif = "0.18.0"
+shellexpand = "3"
+sql-builder = { workspace = true }
+sqlx = { workspace = true, features = ["sqlite", "regexp"] }
+strum = { version = "0.26.2", features = ["strum_macros"] }
+strum_macros = "0.26.3"
+thiserror = { workspace = true }
+time = { workspace = true, features = ["macros", "formatting", "parsing"] }
 tiny-bip39 = "=1.0.0"
+tokio = { workspace = true }
+typed-builder = { workspace = true }
 
-# theme
-crossterm = { version = "0.28.1", features = ["serde"] }
-palette = { version = "0.7.5", features = ["serializing"] }
-lazy_static = "1.4.0"
-strum_macros = "0.26.3"
-strum = { version = "0.26.2", features = ["strum_macros"] }
+# sync
+urlencoding = { version = "2.1.0", optional = true }
+uuid = { workspace = true }
+whoami = { workspace = true }
 
 [dev-dependencies]
-tokio = { version = "1", features = ["full"] }
 pretty_assertions = { workspace = true }
 testing_logger = "0.1.1"
+tokio = { version = "1", features = ["full"] }

crates/atuin-common/Cargo.toml

@@ -13,20 +13,20 @@ repository = { workspace = true }
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-time = { workspace = true }
-serde = { workspace = true }
-uuid = { workspace = true }
-typed-builder = { workspace = true }
-eyre = { workspace = true }
-sqlx = { workspace = true }
-semver = { workspace = true }
-thiserror = { workspace = true }
-directories = { workspace = true }
-sysinfo = "0.30.7"
 base64 = { workspace = true }
+directories = { workspace = true }
+eyre = { workspace = true }
 getrandom = "0.2"
 
 lazy_static = "1.4.0"
+semver = { workspace = true }
+serde = { workspace = true }
+sqlx = { workspace = true }
+sysinfo = "0.30.7"
+thiserror = { workspace = true }
+time = { workspace = true }
+typed-builder = { workspace = true }
+uuid = { workspace = true }
 
 [dev-dependencies]
 pretty_assertions = { workspace = true }

crates/atuin-daemon/Cargo.toml

@@ -11,33 +11,33 @@ homepage.workspace = true
 repository.workspace = true
 readme.workspace = true
 
+[target.'cfg(target_os = "linux")'.dependencies]
+listenfd = "1.0.1"
+
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
 atuin-client = { path = "../atuin-client", version = "18.10.0" }
 atuin-dotfiles = { path = "../atuin-dotfiles", version = "18.10.0" }
 atuin-history = { path = "../atuin-history", version = "18.10.0" }
 
-time = { workspace = true }
-uuid = { workspace = true }
-tokio = { workspace = true }
-tower = { workspace = true }
-eyre = { workspace = true }
-tracing = { workspace = true }
-tracing-subscriber = { workspace = true }
-
 dashmap = "5.5.3"
-tonic-types = "0.12.0"
-tonic = "0.12"
+eyre = { workspace = true }
+hyper-util = "0.1"
 prost = "0.13"
 prost-types = "0.13"
-tokio-stream = {version="0.1.14", features=["net"]}
-hyper-util = "0.1"
 
 rand.workspace = true
 
-[target.'cfg(target_os = "linux")'.dependencies]
-listenfd = "1.0.1"
+time = { workspace = true }
+tokio = { workspace = true }
+tokio-stream = { version = "0.1.14", features = ["net"] }
+tonic = "0.12"
+tonic-types = "0.12.0"
+tower = { workspace = true }
+tracing = { workspace = true }
+tracing-subscriber = { workspace = true }
+uuid = { workspace = true }
 
 [build-dependencies]
 protox = "0.8.0"

crates/atuin-dotfiles/Cargo.toml

@@ -14,12 +14,12 @@ readme.workspace = true
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-atuin-common = { path = "../atuin-common", version = "18.10.0" }
 atuin-client = { path = "../atuin-client", version = "18.10.0" }
+atuin-common = { path = "../atuin-common", version = "18.10.0" }
+crypto_secretbox = "0.1.1"
 
 eyre = { workspace = true }
-tokio = { workspace = true }
-rmp = { version = "0.8.14" }
 rand = { workspace = true }
+rmp = { version = "0.8.14" }
 serde = { workspace = true }
-crypto_secretbox = "0.1.1"
+tokio = { workspace = true }

crates/atuin-history/Cargo.toml

@@ -15,10 +15,10 @@ readme.workspace = true
 
 [dependencies]
 atuin-client = { path = "../atuin-client", version = "18.10.0" }
+crossterm = { version = "0.28.1", features = ["use-dev-tty"] }
+serde = { workspace = true }
 
 time = { workspace = true }
-serde = { workspace = true }
-crossterm = { version = "0.28.1", features = ["use-dev-tty"] }
 unicode-segmentation = "1.11.0"
 
 [dev-dependencies]

crates/atuin-kv/Cargo.toml

@@ -16,12 +16,12 @@ readme.workspace = true
 [dependencies]
 atuin-client = { path = "../atuin-client", version = "18.10.0" }
 atuin-common = { path = "../atuin-common", version = "18.10.0" }
+eyre = { workspace = true }
+pretty_assertions = { workspace = true }
+rmp = { version = "0.8.14" }
+sqlx = { workspace = true }
+tokio = { workspace = true }
 
 tracing = { workspace = true }
 tracing-subscriber = { workspace = true }
-rmp = { version = "0.8.14" }
-eyre = { workspace = true }
-tokio = { workspace = true }
 typed-builder = { workspace = true }
-pretty_assertions = { workspace = true }
-sqlx = { workspace = true }

crates/atuin-scripts/Cargo.toml

@@ -16,19 +16,19 @@ readme.workspace = true
 [dependencies]
 atuin-client = { path = "../atuin-client", version = "18.10.0" }
 atuin-common = { path = "../atuin-common", version = "18.10.0" }
-
-tracing = { workspace = true }
-tracing-subscriber = { workspace = true }
-rmp = { version = "0.8.14" }
-uuid = { workspace = true }
 eyre = { workspace = true }
-tokio = { workspace = true }
-serde = { workspace = true }
-typed-builder = { workspace = true }
+minijinja = { workspace = true }
 pretty_assertions = { workspace = true }
+rmp = { version = "0.8.14" }
+serde = { workspace = true }
+serde_json = { workspace = true }
 sql-builder = { workspace = true }
 sqlx = { workspace = true }
 tempfile = { workspace = true }
-minijinja = { workspace = true }
-serde_json = { workspace = true }
+tokio = { workspace = true }
+
+tracing = { workspace = true }
+tracing-subscriber = { workspace = true }
+typed-builder = { workspace = true }
+uuid = { workspace = true }
 

crates/atuin-server-database/Cargo.toml

@@ -10,11 +10,11 @@ homepage = { workspace = true }
 repository = { workspace = true }
 
 [dependencies]
+async-trait = { workspace = true }
 atuin-common = { path = "../atuin-common", version = "18.10.0" }
-
-tracing = { workspace = true }
-time = { workspace = true }
 eyre = { workspace = true }
 serde = { workspace = true }
-async-trait = { workspace = true }
+time = { workspace = true }
+
+tracing = { workspace = true }
 url = "2.5.2"

crates/atuin-server-postgres/Cargo.toml

@@ -10,16 +10,16 @@ homepage = { workspace = true }
 repository = { workspace = true }
 
 [dependencies]
+async-trait = { workspace = true }
 atuin-common = { path = "../atuin-common", version = "18.10.0" }
 atuin-server-database = { path = "../atuin-server-database", version = "18.10.0" }
 
 eyre = { workspace = true }
-tracing = { workspace = true }
-time = { workspace = true }
+futures-util = "0.3"
+metrics = "0.24"
+rand.workspace = true
 serde = { workspace = true }
 sqlx = { workspace = true }
-async-trait = { workspace = true }
+time = { workspace = true }
+tracing = { workspace = true }
 uuid = { workspace = true }
-metrics = "0.24"
-futures-util = "0.3"
-rand.workspace = true