GNOME.org
 

[niepce] rust: update cbindgen to 0.13.1

commit 2b8ba219c2f7578bc60ed55a3d5b88a95d6af67a
Author: Hubert Figuière <hub figuiere net>
Date:   Fri Feb 14 21:09:58 2020 -0500

    rust: update cbindgen to 0.13.1

 Cargo.lock                   | 58 +++++++++-----------------------------------
 Cargo.toml                   |  2 +-
 build.rs                     | 10 ++++++--
 crates/npc-engine/Cargo.toml |  2 +-
 crates/npc-engine/build.rs   |  6 ++++-
 crates/npc-fwk/Cargo.toml    |  2 +-
 crates/npc-fwk/build.rs      |  4 ++-
 7 files changed, 30 insertions(+), 54 deletions(-)
---
diff --git a/Cargo.lock b/Cargo.lock
index 233b739..6f35b0e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -121,19 +121,18 @@ dependencies = [
 
 [[package]]
 name = "cbindgen"
-version = "0.8.4"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index";
 dependencies = [
  "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 1.0.48 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)",
  "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "toml 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -588,7 +587,7 @@ name = "niepce_rust"
 version = "0.1.0"
 dependencies = [
  "cairo-rs 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cbindgen 0.8.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cbindgen 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "gdk 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "gdk-pixbuf 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "gdk-pixbuf-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -618,7 +617,7 @@ name = "npc-engine"
 version = "0.1.0"
 dependencies = [
  "bindgen 0.53.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "cbindgen 0.8.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cbindgen 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "exempi 2.5.0 (git+https://github.com/hfiguiere/exempi-rs.git?rev=53cfc05)",
  "gdk-pixbuf 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -636,7 +635,7 @@ name = "npc-fwk"
 version = "0.1.0"
 dependencies = [
  "cairo-rs 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cbindgen 0.8.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cbindgen 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "exempi 2.5.0 (git+https://github.com/hfiguiere/exempi-rs.git?rev=53cfc05)",
  "gdk 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -774,14 +773,6 @@ name = "proc-macro-nested"
 version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index";
 
-[[package]]
-name = "proc-macro2"
-version = "0.4.30"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-dependencies = [
- "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "proc-macro2"
 version = "1.0.8"
@@ -795,14 +786,6 @@ name = "quick-error"
 version = "1.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index";
 
-[[package]]
-name = "quote"
-version = "0.6.13"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-dependencies = [
- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "quote"
 version = "1.0.2"
@@ -985,16 +968,6 @@ name = "strsim"
 version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index";
 
-[[package]]
-name = "syn"
-version = "0.15.44"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-dependencies = [
- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "syn"
 version = "1.0.14"
@@ -1054,7 +1027,7 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.4.10"
+version = "0.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index";
 dependencies = [
  "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1070,11 +1043,6 @@ name = "unicode-width"
 version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index";
 
-[[package]]
-name = "unicode-xid"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-
 [[package]]
 name = "unicode-xid"
 version = "0.2.0"
@@ -1148,7 +1116,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index";
 "checksum c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = 
"214238caa1bf3a496ec3392968969cab8549f96ff30652c9e56885329315f6bb"
 "checksum cairo-rs 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = 
"0b528aca2ef1026235d0122495dbaee0b09479f77c51f6df8d9bb9cb1c6d6f87"
 "checksum cairo-sys-rs 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = 
"ff65ba02cac715be836f63429ab00a767d48336efc5497c5637afb53b4f14d63"
-"checksum cbindgen 0.8.4 (registry+https://github.com/rust-lang/crates.io-index)" = 
"7839b7fb54a0d3e89c83b7fca00b9ff499d9f7d6a273e3b3f5a03b41ac7dd27c"
+"checksum cbindgen 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)" = 
"2c955bd5e66e36a03612c877585d75219da64e3d9ae5f14d76c979ccb95de070"
 "checksum cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)" = 
"95e28fa049fda1c330bcf9d723be7663a899c4679724b34c81e9f5a326aab8cd"
 "checksum cexpr 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = 
"fce5b5fb86b0c57c20c834c1b412fd09c77c8a59b9473f86272709e78874cd1d"
 "checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = 
"4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
@@ -1211,10 +1179,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index";
 "checksum ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = 
"74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b"
 "checksum proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)" = 
"ecd45702f76d6d3c75a80564378ae228a85f0b59d2f3ed43c91b4a69eb2ebfc5"
 "checksum proc-macro-nested 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = 
"369a6ed065f249a159e06c45752c780bda2fb53c995718f9e484d08daa9eb42e"
-"checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = 
"cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759"
 "checksum proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)" = 
"3acb317c6ff86a4e579dfa00fc5e6cca91ecbb4e7eb2df0468805b674eb88548"
 "checksum quick-error 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = 
"a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
-"checksum quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = 
"6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1"
 "checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = 
"053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe"
 "checksum rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = 
"6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
 "checksum rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = 
"03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853"
@@ -1239,17 +1205,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index";
 "checksum slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = 
"c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
 "checksum smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = 
"f7b0758c52e15a8b5e3691eae6cc559f08eee9406e548a4477ba4e67770a82b6"
 "checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = 
"8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
-"checksum syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)" = 
"9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5"
 "checksum syn 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)" = 
"af6f3550d8dff9ef7dc34d384ac6f107e5d31c8f57d9f28e0081503f547ac8f5"
 "checksum tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = 
"7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"
 "checksum termcolor 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = 
"bb6bfa289a4d7c5766392812c0a1f4c1ba45afa1ad47803c11e1f407d846d75f"
 "checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = 
"d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
 "checksum thread_local 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = 
"d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14"
 "checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = 
"db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f"
-"checksum toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = 
"758664fc71a3a69038656bee8b6be6477d2a6c315a6b81f7081f591bffa4111f"
+"checksum toml 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = 
"ffc92d160b1eef40665be3a05630d003936a3bc7da7421277846c2613e92c71a"
 "checksum try_opt 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = 
"d30b71e7ba40551f9873f3ba9f4ee36f16015adf0962aba57caf403088370db1"
 "checksum unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = 
"caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479"
-"checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = 
"fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
 "checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = 
"826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"
 "checksum vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = 
"3fc439f2794e98976c88a2a2dafce96b930fe8010b0a256b3c2199a773933168"
 "checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = 
"05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a"
diff --git a/Cargo.toml b/Cargo.toml
index 8b7843d..f0ef49d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -23,7 +23,7 @@ npc-fwk = { path = "crates/npc-fwk" }
 npc-engine = { path = "crates/npc-engine" }
 
 [build-dependencies]
-cbindgen = { version = "=0.8.4" }
+cbindgen = { version = "0.13.1" }
 
 [lib]
 name = "niepce_rust"
diff --git a/build.rs b/build.rs
index 0536573..5877a7b 100644
--- a/build.rs
+++ b/build.rs
@@ -15,8 +15,15 @@ fn main() {
             .with_namespace("ffi")
             .with_language(cbindgen::Language::Cxx)
             .with_parse_deps(true)
-            .with_parse_exclude(&["exempi", "chrono", "multimap", "npc_engine"])
+            .with_parse_exclude(&[
+                "exempi", "chrono", "multimap", "glib", "clap", "winapi", "rusqlite", "nom",
+            ])
             .include_item("ColIndex")
+            .exclude_item("Managed")
+            .exclude_item("FileStatus")
+            .exclude_item("RgbColour")
+            .exclude_item("CUSTOM_START")
+            .exclude_item("INTERNAL_START")
             .exclude_item("GdkPixbuf")
             .exclude_item("GtkWindow")
             .exclude_item("GtkToolbar")
@@ -28,7 +35,6 @@ fn main() {
             .exclude_item("GtkCellRenderer")
             .exclude_item("GtkWidget")
             .exclude_item("GFileInfo")
-            .exclude_item("RgbColour")
             .with_crate(&crate_dir)
             .generate()
             .expect("Couldn't generate bindings")
diff --git a/crates/npc-engine/Cargo.toml b/crates/npc-engine/Cargo.toml
index be1e6e5..703388e 100644
--- a/crates/npc-engine/Cargo.toml
+++ b/crates/npc-engine/Cargo.toml
@@ -21,5 +21,5 @@ npc-fwk = { path = "../npc-fwk" }
 
 [build-dependencies]
 bindgen = "0.53.1"
-cbindgen = { version = "=0.8.4" }
+cbindgen = { version = "0.13.1" }
 pkg-config = "0.3.9"
diff --git a/crates/npc-engine/build.rs b/crates/npc-engine/build.rs
index 562974c..e35b4cd 100644
--- a/crates/npc-engine/build.rs
+++ b/crates/npc-engine/build.rs
@@ -67,8 +67,12 @@ fn main() {
             .with_namespace("ffi")
             .with_language(cbindgen::Language::Cxx)
             .with_parse_deps(true)
-            .with_parse_exclude(&["exempi", "chrono", "multimap"])
+            .with_parse_exclude(&[
+                "exempi", "chrono", "multimap", "clap", "nom", "winapi", "glib", "rusqlite",
+            ])
             .include_item("Managed")
+            .exclude_item("CUSTOM_START")
+            .exclude_item("INTERNAL_START")
             .exclude_item("GdkPixbuf")
             .exclude_item("GtkWindow")
             .exclude_item("GtkToolbar")
diff --git a/crates/npc-fwk/Cargo.toml b/crates/npc-fwk/Cargo.toml
index 55a5f7e..601582c 100644
--- a/crates/npc-fwk/Cargo.toml
+++ b/crates/npc-fwk/Cargo.toml
@@ -28,4 +28,4 @@ try_opt = "0.1.1"
 
 
 [build-dependencies]
-cbindgen = { version = "=0.8.4" }
+cbindgen = { version = "0.13.1" }
diff --git a/crates/npc-fwk/build.rs b/crates/npc-fwk/build.rs
index 2f11988..cdbb50c 100644
--- a/crates/npc-fwk/build.rs
+++ b/crates/npc-fwk/build.rs
@@ -15,7 +15,9 @@ fn main() {
             .with_namespace("ffi")
             .with_language(cbindgen::Language::Cxx)
             .with_parse_deps(true)
-            .with_parse_exclude(&["exempi", "chrono", "multimap"])
+            .with_parse_exclude(&["exempi", "chrono", "multimap", "glib", "clap", "winapi"])
+            .exclude_item("CUSTOM_START")
+            .exclude_item("INTERNAL_START")
             .exclude_item("GdkPixbuf")
             .exclude_item("GtkDrawingArea")
             .exclude_item("GtkWidget")
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]