From 9728ac5305cfe259115858f0bc49985a0ad7cec4 Mon Sep 17 00:00:00 2001 From: Ian McIntyre Date: Sat, 14 Jun 2025 10:16:12 -0400 Subject: Adopt Rust 2024 edition I'm considering this a breaking change. I'll try to introduce new sections that rely on the user's `unsafe` keyword for linker placement. Rust 2024 has different opinions on format, and clippy has new thoughts. Let's adopt them. --- src/host.rs | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'src/host.rs') diff --git a/src/host.rs b/src/host.rs index ba299dd..2598d50 100644 --- a/src/host.rs +++ b/src/host.rs @@ -639,12 +639,12 @@ impl RuntimeBuilder { fn check_configurations(&self) -> Result<(), String> { if self.family.flexram_bank_count() < self.flexram_banks.bank_count() { return Err(format!( - "Chip {:?} only has {} total FlexRAM banks. Cannot allocate {:?}, a total of {} banks", - self.family, - self.family.flexram_bank_count(), - self.flexram_banks, - self.flexram_banks.bank_count() - )); + "Chip {:?} only has {} total FlexRAM banks. Cannot allocate {:?}, a total of {} banks", + self.family, + self.family.flexram_bank_count(), + self.flexram_banks, + self.flexram_banks.bank_count() + )); } if self.flexram_banks.ocram < self.family.bootrom_ocram_banks() { return Err(format!( @@ -653,13 +653,13 @@ impl RuntimeBuilder { self.family.bootrom_ocram_banks() )); } - if let Some(flash_opts) = &self.flash_opts { - if !flash_opts.flexspi.supported_for_family(self.family) { - return Err(format!( - "Chip {:?} does not support {:?}", - self.family, flash_opts.flexspi - )); - } + if let Some(flash_opts) = &self.flash_opts + && !flash_opts.flexspi.supported_for_family(self.family) + { + return Err(format!( + "Chip {:?} does not support {:?}", + self.family, flash_opts.flexspi + )); } fn prevent_flash(name: &str, memory: Memory) -> Result<(), String> { -- cgit v1.2.3