Skip to content

fix(fbuild-deploy): repair broken intra-doc links and fmt drift #201

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
zackees merged 1 commit into from
Apr 24, 2026
Merged

fix(fbuild-deploy): repair broken intra-doc links and fmt drift #201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 3 additions & 5 deletions crates/fbuild-deploy/src/esp32.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1245,11 +1245,9 @@ impl Deployer for Esp32Deployer {

#[cfg(feature = "espflash-native")]
if self.use_native_write {
if let Some(result) =
native_write_or_fallback(port, "write-flash", || {
self.try_deploy_native(firmware_path, port)
})
{
if let Some(result) = native_write_or_fallback(port, "write-flash", || {
self.try_deploy_native(firmware_path, port)
}) {
return Ok(result);
}
}
Expand Down
9 changes: 5 additions & 4 deletions crates/fbuild-deploy/src/esp32_native.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//! Native ESP32 `verify-flash` **and** `write-flash` implementations
//! backed by the [`espflash`] crate. Alternatives to the default
//! [`super::esp32::Esp32Deployer`] path, which shells out to Python
//! [`crate::esp32::Esp32Deployer`] path, which shells out to Python
//! `esptool`.
//!
//! # Why (issue #66)
Expand All @@ -16,7 +16,8 @@
//! # Scope
//!
//! * `verify-flash` — three regions (bootloader / partitions /
//! firmware), same [`VerifyOutcome`] semantics as the esptool path.
//! firmware), same [`crate::esp32::VerifyOutcome`] semantics as the
//! esptool path.
//! * `write-flash` — same three regions, same
//! [`DeploymentResult`]/[`DeployOutcome`] shape as the esptool path.
//! Progress callbacks from espflash are bridged into `tracing` so the
Expand All @@ -36,9 +37,9 @@
//! # Opt-in
//!
//! `verify-flash` is guarded by
//! [`super::esp32::Esp32Deployer::with_native_verify`] (daemon env:
//! [`crate::esp32::Esp32Deployer::with_native_verify`] (daemon env:
//! `FBUILD_USE_ESPFLASH_VERIFY`), and `write-flash` by
//! [`super::esp32::Esp32Deployer::with_native_write`] (daemon env:
//! [`crate::esp32::Esp32Deployer::with_native_write`] (daemon env:
//! `FBUILD_USE_ESPFLASH_WRITE`). The two flags are independent —
//! users can flip one without the other while the native write path
//! accumulates bench time on every ESP32 family member.
Expand Down
Loading