From bc8e94155a735a75d283515970183bede7eb67a8 Mon Sep 17 00:00:00 2001
From: Andreu Botella <abb@randomunok.com>
Date: Thu, 28 Oct 2021 22:01:42 -0700
Subject: [PATCH] fix(encoding): support additional encoding labels (#12586)

---
 Cargo.lock                 |  4 ++--
 cli/Cargo.toml             |  2 +-
 ext/web/Cargo.toml         |  2 +-
 runtime/Cargo.toml         |  2 +-
 tools/wpt/expectation.json | 26 +++-----------------------
 5 files changed, 8 insertions(+), 28 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 7324466c47..438ac954ac 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1193,9 +1193,9 @@ dependencies = [
 
 [[package]]
 name = "encoding_rs"
-version = "0.8.28"
+version = "0.8.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80df024fbc5ac80f87dfef0d9f5209a252f2a497f7f42944cff24d8253cac065"
+checksum = "a74ea89a0a1b98f6332de42c95baff457ada66d1cb4030f9ff151b2041a1c746"
 dependencies = [
  "cfg-if 1.0.0",
 ]
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index 86d35a0e11..7be42ad5fe 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -55,7 +55,7 @@ dissimilar = "1.0.2"
 dprint-plugin-json = "0.13.0"
 dprint-plugin-markdown = "0.10.0"
 dprint-plugin-typescript = "0.58.1"
-encoding_rs = "0.8.28"
+encoding_rs = "0.8.29"
 env_logger = "0.8.4"
 fancy-regex = "0.7.1"
 http = "0.2.4"
diff --git a/ext/web/Cargo.toml b/ext/web/Cargo.toml
index 5568e9a6f6..c4e8ae8a7e 100644
--- a/ext/web/Cargo.toml
+++ b/ext/web/Cargo.toml
@@ -17,7 +17,7 @@ path = "lib.rs"
 async-trait = "0.1.51"
 base64 = "0.13.0"
 deno_core = { version = "0.105.0", path = "../../core" }
-encoding_rs = "0.8.28"
+encoding_rs = "0.8.29"
 serde = "1.0.129"
 tokio = { version = "1.10.1", features = ["full"] }
 uuid = { version = "0.8.2", features = ["v4", "serde"] }
diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml
index d24e560b8c..f1d065b16d 100644
--- a/runtime/Cargo.toml
+++ b/runtime/Cargo.toml
@@ -63,7 +63,7 @@ deno_webstorage = { version = "0.18.0", path = "../ext/webstorage" }
 
 atty = "0.2.14"
 dlopen = "0.1.8"
-encoding_rs = "0.8.28"
+encoding_rs = "0.8.29"
 filetime = "0.2.15"
 fs3 = "0.5.0"
 http = "0.2.4"
diff --git a/tools/wpt/expectation.json b/tools/wpt/expectation.json
index d8931aefe5..361b734e4f 100644
--- a/tools/wpt/expectation.json
+++ b/tools/wpt/expectation.json
@@ -6063,28 +6063,8 @@
     "textdecoder-fatal.any.worker.html": true,
     "textdecoder-ignorebom.any.html": true,
     "textdecoder-ignorebom.any.worker.html": true,
-    "textdecoder-labels.any.html": [
-      "unicode11utf8 => UTF-8",
-      "unicode20utf8 => UTF-8",
-      "x-unicode20utf8 => UTF-8",
-      "unicodefffe => UTF-16BE",
-      "csunicode => UTF-16LE",
-      "iso-10646-ucs-2 => UTF-16LE",
-      "ucs-2 => UTF-16LE",
-      "unicode => UTF-16LE",
-      "unicodefeff => UTF-16LE"
-    ],
-    "textdecoder-labels.any.worker.html": [
-      "unicode11utf8 => UTF-8",
-      "unicode20utf8 => UTF-8",
-      "x-unicode20utf8 => UTF-8",
-      "unicodefffe => UTF-16BE",
-      "csunicode => UTF-16LE",
-      "iso-10646-ucs-2 => UTF-16LE",
-      "ucs-2 => UTF-16LE",
-      "unicode => UTF-16LE",
-      "unicodefeff => UTF-16LE"
-    ],
+    "textdecoder-labels.any.html": true,
+    "textdecoder-labels.any.worker.html": true,
     "textdecoder-streaming.any.html": true,
     "textdecoder-streaming.any.worker.html": true,
     "textdecoder-utf16-surrogates.any.html": true,
@@ -9288,4 +9268,4 @@
       "Pattern: [] Inputs: []"
     ]
   }
-}
\ No newline at end of file
+}