ref: Fix new clippy lints

szokeasaurusrex · szokeasaurusrex · commit 00587b10776a · 2025-01-14T14:29:01.000+01:00
diff --git a/src/commands/debug_files/bundle_sources.rs b/src/commands/debug_files/bundle_sources.rs
@@ -32,7 +32,7 @@ pub fn make_command(command: Command) -> Command {
 }
 
 fn is_dsym(path: &Path) -> bool {
-    path.extension().map_or(false, |e| e == "dSYM")
+    path.extension().is_some_and(|e| e == "dSYM")
 }
 
 fn get_sane_parent(path: &Path) -> &Path {
diff --git a/src/utils/dif_upload/mod.rs b/src/utils/dif_upload/mod.rs
@@ -591,10 +591,7 @@ fn find_uuid_plists(
     //        └─ DWARF
     //           └─ App
     let plist_name = format!("{:X}.plist", uuid.as_hyphenated());
-    let plist = match source.get_relative(format!("../{}", &plist_name)) {
-        Some(plist) => plist,
-        None => return None,
-    };
+    let plist = source.get_relative(format!("../{}", &plist_name))?;
 
     let mut plists = BTreeMap::new();
     plists.insert(plist_name, plist);
@@ -1697,7 +1694,7 @@ impl<'a> DifUpload<'a> {
 
     /// Determines if this file extension matches the search criteria.
     fn valid_extension(&self, ext: Option<&OsStr>) -> bool {
-        self.extensions.is_empty() || ext.map_or(false, |e| self.extensions.contains(e))
+        self.extensions.is_empty() || ext.is_some_and(|e| self.extensions.contains(e))
     }
 
     /// Determines if this [`DifFormat`] matches the search criteria.
diff --git a/src/utils/file_search.rs b/src/utils/file_search.rs
@@ -136,7 +136,7 @@ impl ReleaseFileSearch {
 
         for result in builder.build() {
             let file = result?;
-            if file.file_type().map_or(false, |t| t.is_dir()) {
+            if file.file_type().is_some_and(|t| t.is_dir()) {
                 continue;
             }
             pb.set_message(&format!("{}", file.path().display()));
diff --git a/src/utils/file_upload.rs b/src/utils/file_upload.rs
@@ -42,7 +42,7 @@ pub fn initialize_legacy_release_upload(context: &UploadContext) -> Result<()> {
     // if a project is provided which is technically unnecessary for the
     // legacy upload though it will unlikely to be what users want.
     if context.project.is_some()
-        && context.chunk_upload_options.map_or(false, |x| {
+        && context.chunk_upload_options.is_some_and(|x| {
             x.supports(ChunkUploadCapability::ArtifactBundles)
                 || x.supports(ChunkUploadCapability::ArtifactBundlesV2)
         })
diff --git a/src/utils/sourcemaps/inject.rs b/src/utils/sourcemaps/inject.rs
@@ -284,7 +284,7 @@ pub fn find_matching_paths(candidate_paths: &[String], expected_path: &str) -> V
         while candidate_segments
             .peek()
             .zip(expected_segments.peek())
-            .map_or(false, |(x, y)| x == y)
+            .is_some_and(|(x, y)| x == y)
         {
             candidate_segments.next();
             expected_segments.next();

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ pub fn make_command(command: Command) -> Command {`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`fn is_dsym(path: &Path) -> bool {`
`35`		`- path.extension().map_or(false, \|e\| e == "dSYM")`
	`35`	`+ path.extension().is_some_and(\|e\| e == "dSYM")`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`fn get_sane_parent(path: &Path) -> &Path {`
Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,7 @@ impl ReleaseFileSearch {`
`136`	`136`
`137`	`137`	`for result in builder.build() {`
`138`	`138`	`let file = result?;`
`139`		`- if file.file_type().map_or(false, \|t\| t.is_dir()) {`
	`139`	`+ if file.file_type().is_some_and(\|t\| t.is_dir()) {`
`140`	`140`	`continue;`
`141`	`141`	`}`
`142`	`142`	`pb.set_message(&format!("{}", file.path().display()));`
Original file line number	Diff line number	Diff line change
`@@ -284,7 +284,7 @@ pub fn find_matching_paths(candidate_paths: &[String], expected_path: &str) -> V`
`284`	`284`	`while candidate_segments`
`285`	`285`	`.peek()`
`286`	`286`	`.zip(expected_segments.peek())`
`287`		`- .map_or(false, \|(x, y)\| x == y)`
	`287`	`+ .is_some_and(\|(x, y)\| x == y)`
`288`	`288`	`{`
`289`	`289`	`candidate_segments.next();`
`290`	`290`	`expected_segments.next();`