From 0cf995356f9833033f66b297a197176917d28163 Mon Sep 17 00:00:00 2001 From: Sergio Gasquez Date: Thu, 2 Nov 2023 19:24:39 +0100 Subject: [PATCH] style: Format Cargo toml files --- cargo-espflash/Cargo.toml | 24 +++++----- espflash/Cargo.toml | 93 ++++++++++++++++----------------------- 2 files changed, 49 insertions(+), 68 deletions(-) diff --git a/cargo-espflash/Cargo.toml b/cargo-espflash/Cargo.toml index 42f9ec62..0124a3b0 100644 --- a/cargo-espflash/Cargo.toml +++ b/cargo-espflash/Cargo.toml @@ -1,7 +1,7 @@ [package] -name = "cargo-espflash" -version = "3.0.0-dev" -edition = "2021" +name = "cargo-espflash" +version = "3.0.0-dev" +edition = "2021" rust-version = "1.70" description = "Cargo subcommand for flashing Espressif devices" repository = "https://github.com/esp-rs/espflash" @@ -16,15 +16,15 @@ pkg-fmt = "zip" [dependencies] cargo_metadata = "0.18.0" -clap = { version = "4.4.6", features = ["derive", "wrap_help"] } -env_logger = "0.10.0" -esp-idf-part = "0.4.1" -espflash = { version = "3.0.0-dev", path = "../espflash" } -log = "0.4.20" -miette = { version = "5.10.0", features = ["fancy"] } -serde = { version = "1.0.188", features = ["derive"] } -thiserror = "1.0.49" -toml = "0.8.2" +clap = { version = "4.4.6", features = ["derive", "wrap_help"] } +env_logger = "0.10.0" +esp-idf-part = "0.4.1" +espflash = { version = "3.0.0-dev", path = "../espflash" } +log = "0.4.20" +miette = { version = "5.10.0", features = ["fancy"] } +serde = { version = "1.0.188", features = ["derive"] } +thiserror = "1.0.49" +toml = "0.8.2" [target.'cfg(unix)'.dependencies] cargo = { version = "0.73.1", features = ["vendored-openssl"] } diff --git a/espflash/Cargo.toml b/espflash/Cargo.toml index 4400e78f..d2bd6d0f 100644 --- a/espflash/Cargo.toml +++ b/espflash/Cargo.toml @@ -1,7 +1,7 @@ [package] -name = "espflash" -version = "3.0.0-dev" -edition = "2021" +name = "espflash" +version = "3.0.0-dev" +edition = "2021" rust-version = "1.70" description = "A command-line tool for flashing Espressif devices" repository = "https://github.com/esp-rs/espflash" @@ -23,37 +23,37 @@ path = "./src/bin/espflash.rs" required-features = ["cli"] [dependencies] -addr2line = { version = "0.21.0", optional = true } -base64 = "0.21.4" -binrw = "0.12.0" -bytemuck = { version = "1.14.0", features = ["derive"] } -clap = { version = "4.4.6", features = ["derive", "env", "wrap_help"], optional = true } -clap_complete = { version = "4.4.3", optional = true } -comfy-table = { version = "7.0.1", optional = true } -crossterm = { version = "0.25.0", optional = true } # 0.26.x causes issues on Windows -ctrlc = { version = "3.4.0", optional = true } -defmt-decoder = { version = "=0.3.8", features = ["unstable"], optional = true } -defmt-parser = { version = "=0.3.3", features = ["unstable"], optional = true } -dialoguer = { version = "0.10.4", optional = true } -directories = { version = "5.0.1", optional = true } -env_logger = { version = "0.10.0", optional = true } -esp-idf-part = "0.4.1" -flate2 = "1.0.27" -hex = { version = "0.4.3", features = ["serde"], optional = true } -indicatif = { version = "0.17.7", optional = true } -lazy_static = { version = "1.4.0", optional = true } -log = "0.4.20" -miette = { version = "5.10.0", features = ["fancy"] } -parse_int = { version = "0.6.0", optional = true } -regex = { version = "1.9.6", optional = true } -rppal = { version = "0.14.1", optional = true } -serde = { version = "1.0.188", features = ["derive"] } -serialport = "4.2.2" -sha2 = "0.10.8" -slip-codec = "0.3.4" -strum = { version = "0.25.0", features = ["derive"] } -thiserror = "1.0.49" -toml = "0.8.2" +addr2line = { version = "0.21.0", optional = true } +base64 = "0.21.4" +binrw = "0.12.0" +bytemuck = { version = "1.14.0", features = ["derive"] } +clap = { version = "4.4.6", features = ["derive", "env", "wrap_help"], optional = true } +clap_complete = { version = "4.4.3", optional = true } +comfy-table = { version = "7.0.1", optional = true } +crossterm = { version = "0.25.0", optional = true } # 0.26.x causes issues on Windows +ctrlc = { version = "3.4.0", optional = true } +defmt-decoder = { version = "=0.3.8", features = ["unstable"], optional = true } +defmt-parser = { version = "=0.3.3", features = ["unstable"], optional = true } +dialoguer = { version = "0.10.4", optional = true } +directories = { version = "5.0.1", optional = true } +env_logger = { version = "0.10.0", optional = true } +esp-idf-part = "0.4.1" +flate2 = "1.0.27" +hex = { version = "0.4.3", features = ["serde"], optional = true } +indicatif = { version = "0.17.7", optional = true } +lazy_static = { version = "1.4.0", optional = true } +log = "0.4.20" +miette = { version = "5.10.0", features = ["fancy"] } +parse_int = { version = "0.6.0", optional = true } +regex = { version = "1.9.6", optional = true } +rppal = { version = "0.14.1", optional = true } +serde = { version = "1.0.188", features = ["derive"] } +serialport = "4.2.2" +sha2 = "0.10.8" +slip-codec = "0.3.4" +strum = { version = "0.25.0", features = ["derive"] } +thiserror = "1.0.49" +toml = "0.8.2" update-informer = { version = "1.1.0", optional = true } xmas-elf = "0.9.0" @@ -61,26 +61,7 @@ xmas-elf = "0.9.0" libc = "0.2.101" [features] -default = ["cli"] -cli = [ - "dep:addr2line", - "dep:clap", - "dep:clap_complete", - "dep:comfy-table", - "dep:crossterm", - "dep:ctrlc", - "dep:dialoguer", - "dep:directories", - "dep:env_logger", - "dep:hex", - "dep:indicatif", - "dep:lazy_static", - "dep:parse_int", - "dep:regex", - "dep:update-informer", -] -defmt = [ - "dep:defmt-decoder", - "dep:defmt-parser", -] +default = ["cli"] +cli = ["dep:addr2line", "dep:clap", "dep:clap_complete", "dep:comfy-table", "dep:crossterm", "dep:ctrlc", "dep:dialoguer", "dep:directories", "dep:env_logger", "dep:hex", "dep:indicatif", "dep:lazy_static", "dep:parse_int", "dep:regex", "dep:update-informer"] +defmt = ["dep:defmt-decoder", "dep:defmt-parser"] raspberry = ["dep:rppal"]