remove anyhow
This commit is contained in:
		@@ -4,10 +4,9 @@ use esp_storage::FlashStorage;
 | 
			
		||||
use littlefs2::consts::U512 as lfsCache;
 | 
			
		||||
use littlefs2::consts::U512 as lfsLookahead;
 | 
			
		||||
use littlefs2::driver::Storage as lfs2Storage;
 | 
			
		||||
use littlefs2::fs::Filesystem as lfs2Filesystem;
 | 
			
		||||
use littlefs2::io::Error as lfs2Error;
 | 
			
		||||
use littlefs2::io::Result as lfs2Result;
 | 
			
		||||
use log::{error, info};
 | 
			
		||||
use log::error;
 | 
			
		||||
 | 
			
		||||
pub struct LittleFs2Filesystem {
 | 
			
		||||
    pub(crate) storage: &'static mut FlashRegion<'static, FlashStorage>,
 | 
			
		||||
@@ -27,7 +26,7 @@ impl lfs2Storage for LittleFs2Filesystem {
 | 
			
		||||
        assert_eq!(off % read_size, 0);
 | 
			
		||||
        assert_eq!(buf.len() % read_size, 0);
 | 
			
		||||
        match self.storage.read(off as u32, buf) {
 | 
			
		||||
            anyhow::Result::Ok(..) => lfs2Result::Ok(buf.len()),
 | 
			
		||||
            Ok(..) => Ok(buf.len()),
 | 
			
		||||
            Err(err) => {
 | 
			
		||||
                error!("Littlefs2Filesystem read error: {:?}", err);
 | 
			
		||||
                Err(lfs2Error::IO)
 | 
			
		||||
@@ -36,16 +35,11 @@ impl lfs2Storage for LittleFs2Filesystem {
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    fn write(&mut self, off: usize, data: &[u8]) -> lfs2Result<usize> {
 | 
			
		||||
        info!(
 | 
			
		||||
            "Littlefs2Filesystem write at offset {} with len {}",
 | 
			
		||||
            off,
 | 
			
		||||
            data.len()
 | 
			
		||||
        );
 | 
			
		||||
        let write_size: usize = Self::WRITE_SIZE;
 | 
			
		||||
        assert_eq!(off % write_size, 0);
 | 
			
		||||
        assert_eq!(data.len() % write_size, 0);
 | 
			
		||||
        match self.storage.write(off as u32, data) {
 | 
			
		||||
            anyhow::Result::Ok(..) => lfs2Result::Ok(data.len()),
 | 
			
		||||
            Ok(..) => Ok(data.len()),
 | 
			
		||||
            Err(err) => {
 | 
			
		||||
                error!("Littlefs2Filesystem write error: {:?}", err);
 | 
			
		||||
                Err(lfs2Error::IO)
 | 
			
		||||
@@ -54,10 +48,6 @@ impl lfs2Storage for LittleFs2Filesystem {
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    fn erase(&mut self, off: usize, len: usize) -> lfs2Result<usize> {
 | 
			
		||||
        info!(
 | 
			
		||||
            "Littlefs2Filesystem erase at offset {} with len {}",
 | 
			
		||||
            off, len
 | 
			
		||||
        );
 | 
			
		||||
        let block_size: usize = Self::BLOCK_SIZE;
 | 
			
		||||
        debug_assert!(off % block_size == 0);
 | 
			
		||||
        debug_assert!(len % block_size == 0);
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user