From 84196b4503806b8e57c85fe21fe00c1e1b8d63a0 Mon Sep 17 00:00:00 2001
From: Michael Weiss <michael.weiss@eviden.com>
Date: Thu, 4 Jan 2024 19:12:57 +0100
Subject: [PATCH 1/2] Stop visually aligning the dependency versions in
 Cargo.toml

It looks pretty but is really inconvenient for (Git) diffs (at least
when having to realign by adding or removing whitespace) and Cargo
commands like `cargo add` also don't align entries.

Signed-off-by: Michael Weiss <michael.weiss@eviden.com>
---
 Cargo.toml | 102 ++++++++++++++++++++++++++---------------------------
 1 file changed, 51 insertions(+), 51 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 4f4c1381..b24f2fde 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -24,59 +24,59 @@ maintenance = { status = "passively-maintained" }
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-anyhow         = "1"
-aquamarine     = "0.4"
-ascii_table    = "4"
-bytesize       = "1"
-chrono         = "0.4"
-clap           = { version = "4", features = ["cargo"] }
-clap_complete  = "4"
-colored        = "2"
-config         = { version = "0.11", default-features = false, features = [ "toml" ] }
-csv            = "1"
-daggy          = { version = "0.8", features = [ "serde" ] }
-dialoguer      = "0.11"
-diesel         = { version = "2", features = ["postgres", "chrono", "uuid", "serde_json", "r2d2"] }
+anyhow = "1"
+aquamarine = "0.4"
+ascii_table = "4"
+bytesize = "1"
+chrono = "0.4"
+clap = { version = "4", features = ["cargo"] }
+clap_complete = "4"
+colored = "2"
+config = { version = "0.11", default-features = false, features = [ "toml" ] }
+csv = "1"
+daggy = { version = "0.8", features = [ "serde" ] }
+dialoguer = "0.11"
+diesel = { version = "2", features = ["postgres", "chrono", "uuid", "serde_json", "r2d2"] }
 diesel_migrations = "2"
-filters        = "0.4"
-futures        = "0.3"
-getset         = "0.1"
-git2           = "0.18"
-handlebars     = { version = "5", features = ["no_logging"] }
-human-panic    = "1"
-humantime      = "2"
-indicatif      = "0.17"
-indoc          = "2"
-itertools      = "0.12"
-lazy_static    = "1"
-parse-display  = "0.8"
-pom            = "3"
-ptree          = { version = "0.4", default-features = false }
-rayon          = "1"
-regex          = "1"
-reqwest        = { version = "0.11", features = [ "stream" ] }
-resiter        = "0.5"
+filters = "0.4"
+futures = "0.3"
+getset = "0.1"
+git2 = "0.18"
+handlebars = { version = "5", features = ["no_logging"] }
+human-panic = "1"
+humantime = "2"
+indicatif = "0.17"
+indoc = "2"
+itertools = "0.12"
+lazy_static = "1"
+parse-display = "0.8"
+pom = "3"
+ptree = { version = "0.4", default-features = false }
+rayon = "1"
+regex = "1"
+reqwest = { version = "0.11", features = [ "stream" ] }
+resiter = "0.5"
 result-inspect = "0.3"
-rlimit         = "0.10"
-rustversion    = "1"
-semver         = { version = "1", features = [ "serde" ] }
-serde          = "1"
-serde_json     = "1"
-sha-1          = "0.10"
-sha2           = "0.10"
-shiplift       = "0.7"
-syntect        = "5"
-tar            = "0.4"
-terminal_size  = "0.3"
-tokio          = { version = "1", features = ["macros", "fs", "process", "io-util", "time"] }
-tokio-stream   = "0.1"
-typed-builder  = "0.18"
-unindent       = "0.2"
-url            = { version = "2", features = ["serde"] }
-uuid           = { version = "1", features = ["serde", "v4"] }
-walkdir        = "2"
-which          = "5"
-xdg            = "2"
+rlimit = "0.10"
+rustversion = "1"
+semver = { version = "1", features = [ "serde" ] }
+serde = "1"
+serde_json = "1"
+sha-1 = "0.10"
+sha2 = "0.10"
+shiplift = "0.7"
+syntect = "5"
+tar = "0.4"
+terminal_size = "0.3"
+tokio = { version = "1", features = ["macros", "fs", "process", "io-util", "time"] }
+tokio-stream = "0.1"
+typed-builder = "0.18"
+unindent = "0.2"
+url = { version = "2", features = ["serde"] }
+uuid = { version = "1", features = ["serde", "v4"] }
+walkdir = "2"
+which = "5"
+xdg = "2"
 rand = "0.8"
 tracing = "0.1"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }

From 43f9175ebe2f08474b856249c730c21aab5c4bf9 Mon Sep 17 00:00:00 2001
From: Michael Weiss <michael.weiss@eviden.com>
Date: Thu, 4 Jan 2024 19:20:41 +0100
Subject: [PATCH 2/2] Fix the alphabetical sorting order of the dependencies in
 Cargo.toml

This was done to restore the alphabetical sorting order using the `sort`
command with `LC_ALL=C` (we ignored it when adding three new
dependencies due to the version alignment).

Signed-off-by: Michael Weiss <michael.weiss@eviden.com>
---
 Cargo.toml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index b24f2fde..6b563f45 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -52,6 +52,7 @@ lazy_static = "1"
 parse-display = "0.8"
 pom = "3"
 ptree = { version = "0.4", default-features = false }
+rand = "0.8"
 rayon = "1"
 regex = "1"
 reqwest = { version = "0.11", features = [ "stream" ] }
@@ -70,6 +71,8 @@ tar = "0.4"
 terminal_size = "0.3"
 tokio = { version = "1", features = ["macros", "fs", "process", "io-util", "time"] }
 tokio-stream = "0.1"
+tracing = "0.1"
+tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 typed-builder = "0.18"
 unindent = "0.2"
 url = { version = "2", features = ["serde"] }
@@ -77,9 +80,6 @@ uuid = { version = "1", features = ["serde", "v4"] }
 walkdir = "2"
 which = "5"
 xdg = "2"
-rand = "0.8"
-tracing = "0.1"
-tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 
 [dev-dependencies]
 toml = "0.8"