From b7b38df99c3a0522723f4f1897e1e8e5117cf0ff Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Thu, 5 Mar 2026 22:59:03 +0100 Subject: [PATCH] block: raw: Use map_or instead of map().unwrap_or() Do the necessary replacements to satisfy clippy::map_unwrap_or. Signed-off-by: Anatol Belski --- block/src/raw_async.rs | 5 ++--- block/src/raw_async_aio.rs | 5 ++--- block/src/raw_sync.rs | 5 ++--- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/block/src/raw_async.rs b/block/src/raw_async.rs index 3a890d716..152e5fa3b 100644 --- a/block/src/raw_async.rs +++ b/block/src/raw_async.rs @@ -42,9 +42,8 @@ impl DiskFile for RawFileDisk { fn new_async_io(&self, ring_depth: u32) -> DiskFileResult> { let mut raw = RawFileAsync::new(self.file.as_raw_fd(), ring_depth) .map_err(DiskFileError::NewAsyncIo)?; - raw.alignment = DiskTopology::probe(&self.file) - .map(|t| t.logical_block_size) - .unwrap_or(SECTOR_SIZE); + raw.alignment = + DiskTopology::probe(&self.file).map_or(SECTOR_SIZE, |t| t.logical_block_size); Ok(Box::new(raw) as Box) } diff --git a/block/src/raw_async_aio.rs b/block/src/raw_async_aio.rs index 7266a3633..fe7196ebb 100644 --- a/block/src/raw_async_aio.rs +++ b/block/src/raw_async_aio.rs @@ -45,9 +45,8 @@ impl DiskFile for RawFileDiskAio { fn new_async_io(&self, ring_depth: u32) -> DiskFileResult> { let mut raw = RawFileAsyncAio::new(self.file.as_raw_fd(), ring_depth) .map_err(DiskFileError::NewAsyncIo)?; - raw.alignment = DiskTopology::probe(&self.file) - .map(|t| t.logical_block_size) - .unwrap_or(SECTOR_SIZE); + raw.alignment = + DiskTopology::probe(&self.file).map_or(SECTOR_SIZE, |t| t.logical_block_size); Ok(Box::new(raw) as Box) } diff --git a/block/src/raw_sync.rs b/block/src/raw_sync.rs index 9c96863b6..9c2d6b789 100644 --- a/block/src/raw_sync.rs +++ b/block/src/raw_sync.rs @@ -41,9 +41,8 @@ impl DiskFile for RawFileDiskSync { fn new_async_io(&self, _ring_depth: u32) -> DiskFileResult> { let mut raw = RawFileSync::new(self.file.as_raw_fd()); - raw.alignment = DiskTopology::probe(&self.file) - .map(|t| t.logical_block_size) - .unwrap_or(SECTOR_SIZE); + raw.alignment = + DiskTopology::probe(&self.file).map_or(SECTOR_SIZE, |t| t.logical_block_size); Ok(Box::new(raw) as Box) }