Skip to content

Commit dad60cf

Browse files
authored
Remove unused dependencies, deduplicate some functions (#811)
* Remove unused dependencies from `cargo-espflash` * Move common functions from binaries to `cli` module
1 parent fa6b970 commit dad60cf

File tree

5 files changed

+17
-38
lines changed

5 files changed

+17
-38
lines changed

Cargo.lock

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cargo-espflash/Cargo.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ pkg-fmt = "zip"
2323
[dependencies]
2424
cargo_metadata = "0.19.1"
2525
clap = { version = "4.5.24", features = ["derive", "wrap_help"] }
26-
env_logger = "0.11.6"
27-
esp-idf-part = "0.5.0"
2826
espflash = { version = "4.0.0-dev", path = "../espflash" }
2927
log = "0.4.22"
3028
miette = { version = "7.4.0", features = ["fancy"] }

cargo-espflash/src/main.rs

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -280,23 +280,6 @@ pub fn erase_parts(args: ErasePartsArgs, config: &Config) -> Result<()> {
280280
Ok(())
281281
}
282282

283-
fn reset(args: ConnectArgs, config: &Config) -> Result<()> {
284-
let mut args = args.clone();
285-
args.no_stub = true;
286-
let mut flash = connect(&args, config, true, true)?;
287-
info!("Resetting target device");
288-
flash.connection().reset()?;
289-
290-
Ok(())
291-
}
292-
293-
fn hold_in_reset(args: ConnectArgs, config: &Config) -> Result<()> {
294-
connect(&args, config, true, true)?;
295-
info!("Holding target device in reset");
296-
297-
Ok(())
298-
}
299-
300283
fn flash(args: FlashArgs, config: &Config) -> Result<()> {
301284
let metadata = PackageMetadata::load(&args.build_args.package)?;
302285
let cargo_config = CargoConfig::load(&metadata.workspace_root, &metadata.package_root);

espflash/src/bin/espflash.rs

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -201,23 +201,6 @@ pub fn erase_parts(args: ErasePartsArgs, config: &Config) -> Result<()> {
201201
Ok(())
202202
}
203203

204-
fn reset(args: ConnectArgs, config: &Config) -> Result<()> {
205-
let mut args = args.clone();
206-
args.no_stub = true;
207-
let mut flash = connect(&args, config, true, true)?;
208-
info!("Resetting target device");
209-
flash.connection().reset()?;
210-
211-
Ok(())
212-
}
213-
214-
fn hold_in_reset(args: ConnectArgs, config: &Config) -> Result<()> {
215-
connect(&args, config, true, true)?;
216-
info!("Holding target device in reset");
217-
218-
Ok(())
219-
}
220-
221204
fn flash(args: FlashArgs, config: &Config) -> Result<()> {
222205
let mut flasher = connect(
223206
&args.connect_args,

espflash/src/cli/mod.rs

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1045,6 +1045,23 @@ pub fn write_bin(args: WriteBinArgs, config: &Config) -> Result<()> {
10451045
Ok(())
10461046
}
10471047

1048+
pub fn reset(args: ConnectArgs, config: &Config) -> Result<()> {
1049+
let mut args = args.clone();
1050+
args.no_stub = true;
1051+
let mut flash = connect(&args, config, true, true)?;
1052+
info!("Resetting target device");
1053+
flash.connection().reset()?;
1054+
1055+
Ok(())
1056+
}
1057+
1058+
pub fn hold_in_reset(args: ConnectArgs, config: &Config) -> Result<()> {
1059+
connect(&args, config, true, true)?;
1060+
info!("Holding target device in reset");
1061+
1062+
Ok(())
1063+
}
1064+
10481065
mod test {
10491066
use clap::Parser;
10501067

0 commit comments

Comments
 (0)