From bdb55c34cebca1f7926f15a1540aa8fa8b091c65 Mon Sep 17 00:00:00 2001
From: Jesse Braham <jesse@beta7.io>
Date: Wed, 5 Feb 2025 14:32:59 +0100
Subject: [PATCH] Add Taplo config file and format Cargo manifests

---
 cargo-espflash/Cargo.toml | 13 ++++----
 espflash/Cargo.toml       | 67 ++++++++++++++++++---------------------
 taplo.toml                |  5 +++
 3 files changed, 43 insertions(+), 42 deletions(-)
 create mode 100644 taplo.toml

diff --git a/cargo-espflash/Cargo.toml b/cargo-espflash/Cargo.toml
index 4c50fdf7..46fc036f 100644
--- a/cargo-espflash/Cargo.toml
+++ b/cargo-espflash/Cargo.toml
@@ -1,11 +1,12 @@
 [package]
-name = "cargo-espflash"
-version = "4.0.0-dev"
-edition = "2021"
+name         = "cargo-espflash"
+version      = "4.0.0-dev"
+edition      = "2021"
 rust-version = "1.82"
-description = "Cargo subcommand for flashing Espressif devices"
-repository = "https://github.com/esp-rs/espflash"
-license = "MIT OR Apache-2.0"
+description  = "Cargo subcommand for flashing Espressif devices"
+repository   = "https://github.com/esp-rs/espflash"
+license      = "MIT OR Apache-2.0"
+
 keywords = ["cargo", "cli", "embedded", "esp"]
 categories = [
     "command-line-utilities",
diff --git a/espflash/Cargo.toml b/espflash/Cargo.toml
index 39a3d614..c49d3c05 100644
--- a/espflash/Cargo.toml
+++ b/espflash/Cargo.toml
@@ -23,43 +23,38 @@ path              = "./src/bin/espflash.rs"
 required-features = ["cli", "serialport"]
 
 [dependencies]
-addr2line = { version = "0.22.0", optional = true }
-base64 = "0.22.1"
-bytemuck = { version = "1.21.0", features = ["derive"] }
-clap = { version = "4.5.24", features = [
-    "derive",
-    "env",
-    "wrap_help",
-], optional = true }
-clap_complete = { version = "4.5.41", optional = true }
-comfy-table = { version = "7.1.3", optional = true }
-crossterm = { version = "0.25.0", optional = true } # 0.26.x and 0.27.x causes issues on Windows
-ctrlc = { version = "3.4.5", optional = true }
-# defmt dependencies are pinned since defmt does not guarantee MSRV even for patch releases
-defmt-decoder = { version = "=0.4.0", features = ["unstable"], optional = true }
-defmt-parser = { version = "=0.4.1", features = ["unstable"], optional = true }
-dialoguer = { version = "0.11.0", optional = true }
-directories = { version = "5.0.1", optional = true }
-env_logger = { version = "0.11.6", optional = true }
-esp-idf-part = "0.5.0"
-flate2 = "1.0.35"
-hex = { version = "0.4.3", features = ["serde"]}
-indicatif = { version = "0.17.9", optional = true }
-lazy_static = { version = "1.5.0", optional = true }
-log = "0.4.22"
-md-5 = "0.10.6"
-miette = "7.4.0"
-parse_int = { version = "0.6.0", optional = true }
-regex = { version = "1.11.1", optional = true }
-serde = { version = "1.0.217", features = ["derive"] }
-serialport = { version = "4.6.1", default-features = false, optional = true }
-sha2 = "0.10.8"
-slip-codec = { version = "0.4.0", optional = true }
-strum = { version = "0.26.3", features = ["derive"] }
-thiserror = "2.0.10"
-toml = { version = "0.8.19", optional = true }
+addr2line       = { version = "0.22.0", optional = true }
+base64          = "0.22.1"
+bytemuck        = { version = "1.21.0", features = ["derive"] }
+clap            = { version = "4.5.24", features = ["derive", "env", "wrap_help"], optional = true }
+clap_complete   = { version = "4.5.41", optional = true }
+comfy-table     = { version = "7.1.3", optional = true }
+crossterm       = { version = "0.25.0", optional = true }
+ctrlc           = { version = "3.4.5", optional = true }
+defmt-decoder   = { version = "=0.4.0", features = ["unstable"], optional = true }
+defmt-parser    = { version = "=0.4.1", features = ["unstable"], optional = true }
+dialoguer       = { version = "0.11.0", optional = true }
+directories     = { version = "5.0.1", optional = true }
+env_logger      = { version = "0.11.6", optional = true }
+esp-idf-part    = "0.5.0"
+flate2          = "1.0.35"
+hex             = { version = "0.4.3", features = ["serde"] }
+indicatif       = { version = "0.17.9", optional = true }
+lazy_static     = { version = "1.5.0", optional = true }
+log             = "0.4.22"
+md-5            = "0.10.6"
+miette          = "7.4.0"
+parse_int       = { version = "0.6.0", optional = true }
+regex           = { version = "1.11.1", optional = true }
+serde           = { version = "1.0.217", features = ["derive"] }
+serialport      = { version = "4.6.1", default-features = false, optional = true }
+sha2            = "0.10.8"
+slip-codec      = { version = "0.4.0", optional = true }
+strum           = { version = "0.26.3", features = ["derive"] }
+thiserror       = "2.0.10"
+toml            = { version = "0.8.19", optional = true }
 update-informer = { version = "1.2.0", optional = true }
-xmas-elf = "0.9.1"
+xmas-elf        = "0.9.1"
 
 [target.'cfg(unix)'.dependencies]
 libc = "0.2.169"
diff --git a/taplo.toml b/taplo.toml
new file mode 100644
index 00000000..d383d0a5
--- /dev/null
+++ b/taplo.toml
@@ -0,0 +1,5 @@
+[formatting]
+align_entries       = true
+allowed_blank_lines = 1
+column_width        = 100
+reorder_arrays      = true