Autofix of clippy::map_unwrap_or

khrs · khrs · commit e24cd520739e · 2023-02-05T10:36:28.000+01:00
diff --git a/src/lib.rs b/src/lib.rs
@@ -479,11 +479,11 @@ impl QueueFile {
         self.cached_offsets.push((i, self.last));
     }
 
+    #[inline]
     fn cached_index_up_to(&self, i: usize) -> Option<usize> {
         self.cached_offsets
             .binary_search_by(|(idx, _)| idx.cmp(&i))
-            .map(Some)
-            .unwrap_or_else(|i| i.checked_sub(1))
+            .map_or_else(|i| i.checked_sub(1), Some)
     }
 
     pub fn add_n(

Original file line number	Diff line number	Diff line change
`@@ -479,11 +479,11 @@ impl QueueFile {`
`479`	`479`	`self.cached_offsets.push((i, self.last));`
`480`	`480`	`}`
`481`	`481`
	`482`	`+ #[inline]`
`482`	`483`	`fn cached_index_up_to(&self, i: usize) -> Option<usize> {`
`483`	`484`	`self.cached_offsets`
`484`	`485`	`.binary_search_by(\|(idx, _)\| idx.cmp(&i))`
`485`		`- .map(Some)`
`486`		`- .unwrap_or_else(\|i\| i.checked_sub(1))`
	`486`	`+ .map_or_else(\|i\| i.checked_sub(1), Some)`
`487`	`487`	`}`
`488`	`488`
`489`	`489`	`pub fn add_n(`