Remove halt_afterwards

probe-rs · May 2, 2024 · c38e608 · c38e608
1 parent 6788471
commit c38e608
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 16 deletions.
diff --git a/changelog/removed-halt_afterwards.md b/changelog/removed-halt_afterwards.md
@@ -0,0 +1 @@
+Removed `halt_afterwards` from Embed.toml
diff --git a/probe-rs-tools/src/bin/probe-rs/cmd/cargo_embed/config/default.toml b/probe-rs-tools/src/bin/probe-rs/cmd/cargo_embed/config/default.toml
@@ -13,9 +13,6 @@ protocol = "Swd"
 [default.flashing]
 # Whether or not the target should be flashed.
 enabled = true
-# Whether or not the target should be halted after reset.
-# DEPRECATED, moved to reset section
-halt_afterwards = false
 # Whether or not bytes erased but not rewritten with data from the ELF
 # should be restored with their contents before erasing.
 restore_unwritten_bytes = false

diff --git a/probe-rs-tools/src/bin/probe-rs/cmd/cargo_embed/config/mod.rs b/probe-rs-tools/src/bin/probe-rs/cmd/cargo_embed/config/mod.rs
@@ -46,11 +46,6 @@ pub struct Probe {
 #[serde(deny_unknown_fields)]
 pub struct Flashing {
     pub enabled: bool,
-    #[deprecated(
-        since = "0.9.0",
-        note = "The 'halt_afterwards' key has moved to the 'reset' section"
-    )]
-    pub halt_afterwards: bool,
     pub restore_unwritten_bytes: bool,
     pub flash_layout_output_path: Option<String>,
     pub do_chip_erase: bool,

diff --git a/probe-rs-tools/src/bin/probe-rs/cmd/cargo_embed/mod.rs b/probe-rs-tools/src/bin/probe-rs/cmd/cargo_embed/mod.rs
@@ -263,14 +263,7 @@ fn main_try(mut args: Vec<OsString>, offset: UtcOffset) -> Result<()> {
     if config.reset.enabled {
         let mut core = session.core(core_id)?;
         let halt_timeout = Duration::from_millis(500);
-        #[allow(deprecated)] // Remove in 0.10
-        if config.flashing.halt_afterwards {
-            logging::eprintln(format!(
-                "     {} The 'flashing.halt_afterwards' option in the config has moved to the 'reset' section",
-                "Warning".yellow().bold()
-            ));
-            core.reset_and_halt(halt_timeout)?;
-        } else if config.reset.halt_afterwards {
+        if config.reset.halt_afterwards {
             core.reset_and_halt(halt_timeout)?;
         } else {
             core.reset()?;