From 2c3f7c015682738ed5f6963fe260661c86630e01 Mon Sep 17 00:00:00 2001
From: Alex Touchet <alextouchet@outlook.com>
Date: Fri, 22 Sep 2023 17:21:25 -0700
Subject: [PATCH] De-dupe gl_generator (#30408)

---
 Cargo.lock      | 27 ++++++++-------------------
 servo-tidy.toml |  1 -
 2 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 20328b3507a..867e0a09c13 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2125,17 +2125,6 @@ version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0"
 
-[[package]]
-name = "gl_generator"
-version = "0.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca98bbde17256e02d17336a6bdb5a50f7d0ccacee502e191d3e3d0ec2f96f84a"
-dependencies = [
- "khronos_api",
- "log",
- "xml-rs",
-]
-
 [[package]]
 name = "gl_generator"
 version = "0.14.0"
@@ -2153,7 +2142,7 @@ version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0173481f2bb6e809bf4985de2e86c83876d84d2805830e3301cd37355e897f0f"
 dependencies = [
- "gl_generator 0.14.0",
+ "gl_generator",
 ]
 
 [[package]]
@@ -3689,12 +3678,12 @@ dependencies = [
 
 [[package]]
 name = "mozangle"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "094982bba06f6658a8a7997983e44efb9b129cb032050cb3ec845e875e618ea0"
+checksum = "3a1fa5a876b07f6e97ecea31b3f1ef03fc3718af65429965559a5f09c563c7d5"
 dependencies = [
  "cc",
- "gl_generator 0.13.1",
+ "gl_generator",
  "lazy_static",
  "walkdir",
 ]
@@ -5547,7 +5536,7 @@ version = "0.0.1"
 dependencies = [
  "core-foundation 0.6.4",
  "getopts",
- "gl_generator 0.14.0",
+ "gl_generator",
  "ipc-channel",
  "libc",
  "libloading 0.8.0",
@@ -5694,7 +5683,7 @@ version = "0.1.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "74fc6c6346da9177de9894230716709c223c62adbf910a5c1e6096b2ee2e58e0"
 dependencies = [
- "gl_generator 0.14.0",
+ "gl_generator",
 ]
 
 [[package]]
@@ -5917,7 +5906,7 @@ dependencies = [
  "core-graphics",
  "euclid",
  "fnv",
- "gl_generator 0.14.0",
+ "gl_generator",
  "io-surface",
  "lazy_static",
  "libc",
@@ -6922,7 +6911,7 @@ dependencies = [
  "bindgen 0.66.1",
  "crossbeam-channel",
  "euclid",
- "gl_generator 0.14.0",
+ "gl_generator",
  "gvr-sys",
  "log",
  "serde",
diff --git a/servo-tidy.toml b/servo-tidy.toml
index c6dde0044c4..0a65820d541 100644
--- a/servo-tidy.toml
+++ b/servo-tidy.toml
@@ -28,7 +28,6 @@ packages = [
     "core-foundation",
     "core-foundation-sys",
     "futures",
-    "gl_generator",
     "itoa",
     "libloading",
     "mio",