From 4d0f11ab028ee88d83d79598297de9ff8da275d3 Mon Sep 17 00:00:00 2001
From: Adrian Taylor <adetaylor@chromium.org>
Date: Mon, 24 Jun 2024 18:04:01 -0400
Subject: [PATCH 1/2] Revise to autocxx-bindgen 0.69.4.

---
 Cargo.lock        | 40 +++-------------------------------------
 engine/Cargo.toml |  2 +-
 2 files changed, 4 insertions(+), 38 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ebe21c220..b02d94717 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -164,26 +164,21 @@ dependencies = [
 
 [[package]]
 name = "autocxx-bindgen"
-version = "0.65.1"
+version = "0.69.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c9fb7b8dd83a582e12157367773d8d1195f2dea54d4250aaf3426abae3237aa"
+checksum = "3f37b6207299c717f1bb5587a652cc6f3ab4bc81f15c3d6efaa051ea1f3d6947"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.3.3",
  "cexpr",
  "clang-sys",
  "itertools 0.10.5",
- "lazy_static",
- "lazycell",
  "log",
- "peeking_take_while",
- "prettyplease",
  "proc-macro2",
  "quote",
  "regex",
  "rustc-hash",
  "shlex",
  "syn 2.0.23",
- "which",
 ]
 
 [[package]]
@@ -941,18 +936,6 @@ dependencies = [
  "wasm-bindgen",
 ]
 
-[[package]]
-name = "lazy_static"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-
-[[package]]
-name = "lazycell"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
-
 [[package]]
 name = "libc"
 version = "0.2.147"
@@ -1165,12 +1148,6 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd"
 
-[[package]]
-name = "peeking_take_while"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
-
 [[package]]
 name = "pest"
 version = "2.7.0"
@@ -1802,17 +1779,6 @@ version = "0.2.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1"
 
-[[package]]
-name = "which"
-version = "4.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269"
-dependencies = [
- "either",
- "libc",
- "once_cell",
-]
-
 [[package]]
 name = "winapi"
 version = "0.3.9"
diff --git a/engine/Cargo.toml b/engine/Cargo.toml
index 9736db9fe..7049aedbe 100644
--- a/engine/Cargo.toml
+++ b/engine/Cargo.toml
@@ -30,7 +30,7 @@ log = "0.4"
 proc-macro2 = "1.0.11"
 quote = "1.0"
 indoc = "1.0"
-autocxx-bindgen = { version = "=0.65.1", default-features = false, features = ["logging", "which-rustfmt"] }
+autocxx-bindgen = { version = "=0.69.4", default-features = false, features = ["logging", "which-rustfmt"] }
 #autocxx-bindgen = { git = "https://github.com/maurer/rust-bindgen", branch = "update-0.65.1", default-features = false, features = ["logging", "which-rustfmt"] }
 itertools = "0.10.3"
 cc = { version = "1.0", optional = true }

From b3b56937a3ffcae0008ac14f575519e883ca9ade Mon Sep 17 00:00:00 2001
From: Adrian Taylor <adetaylor@chromium.org>
Date: Tue, 25 Jun 2024 07:50:48 -0400
Subject: [PATCH 2/2] Roll to autocxx-bindgen 0.69.5

---
 Cargo.lock        | 4 ++--
 engine/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b02d94717..9fe6efca4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -164,9 +164,9 @@ dependencies = [
 
 [[package]]
 name = "autocxx-bindgen"
-version = "0.69.4"
+version = "0.69.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f37b6207299c717f1bb5587a652cc6f3ab4bc81f15c3d6efaa051ea1f3d6947"
+checksum = "d81238f7571a7fe1743bebbfaf218ad9aeceaec0f1f25c74b2d3f42b16fa17ea"
 dependencies = [
  "bitflags 2.3.3",
  "cexpr",
diff --git a/engine/Cargo.toml b/engine/Cargo.toml
index 7049aedbe..2a0089642 100644
--- a/engine/Cargo.toml
+++ b/engine/Cargo.toml
@@ -30,7 +30,7 @@ log = "0.4"
 proc-macro2 = "1.0.11"
 quote = "1.0"
 indoc = "1.0"
-autocxx-bindgen = { version = "=0.69.4", default-features = false, features = ["logging", "which-rustfmt"] }
+autocxx-bindgen = { version = "=0.69.5", default-features = false, features = ["logging", "which-rustfmt"] }
 #autocxx-bindgen = { git = "https://github.com/maurer/rust-bindgen", branch = "update-0.65.1", default-features = false, features = ["logging", "which-rustfmt"] }
 itertools = "0.10.3"
 cc = { version = "1.0", optional = true }