Merge pull request #156 from erichdongubler-mozilla/thanks-clippy

erichdongubler-mozilla · Jan 15, 2025 · 5a55538 · 5a55538
2 parents 0288eda + de7e6c5
commit 5a55538
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/moz-webgpu-cts/src/main.rs b/moz-webgpu-cts/src/main.rs
@@ -175,7 +175,7 @@ impl ExecReportSpec {
                             .filter(|diag| {
                                 // N.B.: There should be at least one of these!
                                 diag.severity()
-                                    .map_or(true, |sev| sev == miette::Severity::Error)
+                                    .is_none_or(|sev| sev == miette::Severity::Error)
                             })
                             .map(Report::new_boxed);
                         for report in error_reports {

diff --git a/moz-webgpu-cts/src/wpt/metadata.rs b/moz-webgpu-cts/src/wpt/metadata.rs
@@ -660,7 +660,7 @@ impl<'a> metadata::Tests<'a> for Tests {
     ) {
         let Self(tests) = self;
         if tests.get(&name).is_some() {
-            emitter.emit(Rich::custom(span, "duplicate test {name:?}"));
+            emitter.emit(Rich::custom(span, format!("duplicate test {name:?}")));
         }
         tests.insert(name, test);
     }
@@ -984,8 +984,8 @@ where
                                     platform,
                                     build_profile,
                                 } = applicability;
-                                if platform.as_ref().map_or(true, |p2| *p2 == p)
-                                    && build_profile.as_ref().map_or(true, |bp2| *bp2 == bp)
+                                if platform.as_ref().is_none_or(|p2| *p2 == p)
+                                    && build_profile.as_ref().is_none_or(|bp2| *bp2 == bp)
                                 {
                                     matched = Some(val.clone());
                                 }