Skip to content

Commit

Permalink
style: Format toml files
Browse files Browse the repository at this point in the history
  • Loading branch information
SergioGasquez committed Mar 12, 2024
1 parent a209152 commit 6201b4e
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 25 deletions.
4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[workspace]
resolver = "2"
members = ["cargo-espflash", "espflash"]
members = ["cargo-espflash", "espflash"]

[profile.release]
lto = "thin"
lto = "thin"
strip = true
33 changes: 19 additions & 14 deletions cargo-espflash/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,16 @@ name = "cargo-espflash"
version = "3.0.0"
edition = "2021"
rust-version = "1.74"
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", "development-tools", "development-tools::cargo-plugins", "embedded"]
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",
"development-tools",
"development-tools::cargo-plugins",
"embedded",
]

[package.metadata.binstall]
pkg-url = "{ repo }/releases/download/v{ version }/{ name }-{ target }.{ archive-format }"
Expand All @@ -16,15 +21,15 @@ pkg-fmt = "zip"

[dependencies]
cargo_metadata = "0.18.1"
clap = { version = "4.5.2", features = ["derive", "wrap_help"] }
env_logger = "0.11.3"
esp-idf-part = "0.5.0"
espflash = { version = "3.0.0", path = "../espflash" }
log = "0.4.21"
miette = { version = "7.2.0", features = ["fancy"] }
serde = { version = "1.0.197", features = ["derive"] }
thiserror = "1.0.58"
toml = "0.8.11"
clap = { version = "4.5.2", features = ["derive", "wrap_help"] }
env_logger = "0.11.3"
esp-idf-part = "0.5.0"
espflash = { version = "3.0.0", path = "../espflash" }
log = "0.4.21"
miette = { version = "7.2.0", features = ["fancy"] }
serde = { version = "1.0.197", features = ["derive"] }
thiserror = "1.0.58"
toml = "0.8.11"

[target.'cfg(unix)'.dependencies]
cargo = { version = "0.77.0", features = ["vendored-openssl"] }
Expand Down
24 changes: 15 additions & 9 deletions espflash/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "espflash"
version = "3.0.0"
edition = "2021"
name = "espflash"
version = "3.0.0"
edition = "2021"
rust-version = "1.74"
description = "A command-line tool for flashing Espressif devices"
repository = "https://github.com/esp-rs/espflash"
Expand All @@ -26,13 +26,19 @@ required-features = ["cli", "serialport"]
addr2line = { version = "0.21.0", optional = true }
base64 = "0.22.0"
bytemuck = { version = "1.14.3", features = ["derive"] }
clap = { version = "4.5.2", features = ["derive", "env", "wrap_help"], optional = true }
clap = { version = "4.5.2", features = [
"derive",
"env",
"wrap_help",
], optional = true }
clap_complete = { version = "4.5.1", optional = true }
comfy-table = { version = "7.1.0", optional = true }
crossterm = { version = "0.27.0", optional = true } # 0.26.x and 0.27.x causes issues on Windows
ctrlc = { version = "3.4.4", optional = true }
# defmt dependencies are pinned since defmt does not guarantee MSRV even for patch releases
defmt-decoder = { version = "=0.3.10", features = ["unstable"], optional = true }
defmt-decoder = { version = "=0.3.10", features = [
"unstable",
], optional = true }
defmt-parser = { version = "=0.3.4", features = ["unstable"], optional = true }
dialoguer = { version = "0.11.0", optional = true }
directories = { version = "5.0.1", optional = true }
Expand All @@ -44,7 +50,7 @@ indicatif = { version = "0.17.8", optional = true }
lazy_static = { version = "1.4.0", optional = true }
log = "0.4.21"
md-5 = "0.10.6"
miette = { version = "7.2.0" }
miette = "7.2.0"
parse_int = { version = "0.6.0", optional = true }
regex = { version = "1.10.3", optional = true }
serde = { version = "1.0.197", features = ["derive"] }
Expand All @@ -55,7 +61,7 @@ strum = { version = "0.26.2", features = ["derive"] }
thiserror = "1.0.58"
toml = { version = "0.8.11", optional = true }
update-informer = { version = "1.1.0", optional = true }
xmas-elf = { version = "0.9.1" }
xmas-elf = "0.9.1"

[target.'cfg(unix)'.dependencies]
libc = "0.2.153"
Expand All @@ -80,9 +86,9 @@ cli = [
"dep:parse_int",
"dep:toml",
"dep:update-informer",
"miette/fancy",
"serialport",
"miette/fancy"
]

# enables connecting to a device via serial port
serialport = ["dep:serialport", "dep:slip-codec", "dep:regex", "dep:toml"]
serialport = ["dep:regex", "dep:serialport", "dep:slip-codec", "dep:toml"]

0 comments on commit 6201b4e

Please sign in to comment.