resolve conflicts

.dprint.json

@@ -38,9 +38,9 @@
     "tools/wpt/manifest.json"
   ],
   "plugins": [
-    "https://plugins.dprint.dev/typescript-0.60.0.wasm",
-    "https://plugins.dprint.dev/json-0.13.2.wasm",
-    "https://plugins.dprint.dev/markdown-0.11.3.wasm",
+    "https://plugins.dprint.dev/typescript-0.61.0.wasm",
+    "https://plugins.dprint.dev/json-0.14.0.wasm",
+    "https://plugins.dprint.dev/markdown-0.12.0.wasm",
     "https://plugins.dprint.dev/toml-0.5.3.wasm"
   ]
 }

.github/mtime_cache/action.js

@@ -1,4 +1,4 @@
-// Copyright 2018-2021 the Deno authors. All rights reserved. MIT license.
+// Copyright 2018-2022 the Deno authors. All rights reserved. MIT license.
 // This file contains the implementation of a Github Action. Github uses
 // Node.js v12.x to run actions, so this is Node code and not Deno code.
 

.github/workflows/ci.yml

@@ -262,7 +262,7 @@ jobs:
             ~/.cargo/registry/index
             ~/.cargo/registry/cache
             ~/.cargo/git/db
-          key: 2-cargo-home-${{ matrix.os }}-${{ hashFiles('Cargo.lock') }}
+          key: 3-cargo-home-${{ matrix.os }}-${{ hashFiles('Cargo.lock') }}
 
       # In main branch, always creates fresh cache
       - name: Cache build output (main)
@@ -278,7 +278,7 @@ jobs:
             !./target/*/*.zip
             !./target/*/*.tar.gz
           key: |
-            2-cargo-target-${{ matrix.os }}-${{ matrix.profile }}-${{ github.sha }}
+            3-cargo-target-${{ matrix.os }}-${{ matrix.profile }}-${{ github.sha }}
 
       # Restore cache from the latest 'main' branch build.
       - name: Cache build output (PR)
@@ -294,7 +294,7 @@ jobs:
             !./target/*/*.tar.gz
           key: never_saved
           restore-keys: |
-            2-cargo-target-${{ matrix.os }}-${{ matrix.profile }}-
+            3-cargo-target-${{ matrix.os }}-${{ matrix.profile }}-
 
       # Don't save cache after building PRs or branches other than 'main'.
       - name: Skip save cache (PR)

.rustfmt.toml

@@ -1,4 +1,4 @@
-# Copyright 2018-2021 the Deno authors. All rights reserved. MIT license.
+# Copyright 2018-2022 the Deno authors. All rights reserved. MIT license.
 max_width = 80
 tab_spaces = 2
 edition = "2021"