From f3b59dc952c116156766de6622351d200c40cdc1 Mon Sep 17 00:00:00 2001 From: zackees Date: Fri, 24 Apr 2026 11:12:56 -0700 Subject: [PATCH] fix(fbuild-deploy): repair broken intra-doc links and fmt drift MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - esp32_native.rs module-level `//!` docs use `crate::esp32::...` instead of `super::esp32::...`. Rustdoc does not resolve `super` from inner doc comments at the module file level under rustc 1.94.1, which broke `cargo doc --workspace --no-deps` with `RUSTDOCFLAGS=-D warnings`. Also fully qualify `VerifyOutcome` as `crate::esp32::VerifyOutcome` since it is not in scope at the module-doc resolution site. - esp32.rs: apply `cargo fmt` — the native-write early-return block had drifted out of the canonical layout. Fixes CI runs 24900888165 (Documentation) and 24900888192 (Formatting). Co-Authored-By: Claude Opus 4.7 (1M context) --- crates/fbuild-deploy/src/esp32.rs | 8 +++----- crates/fbuild-deploy/src/esp32_native.rs | 9 +++++---- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/crates/fbuild-deploy/src/esp32.rs b/crates/fbuild-deploy/src/esp32.rs index 30d0a66f..ba104840 100644 --- a/crates/fbuild-deploy/src/esp32.rs +++ b/crates/fbuild-deploy/src/esp32.rs @@ -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); } } diff --git a/crates/fbuild-deploy/src/esp32_native.rs b/crates/fbuild-deploy/src/esp32_native.rs index cca0dc8e..b9fed9d0 100644 --- a/crates/fbuild-deploy/src/esp32_native.rs +++ b/crates/fbuild-deploy/src/esp32_native.rs @@ -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) @@ -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 @@ -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.