git.delta.rocks / fleet / refs/commits / 8058495d74b6

difftreelog

style add taplo config

Lach2025-04-27parent: #426fcb5.patch.diff
in: push-kyumtlkprzyotrunk

6 files changed

modifiedCargo.tomldiffbeforeafterboth
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -6,28 +6,21 @@
 package.rust-version = "1.82.0"
 
 [workspace.dependencies]
-nixlike = { path = "./crates/nixlike" }
 better-command = { path = "./crates/better-command" }
 fleet-shared = { path = "./crates/fleet-shared" }
 nix-eval = { path = "./crates/nix-eval" }
+nixlike = { path = "./crates/nixlike" }
 
-tokio = { version = "1.36.0", features = [
-  "fs",
-  "rt",
-  "macros",
-  "sync",
-  "time",
-  "rt-multi-thread",
-] }
-tokio-util = { version = "0.7.11", features = ["codec"] }
-clap = { version = "4.5", features = ["derive", "env", "wrap_help", "unicode"] }
-clap_complete = "4.5"
 age = { version = "0.11", features = ["ssh"] }
 anyhow = "1.0"
-tracing = "0.1"
-tracing-subscriber = { version = "0.3", features = ["fmt", "env-filter"] }
+clap = { version = "4.5", features = ["derive", "env", "unicode", "wrap_help"] }
+clap_complete = "4.5"
+nix = { version = "0.29.0", features = ["fs", "user"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 tempfile = "3.10"
-nix = { version = "0.29.0", features = ["user", "fs"] }
 thiserror = "2.0.3"
+tokio = { version = "1.36.0", features = ["fs", "macros", "rt", "rt-multi-thread", "sync", "time"] }
+tokio-util = { version = "0.7.11", features = ["codec"] }
+tracing = "0.1"
+tracing-subscriber = { version = "0.3", features = ["env-filter", "fmt"] }
modifiedcrates/nix-eval/Cargo.tomldiffbeforeafterboth
8[dependencies]8[dependencies]
9anyhow.workspace = true9anyhow.workspace = true
10better-command.workspace = true10better-command.workspace = true
11futures = "0.3.30"
12itertools = "0.13.0"
13nixlike.workspace = true11nixlike.workspace = true
14r2d2 = "0.8.10"
15regex = "1.10.6"
16serde = { workspace = true, features = ["derive"] }12serde = { workspace = true, features = ["derive"] }
17serde_json.workspace = true13serde_json.workspace = true
18thiserror.workspace = true14thiserror.workspace = true
19tokio = { workspace = true, features = ["process", "io-util"] }15tokio = { workspace = true, features = ["io-util", "process"] }
20tokio-util.workspace = true16tokio-util.workspace = true
21tracing.workspace = true17tracing.workspace = true
18
19futures = "0.3.30"
20itertools = "0.13.0"
21r2d2 = "0.8.10"
22regex = "1.10.6"
22unindent = "0.2.3"23unindent = "0.2.3"
2324
24# [build-dependencies]25# [build-dependencies]
modifiedcrates/nix-native-eval/Cargo.tomldiffbeforeafterboth
--- a/crates/nix-native-eval/Cargo.toml
+++ b/crates/nix-native-eval/Cargo.toml
@@ -6,4 +6,5 @@
 
 [dependencies]
 anyhow.workspace = true
+
 nixrs = { git = "https://github.com/Anillc/nixrs", version = "0.1.0" }
modifiedcrates/nixlike/Cargo.tomldiffbeforeafterboth
--- a/crates/nixlike/Cargo.toml
+++ b/crates/nixlike/Cargo.toml
@@ -6,10 +6,11 @@
 
 [dependencies]
 thiserror.workspace = true
+
 alejandra = { git = "https://github.com/kamadorueda/alejandra" }
 linked-hash-map = "0.5.6"
 peg = "0.8.2"
-serde = "1.0.196"
-serde_json = "1.0.113"
 ron = "0.8.1"
+serde = "1.0.196"
 serde-transcode = "1.1.1"
+serde_json = "1.0.113"
modifiedcrates/nixlike/fuzz/Cargo.tomldiffbeforeafterboth
--- a/crates/nixlike/fuzz/Cargo.toml
+++ b/crates/nixlike/fuzz/Cargo.toml
@@ -11,9 +11,7 @@
 
 [dependencies]
 libfuzzer-sys = "0.4"
-
-[dependencies.nixlike]
-path = ".."
+nixlike.path = ".."
 
 # Prevent this from interfering with workspaces
 [workspace]
addedtaplo.tomldiffbeforeafterboth
--- /dev/null
+++ b/taplo.toml
@@ -0,0 +1,13 @@
+[formatting]
+inline_table_expand = false
+indent_string = "\t"
+array_auto_expand = false
+
+[[rule]]
+include = ["**/Cargo.toml"]
+keys = ['dependencies', 'workspace.dependencies']
+
+[rule.formatting]
+reorder_keys = true
+reorder_arrays = true
+column_width = 9999