From ee32212437795d938808430fb1a990727dbfbd81 Mon Sep 17 00:00:00 2001
From: Martin Robinson <mrobinson@igalia.com>
Date: Sat, 10 Feb 2024 07:28:26 +0100
Subject: [PATCH] Update mozangle and mozjs in order to use bindgen 0.69.4
 (#31306)

This should fix issues that we have with Float16 support on newer LLVM.
This also updates style, in order to remove the duplicate version of
bindgen. We will soon be able to manage updates to style more
consistently.
---
 Cargo.lock                  | 77 ++++++++-----------------------------
 Cargo.toml                  |  2 +-
 components/style/Cargo.toml |  2 +-
 servo-tidy.toml             |  3 --
 4 files changed, 17 insertions(+), 67 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 242ef435db9..d65ab1b6575 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -328,58 +328,17 @@ dependencies = [
 
 [[package]]
 name = "bindgen"
-version = "0.64.0"
+version = "0.69.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4243e6031260db77ede97ad86c27e501d646a27ab57b59a574f725d98ab1fb4"
-dependencies = [
- "bitflags 1.3.2",
- "cexpr",
- "clang-sys",
- "lazy_static",
- "lazycell",
- "peeking_take_while",
- "proc-macro2",
- "quote",
- "regex",
- "rustc-hash",
- "shlex",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "bindgen"
-version = "0.68.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "726e4313eb6ec35d2730258ad4e15b547ee75d6afaa1361a922e78e59b7d8078"
-dependencies = [
- "bitflags 2.4.2",
- "cexpr",
- "clang-sys",
- "lazy_static",
- "lazycell",
- "peeking_take_while",
- "proc-macro2",
- "quote",
- "regex",
- "rustc-hash",
- "shlex",
- "syn 2.0.48",
- "which",
-]
-
-[[package]]
-name = "bindgen"
-version = "0.69.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4c69fae65a523209d34240b60abe0c42d33d1045d445c0839d8a4894a736e2d"
+checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0"
 dependencies = [
  "bitflags 2.4.2",
  "cexpr",
  "clang-sys",
+ "itertools 0.10.5",
  "lazy_static",
  "lazycell",
  "log",
- "peeking_take_while",
  "prettyplease",
  "proc-macro2",
  "quote",
@@ -1159,7 +1118,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e16e44ab292b1dddfdaf7be62cfd8877df52f2f3fde5858d95bab606be259f20"
 dependencies = [
  "bitflags 2.4.2",
- "libloading 0.8.1",
+ "libloading 0.7.4",
  "winapi",
 ]
 
@@ -1356,7 +1315,7 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412"
 dependencies = [
- "libloading 0.8.1",
+ "libloading 0.7.4",
 ]
 
 [[package]]
@@ -3679,11 +3638,11 @@ dependencies = [
 
 [[package]]
 name = "mozangle"
-version = "0.5.0"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aeb5ed416ca0e4bc02daa155b8fb7f58bf1ada40db78bfb168ee14f945d6abf3"
+checksum = "b14af7d1a65278923835af94ac23d4c3662478001ac6e78075fe1210a7067e4b"
 dependencies = [
- "bindgen 0.68.1",
+ "bindgen",
  "cc",
  "gl_generator",
  "lazy_static",
@@ -3700,9 +3659,9 @@ checksum = "903970ae2f248d7275214cf8f387f8ba0c4ea7e3d87a320e85493db60ce28616"
 [[package]]
 name = "mozjs"
 version = "0.14.1"
-source = "git+https://github.com/servo/mozjs#7184f658b7e2de8a8d288ff39001364513115782"
+source = "git+https://github.com/servo/mozjs#d1f1519b8a9a57d97e3f623ea119e86c5dcbf524"
 dependencies = [
- "bindgen 0.68.1",
+ "bindgen",
  "cc",
  "lazy_static",
  "libc",
@@ -3714,9 +3673,9 @@ dependencies = [
 [[package]]
 name = "mozjs_sys"
 version = "0.68.2"
-source = "git+https://github.com/servo/mozjs#7184f658b7e2de8a8d288ff39001364513115782"
+source = "git+https://github.com/servo/mozjs#d1f1519b8a9a57d97e3f623ea119e86c5dcbf524"
 dependencies = [
- "bindgen 0.68.1",
+ "bindgen",
  "cc",
  "encoding_c",
  "encoding_c_mem",
@@ -4222,12 +4181,6 @@ dependencies = [
  "unicode-xid",
 ]
 
-[[package]]
-name = "peeking_take_while"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
-
 [[package]]
 name = "percent-encoding"
 version = "2.3.1"
@@ -5717,7 +5670,7 @@ dependencies = [
  "app_units",
  "arrayvec",
  "atomic_refcell",
- "bindgen 0.64.0",
+ "bindgen",
  "bitflags 1.3.2",
  "byteorder",
  "cssparser",
@@ -6902,7 +6855,7 @@ version = "0.0.1"
 source = "git+https://github.com/servo/webxr#614420b9830615376563fc6e1d98c52119f97123"
 dependencies = [
  "android_injected_glue",
- "bindgen 0.69.2",
+ "bindgen",
  "crossbeam-channel",
  "euclid",
  "gl_generator",
@@ -6976,7 +6929,7 @@ dependencies = [
  "js-sys",
  "khronos-egl",
  "libc",
- "libloading 0.8.1",
+ "libloading 0.7.4",
  "log",
  "metal 0.27.0",
  "naga",
diff --git a/Cargo.toml b/Cargo.toml
index 04653f83f9c..678c0d2d965 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -68,7 +68,7 @@ log = "0.4"
 malloc_size_of_derive = "0.1"
 mime = "0.3.13"
 mime_guess = "2.0.3"
-mozangle = "0.5.0"
+mozangle = "0.5.1"
 msg = { path = "components/shared/msg" }
 net_traits = { path = "components/shared/net" }
 num_cpus = { workspace = true }
diff --git a/components/style/Cargo.toml b/components/style/Cargo.toml
index fb018dc0538..e7d172b41ce 100644
--- a/components/style/Cargo.toml
+++ b/components/style/Cargo.toml
@@ -86,7 +86,7 @@ unicode-segmentation = "1.0"
 void = "1.0.2"
 
 [build-dependencies]
-bindgen = { version = "0.64", optional = true, default-features = false }
+bindgen = { version = "0.69", optional = true, default-features = false }
 lazy_static = "1"
 log = "0.4"
 mozbuild = { version = "0.1", optional = true }
diff --git a/servo-tidy.toml b/servo-tidy.toml
index 08b89019597..25d533e56b6 100644
--- a/servo-tidy.toml
+++ b/servo-tidy.toml
@@ -59,9 +59,6 @@ packages = [
     # Duplicated by style, cbindgen, clap, and GStreamer.
     "indexmap",
 
-    # style (0.64) vs. webxr (0.66) vs. mozjs_sys (0.68).
-    "bindgen",
-
     # quickcheck (required by layout_2020 for tests) is
     # stuck on 0.8.4 with no new releases.
     "env_logger",