From 10c64820e817ce47fae26b6a7925320f5fa9299d Mon Sep 17 00:00:00 2001
From: Gae24 <96017547+Gae24@users.noreply.github.com>
Date: Mon, 16 Sep 2024 12:32:49 +0200
Subject: [PATCH] chore: update script to use phf 0.11 (#33434)

Signed-off-by: Gae24 <96017547+Gae24@users.noreply.github.com>
---
 Cargo.lock                   | 17 ++++-------------
 components/script/Cargo.toml |  2 +-
 servo-tidy.toml              |  3 +--
 3 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 576d58a73cc..52a1087a437 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1183,7 +1183,7 @@ dependencies = [
  "cssparser-macros",
  "dtoa-short",
  "itoa",
- "phf 0.11.2",
+ "phf",
  "serde",
  "smallvec",
 ]
@@ -4173,7 +4173,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "82c88c6129bd24319e62a0359cb6b958fa7e8be6e19bb1663bc396b90883aca5"
 dependencies = [
  "log",
- "phf 0.11.2",
+ "phf",
  "phf_codegen",
  "string_cache",
  "string_cache_codegen",
@@ -5006,15 +5006,6 @@ dependencies = [
  "indexmap",
 ]
 
-[[package]]
-name = "phf"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259"
-dependencies = [
- "phf_shared 0.10.0",
-]
-
 [[package]]
 name = "phf"
 version = "0.11.2"
@@ -5760,7 +5751,7 @@ dependencies = [
  "num_cpus",
  "parking_lot",
  "percent-encoding",
- "phf 0.10.1",
+ "phf",
  "phf_codegen",
  "phf_shared 0.11.2",
  "pixels",
@@ -5920,7 +5911,7 @@ dependencies = [
  "fxhash",
  "log",
  "new_debug_unreachable",
- "phf 0.11.2",
+ "phf",
  "phf_codegen",
  "precomputed-hash",
  "servo_arc",
diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml
index c17d25a9e75..39d0f573e8d 100644
--- a/components/script/Cargo.toml
+++ b/components/script/Cargo.toml
@@ -78,7 +78,7 @@ num_cpus = { workspace = true }
 num-traits = { workspace = true }
 parking_lot = { workspace = true }
 percent-encoding = { workspace = true }
-phf = "0.10"
+phf = "0.11"
 pixels = { path = "../pixels" }
 profile_traits = { workspace = true }
 range = { path = "../range" }
diff --git a/servo-tidy.toml b/servo-tidy.toml
index fa9f51bd000..33aff48b987 100644
--- a/servo-tidy.toml
+++ b/servo-tidy.toml
@@ -60,8 +60,7 @@ packages = [
     # stuck on 0.8.4 with no new releases.
     "env_logger",
 
-    # Stylo uses phf 0.11, while script and other dependencies use 0.10.
-    "phf",
+    # Required until a new version of string-cache is released.
     "phf_generator",
     "phf_shared",