diff --git a/src/open_ocd_task.rs b/src/open_ocd_task.rs index e75a4fe..ec7a51a 100644 --- a/src/open_ocd_task.rs +++ b/src/open_ocd_task.rs @@ -113,24 +113,17 @@ where .into_string() .map_err(|_| "Failed to convert config path to string")?; - let ws_foler = dirs::get_wireless_stack_dir()? + let ws_folder = dirs::get_wireless_stack_dir()? .into_os_string() .into_string() - .map_err(|_| "Failed to convert config path to string")?; + .map_err(|_| "Failed to convert wireless stack path to string")?; let tmp_folder = dirs::get_tmp_dir()? .into_os_string() .into_string() .map_err(|_| "Failed to convert tmp_dir to string.")?; - cmd.args(&[ - "-s", - &config_folder, - "-s", - &tmp_folder, - "-s", - &ws_foler, - ]); + cmd.args(&["-s", &config_folder, "-s", &tmp_folder, "-s", &ws_folder]); // The xpack-bundled OpenOCD ships its standard scripts alongside the // executable in `/scripts/`. Our .cfg files reference these via diff --git a/src/ui/tab_wireless_stack.rs b/src/ui/tab_wireless_stack.rs index 336da03..42bccf6 100644 --- a/src/ui/tab_wireless_stack.rs +++ b/src/ui/tab_wireless_stack.rs @@ -243,9 +243,7 @@ impl TabWirelessStack { None => { Self::send_log( &mut o, - LogType::Error( - "Flash failed: OpenOCD terminated by signal".into(), - ), + LogType::Error("Flash failed: OpenOCD terminated by signal".into()), ) .await; Self::send_step(&mut o, FwStep::Ready).await; @@ -365,9 +363,7 @@ impl TabWirelessStack { None => { Self::send_log( &mut o, - LogType::Error( - "Flash failed: OpenOCD terminated by signal".into(), - ), + LogType::Error("Flash failed: OpenOCD terminated by signal".into()), ) .await; Self::send_step(&mut o, FwStep::Ready).await; @@ -472,9 +468,7 @@ impl TabWirelessStack { None => { Self::send_log( &mut o, - LogType::Error( - "Flash failed: OpenOCD terminated by signal".into(), - ), + LogType::Error("Flash failed: OpenOCD terminated by signal".into()), ) .await; Self::send_step(&mut o, FwStep::Ready).await;