Merge pull request #164 from erichdongubler-mozilla/erichdongubler/push-xnsqlxmtsyqw

Make CI happy again

Author: ErichDonGubler

.github/workflows/release.yml

@@ -47,7 +47,7 @@ on:
 jobs:
   # Run 'dist plan' (or host) to determine what tasks we need to do
   plan:
-    runs-on: "ubuntu-20.04"
+    runs-on: "ubuntu-latest"
     outputs:
       val: ${{ steps.plan.outputs.manifest }}
       tag: ${{ !github.event.pull_request && github.ref_name || '' }}
@@ -168,7 +168,7 @@ jobs:
     needs:
       - plan
       - build-local-artifacts
-    runs-on: "ubuntu-20.04"
+    runs-on: "ubuntu-latest"
     env:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       BUILD_MANIFEST_NAME: target/distrib/global-dist-manifest.json
@@ -218,7 +218,7 @@ jobs:
     if: ${{ always() && needs.plan.outputs.publishing == 'true' && (needs.build-global-artifacts.result == 'skipped' || needs.build-global-artifacts.result == 'success') && (needs.build-local-artifacts.result == 'skipped' || needs.build-local-artifacts.result == 'success') }}
     env:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-    runs-on: "ubuntu-20.04"
+    runs-on: "ubuntu-latest"
     outputs:
       val: ${{ steps.host.outputs.manifest }}
     steps:
@@ -282,7 +282,7 @@ jobs:
     # still allowing individual publish jobs to skip themselves (for prereleases).
     # "host" however must run to completion, no skipping allowed!
     if: ${{ always() && needs.host.result == 'success' }}
-    runs-on: "ubuntu-20.04"
+    runs-on: "ubuntu-latest"
     env:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:

dist-workspace.toml

@@ -17,3 +17,6 @@ pr-run-mode = "plan"
 install-updater = false
 # Path that installers should place binaries in
 install-path = "CARGO_HOME"
+
+[dist.github-custom-runners]
+global = "ubuntu-latest"

moz-webgpu-cts/src/wpt/metadata.rs

@@ -870,7 +870,7 @@ where
             use std::borrow::Cow;
 
             #[derive(Clone, Debug, Default, Eq, PartialEq)]
-            struct TagsDisplay<'a>(Cow<'a, Vec<String>>);
+            struct TagsDisplay<'a>(Cow<'a, [String]>);
 
             impl Display for TagsDisplay<'_> {
                 fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
@@ -879,7 +879,7 @@ where
                 }
             }
 
-            let tags_ref = tags.as_ref();
+            let tags_ref = tags.as_deref();
             let tags_ref = tags_ref.map(Cow::Borrowed).map(TagsDisplay);
 
             write_normalized(f, &indent, TAGS_IDENT, tags_ref)?;

moz-webgpu-cts/src/wpt/metadata/properties.rs

@@ -2,7 +2,7 @@ use std::{
     collections::BTreeMap,
     fmt::{self, Debug, Display, Formatter},
     num::NonZeroUsize,
-    ops::{BitOr, BitOrAssign, Index, IndexMut},
+    ops::{BitOr, BitOrAssign, Deref, Index, IndexMut},
 };
 
 use enum_map::EnumMap;
@@ -301,9 +301,12 @@ impl<T> ExpandedPropertyValue<T> {
         inner
     }
 
-    pub(crate) fn as_ref(&self) -> ExpandedPropertyValue<&T> {
+    pub(crate) fn as_deref(&self) -> ExpandedPropertyValue<&<T as Deref>::Target>
+    where
+        T: Deref,
+    {
         ExpandedPropertyValue::from_query(|platform, build_profile| {
-            &self[(platform, build_profile)]
+            &*self[(platform, build_profile)]
         })
     }
 }

whippit/src/metadata/properties.rs

@@ -58,7 +58,6 @@ where
 /// [`File`]: crate::metadata::File
 /// [`Test`]: crate::metadata::Test
 /// [`Subtest`]: crate::metadata::Subtest
-/// [`File::parser`]: crate::metadata::File::parser
 pub trait Properties<'a>
 where
     Self: Clone + Default + Sized,