NaxdyOrg/embassy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge #940

Browse source 
940: Fix a few clippy warnings r=lulf a=lulf



Co-authored-by: Ulf Lilleengen <lulf@redhat.com>
This commit is contained in:
bors[bot] 2022-09-02 06:43:22 +00:00 committed by GitHub
commit 50af13d470
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
embassy-boot/boot/src/lib.rs
View file

@ -28,6 +28,7 @@ impl Partition {
} }
/// Return the length of the partition /// Return the length of the partition
#[allow(clippy::len_without_is_empty)]
pub const fn len(&self) -> usize { pub const fn len(&self) -> usize {
self.to - self.from self.to - self.from
} }
@ -229,31 +230,28 @@ impl BootLoader {
// Copy contents from partition N to active // Copy contents from partition N to active
let state = self.read_state(p, magic)?; let state = self.read_state(p, magic)?;
match state { if state == State::Swap {
State::Swap => { //
// // Check if we already swapped. If we're in the swap state, this means we should revert
// Check if we already swapped. If we're in the swap state, this means we should revert // since the app has failed to mark boot as successful
// since the app has failed to mark boot as successful //
// if !self.is_swapped(p, magic, page)? {
if !self.is_swapped(p, magic, page)? { trace!("Swapping");
trace!("Swapping"); self.swap(p, magic, page)?;
self.swap(p, magic, page)?; trace!("Swapping done");
trace!("Swapping done"); } else {
} else { trace!("Reverting");
trace!("Reverting"); self.revert(p, magic, page)?;
self.revert(p, magic, page)?;
// Overwrite magic and reset progress // Overwrite magic and reset progress
let fstate = p.state(); let fstate = p.state();
magic.fill(!P::STATE::ERASE_VALUE); magic.fill(!P::STATE::ERASE_VALUE);
fstate.write(self.state.from as u32, magic)?; fstate.write(self.state.from as u32, magic)?;
fstate.erase(self.state.from as u32, self.state.to as u32)?; fstate.erase(self.state.from as u32, self.state.to as u32)?;
magic.fill(BOOT_MAGIC); magic.fill(BOOT_MAGIC);
fstate.write(self.state.from as u32, magic)?; fstate.write(self.state.from as u32, magic)?;
}
} }
_ => {}
} }
Ok(state) Ok(state)
} }
@ -1005,7 +1003,7 @@ mod tests {
const ERASE_SIZE: usize = ERASE_SIZE; const ERASE_SIZE: usize = ERASE_SIZE;
type EraseFuture<'a> = impl Future<Output = Result<(), Self::Error>> + 'a; type EraseFuture<'a> = impl Future<Output = Result<(), Self::Error>> + 'a;
fn erase<'a>(&'a mut self, from: u32, to: u32) -> Self::EraseFuture<'a> { fn erase(&mut self, from: u32, to: u32) -> Self::EraseFuture<'_> {
async move { async move {
let from = from as usize; let from = from as usize;
let to = to as usize; let to = to as usize;