diff --git a/Cargo.lock b/Cargo.lock index 76ea0d3..3f40995 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,50 +1,24 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -[[package]] -name = "aho-corasick" -version = "0.7.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "memchr 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "ansi_term" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "hermit-abi 0.1.19 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.151 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "bindgen" -version = "0.59.2" +version = "0.65.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "cexpr 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "clang-sys 1.6.1 (registry+https://github.com/rust-lang/crates.io-index)", - "clap 2.34.0 (registry+https://github.com/rust-lang/crates.io-index)", - "env_logger 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazycell 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.20 (registry+https://github.com/rust-lang/crates.io-index)", "peeking_take_while 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "prettyplease 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)", "proc-macro2 1.0.70 (registry+https://github.com/rust-lang/crates.io-index)", "quote 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.7.3 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-hash 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "shlex 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 2.0.41 (registry+https://github.com/rust-lang/crates.io-index)", "which 4.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -81,55 +55,16 @@ dependencies = [ "libloading 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "clap" -version = "2.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "ansi_term 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)", - "atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", - "bitflags 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", - "unicode-width 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", - "vec_map 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "either" version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -[[package]] -name = "env_logger" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", - "humantime 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.20 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 1.7.3 (registry+https://github.com/rust-lang/crates.io-index)", - "termcolor 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "glob" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "libc 0.2.151 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" - [[package]] name = "lazy_static" version = "1.4.0" @@ -153,7 +88,7 @@ version = "1.5.0" name = "libftdi1-sys" version = "1.1.2" dependencies = [ - "bindgen 0.59.2 (registry+https://github.com/rust-lang/crates.io-index)", + "bindgen 0.65.1 (registry+https://github.com/rust-lang/crates.io-index)", "cc 1.0.52 (registry+https://github.com/rust-lang/crates.io-index)", "cfg-if 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.151 (registry+https://github.com/rust-lang/crates.io-index)", @@ -222,6 +157,15 @@ name = "pkg-config" version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "prettyplease" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "proc-macro2 1.0.70 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 2.0.41 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "proc-macro2" version = "1.0.70" @@ -243,8 +187,6 @@ name = "regex" version = "1.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "aho-corasick 0.7.20 (registry+https://github.com/rust-lang/crates.io-index)", - "memchr 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "regex-syntax 0.6.29 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -264,24 +206,13 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] -name = "strsim" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "termcolor" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "winapi-util 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "textwrap" -version = "0.11.0" +name = "syn" +version = "2.0.41" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "unicode-width 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2 1.0.70 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)", + "unicode-ident 1.0.12 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -289,21 +220,11 @@ name = "unicode-ident" version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -[[package]] -name = "unicode-width" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" - [[package]] name = "vcpkg" version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -[[package]] -name = "vec_map" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" - [[package]] name = "which" version = "4.4.0" @@ -328,35 +249,20 @@ name = "winapi-i686-pc-windows-gnu" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -[[package]] -name = "winapi-util" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" [metadata] -"checksum aho-corasick 0.7.20 (registry+https://github.com/rust-lang/crates.io-index)" = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" -"checksum ansi_term 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" -"checksum atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -"checksum bindgen 0.59.2 (registry+https://github.com/rust-lang/crates.io-index)" = "2bd2a9a458e8f4304c52c43ebb0cfbd520289f8379a52e329a38afda99bf8eb8" +"checksum bindgen 0.65.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cfdf7b466f9a4903edc73f95d6d2bcd5baf8ae620638762244d3f60143643cc5" "checksum bitflags 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" "checksum cc 1.0.52 (registry+https://github.com/rust-lang/crates.io-index)" = "c3d87b23d6a92cd03af510a5ade527033f6aa6fa92161e2d5863a907d4c5e31d" "checksum cexpr 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" "checksum cfg-if 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" "checksum clang-sys 1.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f" -"checksum clap 2.34.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" "checksum either 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" -"checksum env_logger 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7" "checksum glob 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" -"checksum hermit-abi 0.1.19 (registry+https://github.com/rust-lang/crates.io-index)" = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -"checksum humantime 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" "checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" "checksum lazycell 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" "checksum libc 0.2.151 (registry+https://github.com/rust-lang/crates.io-index)" = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4" @@ -369,21 +275,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum once_cell 1.19.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" "checksum peeking_take_while 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" "checksum pkg-config 0.3.27 (registry+https://github.com/rust-lang/crates.io-index)" = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" +"checksum prettyplease 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)" = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d" "checksum proc-macro2 1.0.70 (registry+https://github.com/rust-lang/crates.io-index)" = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" "checksum quote 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)" = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" "checksum regex 1.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d" "checksum regex-syntax 0.6.29 (registry+https://github.com/rust-lang/crates.io-index)" = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" "checksum rustc-hash 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" "checksum shlex 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380" -"checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" -"checksum termcolor 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449" -"checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" +"checksum syn 2.0.41 (registry+https://github.com/rust-lang/crates.io-index)" = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269" "checksum unicode-ident 1.0.12 (registry+https://github.com/rust-lang/crates.io-index)" = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" -"checksum unicode-width 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" "checksum vcpkg 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)" = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" -"checksum vec_map 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" "checksum which 4.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269" "checksum winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" "checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" -"checksum winapi-util 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" "checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" diff --git a/Cargo.toml b/Cargo.toml index f364fff..7ce08e5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -44,7 +44,7 @@ pkg-config = "0.3.7" vcpkg = "0.2" [build-dependencies.bindgen] -version = "0.59" +version = "0.65.1" optional = true [workspace] diff --git a/build.rs b/build.rs index 6bbb595..13ae6fb 100644 --- a/build.rs +++ b/build.rs @@ -83,9 +83,11 @@ fn main() { fn bindings_builder() -> bindgen::Builder { bindgen::Builder::default() .header(header_path()) - .default_enum_style(bindgen::EnumVariation::NewType{ is_bitfield : false }) + .default_enum_style(bindgen::EnumVariation::NewType { + is_bitfield: false, + is_global: false, + }) .parse_callbacks(Box::new(Callbacks)) - .rustfmt_bindings(true) .allowlist_function("ftdi_.*") .allowlist_type("ftdi_.*") .generate_comments(false)