From 4d7020ac2374c0483be6b865059ceeb636359890 Mon Sep 17 00:00:00 2001
From: Gopa Kumar <gopakumarce@gmail.com>
Date: Fri, 19 May 2023 13:28:00 -0400
Subject: [PATCH 1/2] new bindgen with support for inline functions

---
 Cargo.lock     | 37 ++++++++++++++++++++++++++++++++++---
 Cargo.toml     |  2 +-
 src/bindgen.rs |  2 +-
 3 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 866c199..e505830 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -35,6 +35,16 @@ dependencies = [
  "as-slice",
 ]
 
+[[package]]
+name = "annotate-snippets"
+version = "0.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ccaf7e9dfbb6ab22c82e473cd1a8a7bd313c19a5b7e40970f3d89ef5a5c9e81e"
+dependencies = [
+ "unicode-width",
+ "yansi-term",
+]
+
 [[package]]
 name = "ansi_term"
 version = "0.12.1"
@@ -96,10 +106,11 @@ checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9"
 
 [[package]]
 name = "bindgen"
-version = "0.63.0"
+version = "0.65.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36d860121800b2a9a94f9b5604b332d5cffb234ce17609ea479d723dbc9d3885"
+checksum = "cfdf7b466f9a4903edc73f95d6d2bcd5baf8ae620638762244d3f60143643cc5"
 dependencies = [
+ "annotate-snippets",
  "bitflags 1.3.2",
  "cexpr",
  "clang-sys",
@@ -107,12 +118,13 @@ dependencies = [
  "lazycell",
  "log",
  "peeking_take_while",
+ "prettyplease",
  "proc-macro2",
  "quote",
  "regex",
  "rustc-hash",
  "shlex",
- "syn 1.0.109",
+ "syn 2.0.38",
  "which",
 ]
 
@@ -618,6 +630,16 @@ version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94"
 
+[[package]]
+name = "prettyplease"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d"
+dependencies = [
+ "proc-macro2",
+ "syn 2.0.38",
+]
+
 [[package]]
 name = "proc-macro-error"
 version = "1.0.4"
@@ -1341,6 +1363,15 @@ dependencies = [
  "zero",
 ]
 
+[[package]]
+name = "yansi-term"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fe5c30ade05e61656247b2e334a031dfd0cc466fadef865bdcdea8d537951bf1"
+dependencies = [
+ "winapi",
+]
+
 [[package]]
 name = "zero"
 version = "0.1.3"
diff --git a/Cargo.toml b/Cargo.toml
index 82b96f9..c80dccb 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -59,5 +59,5 @@ which = { version = "4.1", optional = true }
 globwalk = { version = "0.8", optional = true }
 tempfile = { version = "3", optional = true }
 ureq = { version = "2", optional = true }
-bindgen = { version = "0.63", optional = true }
+bindgen = { version = "0.65.1", optional = true, features = ["experimental"] }
 dep-cmake = { package = "cmake", version = "0.1", optional = true }
diff --git a/src/bindgen.rs b/src/bindgen.rs
index 05e0e8e..420dbd9 100644
--- a/src/bindgen.rs
+++ b/src/bindgen.rs
@@ -136,7 +136,7 @@ impl Factory {
         let builder = bindgen::Builder::default()
             .use_core()
             .layout_tests(false)
-            .rustfmt_bindings(false)
+            .formatter(bindgen::Formatter::None)
             .derive_default(true)
             .clang_arg("-D__bindgen")
             // Include directories provided by the build system

From 94722b0a660857289a580fd286ad90c73a3d0ada Mon Sep 17 00:00:00 2001
From: Gopa Kumar <gopakumarce@gmail.com>
Date: Wed, 14 Feb 2024 10:32:04 -0500
Subject: [PATCH 2/2] move to bindgen latest

---
 Cargo.lock | 43 +++++++++++++------------------------------
 Cargo.toml |  2 +-
 2 files changed, 14 insertions(+), 31 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e505830..b4d87bb 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -35,16 +35,6 @@ dependencies = [
  "as-slice",
 ]
 
-[[package]]
-name = "annotate-snippets"
-version = "0.9.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccaf7e9dfbb6ab22c82e473cd1a8a7bd313c19a5b7e40970f3d89ef5a5c9e81e"
-dependencies = [
- "unicode-width",
- "yansi-term",
-]
-
 [[package]]
 name = "ansi_term"
 version = "0.12.1"
@@ -106,18 +96,17 @@ checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9"
 
 [[package]]
 name = "bindgen"
-version = "0.65.1"
+version = "0.69.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfdf7b466f9a4903edc73f95d6d2bcd5baf8ae620638762244d3f60143643cc5"
+checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0"
 dependencies = [
- "annotate-snippets",
- "bitflags 1.3.2",
+ "bitflags 2.4.1",
  "cexpr",
  "clang-sys",
+ "itertools",
  "lazy_static",
  "lazycell",
  "log",
- "peeking_take_while",
  "prettyplease",
  "proc-macro2",
  "quote",
@@ -496,6 +485,15 @@ dependencies = [
  "hashbrown",
 ]
 
+[[package]]
+name = "itertools"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
+dependencies = [
+ "either",
+]
+
 [[package]]
 name = "itoa"
 version = "1.0.9"
@@ -618,12 +616,6 @@ version = "1.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
 
-[[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.0"
@@ -1363,15 +1355,6 @@ dependencies = [
  "zero",
 ]
 
-[[package]]
-name = "yansi-term"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe5c30ade05e61656247b2e334a031dfd0cc466fadef865bdcdea8d537951bf1"
-dependencies = [
- "winapi",
-]
-
 [[package]]
 name = "zero"
 version = "0.1.3"
diff --git a/Cargo.toml b/Cargo.toml
index c80dccb..dfc1428 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -59,5 +59,5 @@ which = { version = "4.1", optional = true }
 globwalk = { version = "0.8", optional = true }
 tempfile = { version = "3", optional = true }
 ureq = { version = "2", optional = true }
-bindgen = { version = "0.65.1", optional = true, features = ["experimental"] }
+bindgen = { version = "0.69.4", optional = true }
 dep-cmake = { package = "cmake", version = "0.1", optional = true }