Clear the clippy warnings, except the two that are not cosmetic

Down from 29 warnings to 2, in the spirit of 4ab95ff.

The doc warnings were all one mistake made repeatedly: a paragraph wrapped so
that a line *began* with `- ` or `+ `, which rustdoc reads as a markdown list
marker and the following lines as unindented continuations. The prose always
meant an em-dash. Fixed by moving the dash to the end of the previous line and
re-wrapping; not one word changed, which is the point - these comments record
things confirmed against real printers and are worth more than the warning.
The genuine lists just had their continuations de-indented and stayed lists.

The code ones are `match x { V(v) => .., _ => {} }` to `if let`, and nested
`if let Some(x) = .. { if cond { .. } }` to a let-chain. None had an `else`,
so each is the same control flow written once instead of twice.

Two warnings are left deliberately, because fixing them is not cosmetic:
`AmsTray` (544 bytes against 32) and `BambuReport` (984 against 120) both have
one variant far larger than the rest. The fix clippy wants is a `Box`, which
changes how every reader of those enums is written and puts an allocation on
the push_status path that currently has none. Worth measuring before doing,
not worth doing to silence a warning.

51 tests still pass.
This commit is contained in:
2026-10-15 21:43:06 +00:00
parent 254798e8cb
commit 13bfec97fe
11 changed files with 97 additions and 98 deletions
+2 -3
View File
@@ -17,9 +17,8 @@ fn main() -> anyhow::Result<()> {
let cert_dir = std::path::Path::new("certs/pinned"); let cert_dir = std::path::Path::new("certs/pinned");
for printer in &mut printers { for printer in &mut printers {
match printer { if let PrinterHandle::Bambu(bambu) = printer {
PrinterHandle::Bambu(bambu) => report(&bambu.ensure_trusted(cert_dir)), report(&bambu.ensure_trusted(cert_dir))
_ => {}
} }
} }
+28 -28
View File
@@ -53,34 +53,34 @@ async fn main() -> anyhow::Result<()> {
let deadline = tokio::time::Instant::now() + STATUS_TIMEOUT; let deadline = tokio::time::Instant::now() + STATUS_TIMEOUT;
loop { loop {
if let Some(report) = bambu.print_status().await { if let Some(report) = bambu.print_status().await
if let Some(state) = report.gcode_state.clone() { && let Some(state) = report.gcode_state.clone()
println!(" gcode_state: {state}"); {
println!(" subtask_name: {}", report.subtask_name.clone().unwrap_or_default()); println!(" gcode_state: {state}");
println!( println!(" subtask_name: {}", report.subtask_name.clone().unwrap_or_default());
" layer: {}/{}", println!(
report.layer_num.unwrap_or_default(), " layer: {}/{}",
report.total_layer_num.unwrap_or_default() report.layer_num.unwrap_or_default(),
); report.total_layer_num.unwrap_or_default()
println!(" percent: {}", report.mc_percent.unwrap_or_default()); );
// Temperatures and remaining time, because state plus layer println!(" percent: {}", report.mc_percent.unwrap_or_default());
// number cannot tell a print that is working from one that is // Temperatures and remaining time, because state plus layer
// stalled: a P1P sits at layer 0 for minutes during bed // number cannot tell a print that is working from one that is
// levelling and purge, and the only thing moving in that // stalled: a P1P sits at layer 0 for minutes during bed
// window is the heat. // levelling and purge, and the only thing moving in that
println!( // window is the heat.
" nozzle: {:.1} -> {:.1} C", println!(
report.nozzle_temper.unwrap_or_default(), " nozzle: {:.1} -> {:.1} C",
report.nozzle_target_temper.unwrap_or_default() report.nozzle_temper.unwrap_or_default(),
); report.nozzle_target_temper.unwrap_or_default()
println!( );
" bed: {:.1} -> {:.1} C", println!(
report.bed_temper.unwrap_or_default(), " bed: {:.1} -> {:.1} C",
report.bed_target_temper.unwrap_or_default() report.bed_temper.unwrap_or_default(),
); report.bed_target_temper.unwrap_or_default()
println!(" remaining: {} min", report.mc_remaining_time.unwrap_or_default()); );
break; println!(" remaining: {} min", report.mc_remaining_time.unwrap_or_default());
} break;
} }
if tokio::time::Instant::now() >= deadline { if tokio::time::Instant::now() >= deadline {
println!(" (no gcode_state within {STATUS_TIMEOUT:?} - listing cache/ anyway)"); println!(" (no gcode_state within {STATUS_TIMEOUT:?} - listing cache/ anyway)");
+4 -4
View File
@@ -69,10 +69,10 @@ async fn main() -> anyhow::Result<()> {
let deadline = tokio::time::Instant::now() + STATUS_TIMEOUT; let deadline = tokio::time::Instant::now() + STATUS_TIMEOUT;
let state = loop { let state = loop {
if let Some(report) = bambu.print_status().await { if let Some(report) = bambu.print_status().await
if let Some(state) = report.gcode_state.clone() { && let Some(state) = report.gcode_state.clone()
break state; {
} break state;
} }
if tokio::time::Instant::now() >= deadline { if tokio::time::Instant::now() >= deadline {
anyhow::bail!( anyhow::bail!(
+25 -25
View File
@@ -10,20 +10,20 @@
//! //!
//! - `status` read-only. Connect, print state, list `cache/`. //! - `status` read-only. Connect, print state, list `cache/`.
//! - `probe-missing` **zero physical risk.** Sends `print.gcode_file` //! - `probe-missing` **zero physical risk.** Sends `print.gcode_file`
//! pointing at a file that does not exist. The printer //! pointing at a file that does not exist. The printer
//! cannot start anything, so this isolates one //! cannot start anything, so this isolates one
//! question: does it accept and parse the command shape //! question: does it accept and parse the command shape
//! at all? A clean rejection naming the file means the //! at all? A clean rejection naming the file means the
//! shape is right and only the target was wrong. A //! shape is right and only the target was wrong. A
//! parse error, or silence, means the shape is wrong. //! parse error, or silence, means the shape is wrong.
//! - `start <file>` sends `print.gcode_file`/`print.project_file` for a //! - `start <file>` sends `print.gcode_file`/`print.project_file` for a
//! file in `cache/`. Gated on `gcode_state: IDLE` and //! file in `cache/`. Gated on `gcode_state: IDLE` and
//! on the explicit flag. //! on the explicit flag.
//! - `pause` / `resume` / `stop` //! - `pause` / `resume` / `stop`
//! the control commands. `stop` cancels - it is the //! the control commands. `stop` cancels - it is the
//! undo for `start`, and the reason `start` is worth //! undo for `start`, and the reason `start` is worth
//! testing at all: without it a cloud-initiated print //! testing at all: without it a cloud-initiated print
//! could only be ended at the machine. //! could only be ended at the machine.
//! //!
//! After whatever it sends, it watches the `print.push_status` stream and //! After whatever it sends, it watches the `print.push_status` stream and
//! reports every change to the fields that matter. Run with //! reports every change to the fields that matter. Run with
@@ -230,10 +230,10 @@ async fn main() -> anyhow::Result<()> {
async fn wait_for_state(bambu: &continuum_proxy::printer::BambuPrinter) -> anyhow::Result<String> { async fn wait_for_state(bambu: &continuum_proxy::printer::BambuPrinter) -> anyhow::Result<String> {
let deadline = tokio::time::Instant::now() + STATUS_TIMEOUT; let deadline = tokio::time::Instant::now() + STATUS_TIMEOUT;
loop { loop {
if let Some(report) = bambu.print_status().await { if let Some(report) = bambu.print_status().await
if let Some(state) = report.gcode_state.clone() { && let Some(state) = report.gcode_state.clone()
return Ok(state); {
} return Ok(state);
} }
if tokio::time::Instant::now() >= deadline { if tokio::time::Instant::now() >= deadline {
anyhow::bail!( anyhow::bail!(
@@ -259,11 +259,11 @@ async fn watch(bambu: &continuum_proxy::printer::BambuPrinter, before: String) {
tokio::time::sleep(Duration::from_millis(1500)).await; tokio::time::sleep(Duration::from_millis(1500)).await;
if let Some(report) = bambu.print_status().await { if let Some(report) = bambu.print_status().await {
if let Some(state) = report.gcode_state.clone() { if let Some(state) = report.gcode_state.clone()
if state != last { && state != last
println!(" gcode_state: {last} -> {state}"); {
last = state; println!(" gcode_state: {last} -> {state}");
} last = state;
} }
if report.print_error != last_error { if report.print_error != last_error {
println!(" print_error: {:?} -> {:?}", last_error, report.print_error); println!(" print_error: {:?} -> {:?}", last_error, report.print_error);
@@ -274,10 +274,10 @@ async fn watch(bambu: &continuum_proxy::printer::BambuPrinter, before: String) {
println!(" subtask_name: '{last_task}' -> '{task}'"); println!(" subtask_name: '{last_task}' -> '{task}'");
last_task = task; last_task = task;
} }
if let Some(hms) = &report.hms { if let Some(hms) = &report.hms
if !hms.is_empty() { && !hms.is_empty()
println!(" hms (printer alerts): {}", serde_json::to_string(hms).unwrap_or_default()); {
} println!(" hms (printer alerts): {}", serde_json::to_string(hms).unwrap_or_default());
} }
} }
} }
+5 -5
View File
@@ -9,7 +9,7 @@
//! //!
//! - `get_version` - read-only. //! - `get_version` - read-only.
//! - `pushall` - "re-send the full status object". A request for data, //! - `pushall` - "re-send the full status object". A request for data,
//! not a state change. v1 only; a no-op on v2. //! not a state change. v1 only; a no-op on v2.
//! - `print_status` - reads this process's own in-memory cache, no traffic. //! - `print_status` - reads this process's own in-memory cache, no traffic.
//! //!
//! It deliberately sends **no** `gcode_line`, **no** `set_fan_speed`, **no** //! It deliberately sends **no** `gcode_line`, **no** `set_fan_speed`, **no**
@@ -65,10 +65,10 @@ async fn main() -> anyhow::Result<()> {
let only: Option<String> = std::env::args().nth(1); let only: Option<String> = std::env::args().nth(1);
for printer in &mut printers { for printer in &mut printers {
if let Some(id) = &only { if let Some(id) = &only
if &printer.base().id != id { && &printer.base().id != id
continue; {
} continue;
} }
let PrinterHandle::Bambu(bambu) = printer else { let PrinterHandle::Bambu(bambu) = printer else {
println!("skipping {} - not a Bambu printer", printer.display_name()); println!("skipping {} - not a Bambu printer", printer.display_name());
+2 -3
View File
@@ -61,9 +61,8 @@ async fn main() {
// cache) - none of these connected above (fake IPs), so it's always // cache) - none of these connected above (fake IPs), so it's always
// `None`, but the point is the downcast, not a live reading. // `None`, but the point is the downcast, not a live reading.
for printer in &fleet { for printer in &fleet {
match printer { if let PrinterHandle::Bambu(bambu) = printer {
PrinterHandle::Bambu(bambu) => println!(" {}: cached print_status = {:?}", bambu.sn, bambu.print_status().await), println!(" {}: cached print_status = {:?}", bambu.sn, bambu.print_status().await)
_ => {}
} }
} }
+2 -3
View File
@@ -13,9 +13,8 @@ fn main() -> anyhow::Result<()> {
let printers = fleet::load(std::path::Path::new("printers.toml"))?; let printers = fleet::load(std::path::Path::new("printers.toml"))?;
for printer in &printers { for printer in &printers {
match printer { if let PrinterHandle::Bambu(bambu) = printer {
PrinterHandle::Bambu(bambu) => report(bambu.base().name.as_str(), bambu.test_tls_handshake()), report(bambu.base().name.as_str(), bambu.test_tls_handshake())
_ => {}
} }
} }
+4 -3
View File
@@ -7,9 +7,10 @@
//! continuum-schemas for continuum.v1, which is a schema we designed //! continuum-schemas for continuum.v1, which is a schema we designed
//! ourselves and that both TS and Rust genuinely need. //! ourselves and that both TS and Rust genuinely need.
//! //!
//! One file per Bambu *category* (`get_version.rs` for "info", `pushall.rs` //! One file per Bambu *category* (`get_version.rs` for "info",
//! + `print.rs` for "pushing"/"print" - see below for why those are two //! `pushall.rs` + `print.rs` for "pushing"/"print" - see below for why
//! files, not one). Copy `get_version.rs`'s shape for your next command. //! those are two files, not one). Copy `get_version.rs`'s shape for your
//! next command.
//! //!
//! Mirrors continuum-schemas' `schemas/bambulab/` JSON Schemas - same //! Mirrors continuum-schemas' `schemas/bambulab/` JSON Schemas - same
//! category split, same "print vs pushing" correction (see that //! category split, same "print vs pushing" correction (see that
+3 -3
View File
@@ -207,9 +207,9 @@ pub struct AmsUnit {
pub info: Option<String>, pub info: Option<String>,
} }
/// A tray slot is either empty (just `id`) or loaded (the full field set) /// A tray slot is either empty (just `id`) or loaded (the full field set) -
/// - two genuinely different shapes, not one shape with optional fields, /// two genuinely different shapes, not one shape with optional fields, so
/// so this is an untagged enum rather than a struct full of `Option<T>`. /// this is an untagged enum rather than a struct full of `Option<T>`.
/// `#[serde(deny_unknown_fields)]` on `Empty` is load-bearing: untagged /// `#[serde(deny_unknown_fields)]` on `Empty` is load-bearing: untagged
/// enums try variants in order, and without it a *loaded* tray (which has /// enums try variants in order, and without it a *loaded* tray (which has
/// every field `Empty` allows, plus more) would incorrectly match `Empty` /// every field `Empty` allows, plus more) would incorrectly match `Empty`
+16 -16
View File
@@ -162,14 +162,14 @@ impl PrintStatusCache {
// the next one that did looked like it had skipped ahead. That is now // the next one that did looked like it had skipped ahead. That is now
// reported where it happens (see `handle_incoming_report`), which // reported where it happens (see `handle_incoming_report`), which
// leaves this warning meaning what it says. // leaves this warning meaning what it says.
if let (Some(last), Some(incoming_seq), false) = (self.last_sequence_id, incoming_seq, is_full_object) { if let (Some(last), Some(incoming_seq), false) = (self.last_sequence_id, incoming_seq, is_full_object)
if incoming_seq != last.wrapping_add(1) { && incoming_seq != last.wrapping_add(1)
eprintln!( {
"print.push_status sequence gap: expected {}, got {incoming_seq} - the in-memory \ eprintln!(
object may be missing whatever changed in between", "print.push_status sequence gap: expected {}, got {incoming_seq} - the in-memory \
last.wrapping_add(1) object may be missing whatever changed in between",
); last.wrapping_add(1)
} );
} }
if let Some(incoming_seq) = incoming_seq { if let Some(incoming_seq) = incoming_seq {
self.last_sequence_id = Some(incoming_seq); self.last_sequence_id = Some(incoming_seq);
@@ -305,17 +305,17 @@ impl BambuMqttSession {
/// whose `sequence_id` matches the one this call sent. /// whose `sequence_id` matches the one this call sent.
/// ///
/// This crate tried adding its own correlation field /// This crate tried adding its own correlation field
/// (`continuum_correlation_id`) instead of relying on `sequence_id`, /// (`continuum_correlation_id`) instead of relying on `sequence_id`, on
/// on the understanding that extra fields survive into most replies. /// the understanding that extra fields survive into most replies.
/// Confirmed live that this doesn't hold for `get_version` specifically /// Confirmed live that this doesn't hold for `get_version`
/// - a real H2C's reply had exactly `["command", "module", /// specifically - a real H2C's reply had exactly `["command", "module",
/// "sequence_id"]`, nothing extra at all, so the correlation field /// "sequence_id"]`, nothing extra at all, so the correlation field
/// never came back and every `get_version` call just timed out. /// never came back and every `get_version` call just timed out.
/// `sequence_id` is what's actually proven to round-trip for it /// `sequence_id` is what's actually proven to round-trip for it
/// (confirmed earlier, live, on both protocol versions), so that's /// (confirmed earlier, live, on both protocol versions), so that's what
/// what this uses. Whether a custom field survives on some *other* /// this uses. Whether a custom field survives on some *other* command
/// command (`calibration`, say) is unverified, not confirmed false - /// (`calibration`, say) is unverified, not confirmed false - this was
/// this was only ever checked for `get_version`. /// only ever checked for `get_version`.
/// ///
/// Not for `print.push_status` - that's not a single reply, see /// Not for `print.push_status` - that's not a single reply, see
/// `PrintStatusCache`. Not for a command with no reply at all either, /// `PrintStatusCache`. Not for a command with no reply at all either,
+6 -5
View File
@@ -143,11 +143,12 @@ pub trait GenericPrinter {
} }
/// M106's `S` parameter is a raw 0-255 PWM value, not a percentage. Shared /// M106's `S` parameter is a raw 0-255 PWM value, not a percentage. Shared
/// by anything that ultimately sends gcode (Bambu, PrusaLink, PrusaSerial) /// by anything that ultimately sends gcode (Bambu, PrusaLink,
/// - *not* a trait default, since Klipper's hypothetical native fan API /// PrusaSerial) - *not* a trait default, since Klipper's hypothetical
/// below takes a percent directly and has no use for this at all. Private, /// native fan API below takes a percent directly and has no use for this at
/// but still visible to bambu.rs/prusa.rs: Rust's module privacy reaches /// all. Private, but still visible to bambu.rs/prusa.rs: Rust's module
/// into child modules, not just the exact file it's defined in. /// privacy reaches into child modules, not just the exact file it's defined
/// in.
fn percent_to_pwm(percent: u8) -> u8 { fn percent_to_pwm(percent: u8) -> u8 {
((percent.min(100) as u16 * 255) / 100) as u8 ((percent.min(100) as u16 * 255) / 100) as u8
} }