Skip to content

chore: cargo fmt --all #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nedseb merged 2 commits into from
Apr 28, 2026
Merged

chore: cargo fmt --all #13

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
272e33e
chore: cargo fmt --all
nedseb Apr 28, 2026
de882e2
chore: rename ws_foler -> ws_folder + fix its error message
nedseb Apr 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 1 addition & 8 deletions src/open_ocd_task.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,14 +123,7 @@ where
.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_foler]);
Copy link

Copilot AI Apr 28, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ws_foler appears to be a misspelling of ws_folder, which makes the intent less clear. Consider renaming the local variable (and updating the associated map_err message near its definition, which currently says "config path" even though this is the wireless stack path).

Copilot uses AI. Check for mistakes.
Copy link
Copy Markdown
Contributor Author

@nedseb nedseb Apr 28, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed in de882e2 — ws_foler → ws_folder and the map_err now says "Failed to convert wireless stack path to string" instead of "config path". Slightly out of scope for the fmt PR but trivial enough not to deserve its own.


// The xpack-bundled OpenOCD ships its standard scripts alongside the
// executable in `<exe_dir>/scripts/`. Our .cfg files reference these via
Expand Down
12 changes: 3 additions & 9 deletions src/ui/tab_wireless_stack.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
Loading