From fc9fe70465400a30a7b049a0f1db2579e23eac3c Mon Sep 17 00:00:00 2001
From: Adrian Taylor <adetaylor@chromium.org>
Date: Sat, 28 Sep 2024 10:06:09 +0100
Subject: [PATCH 1/2] Temporarily use git version of bindgen for testing.

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

diff --git a/Cargo.lock b/Cargo.lock
index 1f9fc9f03..909ec21c6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -164,9 +164,8 @@ dependencies = [
 
 [[package]]
 name = "autocxx-bindgen"
-version = "0.69.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d81238f7571a7fe1743bebbfaf218ad9aeceaec0f1f25c74b2d3f42b16fa17ea"
+version = "0.70.1"
+source = "git+https://github.com/adetaylor/rust-bindgen?branch=merge-0.70.1#fc466bfb6c690bb93264db324ad8d519b34d0da9"
 dependencies = [
  "bitflags 2.3.3",
  "cexpr",
diff --git a/engine/Cargo.toml b/engine/Cargo.toml
index c72212c2b..65fbe4e10 100644
--- a/engine/Cargo.toml
+++ b/engine/Cargo.toml
@@ -30,8 +30,8 @@ log = "0.4"
 proc-macro2 = "1.0.11"
 quote = "1.0"
 indoc = "1.0"
-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"] }
+#autocxx-bindgen = { version = "=0.69.5", default-features = false, features = ["logging", "which-rustfmt"] }
+autocxx-bindgen = { git = "https://github.com/adetaylor/rust-bindgen", branch = "merge-0.70.1", default-features = false, features = ["logging", "which-rustfmt"] }
 itertools = "0.10.3"
 cc = { version = "1.0", optional = true }
 # Note: Keep the patch-level version of cxx-gen and cxx in sync.

From da89d17deea07bd94b88348189285d3e4b081c17 Mon Sep 17 00:00:00 2001
From: Adrian Taylor <adetaylor@chromium.org>
Date: Sat, 28 Sep 2024 12:10:52 +0100
Subject: [PATCH 2/2] Switch to official release.

---
 engine/Cargo.toml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/engine/Cargo.toml b/engine/Cargo.toml
index 65fbe4e10..6986f5429 100644
--- a/engine/Cargo.toml
+++ b/engine/Cargo.toml
@@ -30,8 +30,8 @@ log = "0.4"
 proc-macro2 = "1.0.11"
 quote = "1.0"
 indoc = "1.0"
-#autocxx-bindgen = { version = "=0.69.5", default-features = false, features = ["logging", "which-rustfmt"] }
-autocxx-bindgen = { git = "https://github.com/adetaylor/rust-bindgen", branch = "merge-0.70.1", default-features = false, features = ["logging", "which-rustfmt"] }
+autocxx-bindgen = { version = "=0.70.1", default-features = false, features = ["logging", "which-rustfmt"] }
+#autocxx-bindgen = { git = "https://github.com/adetaylor/rust-bindgen", branch = "merge-0.70.1", default-features = false, features = ["logging", "which-rustfmt"] }
 itertools = "0.10.3"
 cc = { version = "1.0", optional = true }
 # Note: Keep the patch-level version of cxx-gen and cxx in sync.