Merge branch 'upstream/master' with latest upstream commits.
Change-Id: I9858a6f66c86bc1976212d0acc0a841fda8472d5
diff --git a/.github/workflows/bindgen.yml b/.github/workflows/bindgen.yml
index 91efe98..7080352 100644
--- a/.github/workflows/bindgen.yml
+++ b/.github/workflows/bindgen.yml
@@ -42,11 +42,11 @@
profile: minimal
# MSRV below is documented in README.md, please update that if you
# change this.
- toolchain: 1.40.0
+ toolchain: 1.44.0
override: true
- name: Build with msrv
- run: rm Cargo.lock && cargo +1.40.0 build --lib
+ run: rm Cargo.lock && cargo +1.44.0 build --lib
quickchecking:
runs-on: ubuntu-latest
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 892a864..a5e8bea 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,119 +10,127 @@
- [Removed](#removed)
- [Fixed](#fixed-1)
- [Security](#security)
-- [0.58.0](#0580)
- - [Added](#added-1)
+- [0.59.1](#0591)
- [Fixed](#fixed-2)
+- [0.59.0](#0590)
+ - [Added](#added-1)
+ - [Fixed](#fixed-3)
- [Changed](#changed-1)
+- [0.58.1](#0581)
+ - [Added](#added-2)
+- [0.58.0](#0580)
+ - [Added](#added-3)
+ - [Fixed](#fixed-4)
+ - [Changed](#changed-2)
- [Deprecated](#deprecated-1)
- [Removed](#removed-1)
- - [Fixed](#fixed-3)
+ - [Fixed](#fixed-5)
- [Security](#security-1)
- [0.57.0](#0570)
- - [Added](#added-2)
- - [Fixed](#fixed-4)
-- [0.56.0](#0560)
- - [Added](#added-3)
- - [Changed](#changed-2)
- - [Fixed](#fixed-5)
-- [0.55.1](#0551)
- - [Fixed](#fixed-6)
-- [0.55.0](#0550)
- - [Removed](#removed-2)
- [Added](#added-4)
+ - [Fixed](#fixed-6)
+- [0.56.0](#0560)
+ - [Added](#added-5)
- [Changed](#changed-3)
- [Fixed](#fixed-7)
-- [0.54.1](#0541)
- - [Added](#added-5)
- - [Changed](#changed-4)
+- [0.55.1](#0551)
- [Fixed](#fixed-8)
-- [0.54.0](#0540)
+- [0.55.0](#0550)
+ - [Removed](#removed-2)
- [Added](#added-6)
- - [Changed](#changed-5)
+ - [Changed](#changed-4)
- [Fixed](#fixed-9)
-- [0.53.3](#0533)
+- [0.54.1](#0541)
- [Added](#added-7)
+ - [Changed](#changed-5)
- [Fixed](#fixed-10)
-- [0.53.2](#0532)
- - [Changed](#changed-6)
-- [0.53.1](#0531)
+- [0.54.0](#0540)
- [Added](#added-8)
-- [0.53.0](#0530)
- - [Added](#added-9)
- - [Changed](#changed-7)
+ - [Changed](#changed-6)
- [Fixed](#fixed-11)
-- [0.52.0](#0520)
- - [Added](#added-10)
- - [Changed](#changed-8)
+- [0.53.3](#0533)
+ - [Added](#added-9)
- [Fixed](#fixed-12)
-- [0.51.1](#0511)
- - [Fixed](#fixed-13)
- - [Changed](#changed-9)
-- [0.51.0](#0510)
- - [Fixed](#fixed-14)
- - [Changed](#changed-10)
+- [0.53.2](#0532)
+ - [Changed](#changed-7)
+- [0.53.1](#0531)
+ - [Added](#added-10)
+- [0.53.0](#0530)
- [Added](#added-11)
-- [0.50.0](#0500)
+ - [Changed](#changed-8)
+ - [Fixed](#fixed-13)
+- [0.52.0](#0520)
- [Added](#added-12)
-- [0.49.3](#0493)
- - [Added](#added-13)
-- [0.49.2](#0492)
- - [Changed](#changed-11)
-- [0.49.1](#0491)
+ - [Changed](#changed-9)
+ - [Fixed](#fixed-14)
+- [0.51.1](#0511)
- [Fixed](#fixed-15)
- - [Changed](#changed-12)
-- [0.49.0](#0490)
- - [Added](#added-14)
+ - [Changed](#changed-10)
+- [0.51.0](#0510)
- [Fixed](#fixed-16)
- - [Changed](#changed-13)
-- [0.48.1](#0481)
- - [Fixed](#fixed-17)
-- [0.48.0](#0480)
- - [Changed](#changed-14)
- - [Fixed](#fixed-18)
-- [0.47.4](#0474)
+ - [Changed](#changed-11)
+ - [Added](#added-13)
+- [0.50.0](#0500)
+ - [Added](#added-14)
+- [0.49.3](#0493)
- [Added](#added-15)
-- [0.47.3](#0473)
- - [Changed](#changed-15)
-- [0.47.2](#0472)
- - [Fixed](#fixed-19)
-- [0.47.1](#0471)
- - [Changed](#changed-16)
- - [Fixed](#fixed-20)
-- [0.47.0](#0470)
- - [Changed](#changed-17)
- - [Fixed](#fixed-21)
-- [0.33.1 .. 0.46.0](#0331--0460)
+- [0.49.2](#0492)
+ - [Changed](#changed-12)
+- [0.49.1](#0491)
+ - [Fixed](#fixed-17)
+ - [Changed](#changed-13)
+- [0.49.0](#0490)
- [Added](#added-16)
- - [Removed](#removed-3)
- - [Changed](#changed-18)
+ - [Fixed](#fixed-18)
+ - [Changed](#changed-14)
+- [0.48.1](#0481)
+ - [Fixed](#fixed-19)
+- [0.48.0](#0480)
+ - [Changed](#changed-15)
+ - [Fixed](#fixed-20)
+- [0.47.4](#0474)
+ - [Added](#added-17)
+- [0.47.3](#0473)
+ - [Changed](#changed-16)
+- [0.47.2](#0472)
+ - [Fixed](#fixed-21)
+- [0.47.1](#0471)
+ - [Changed](#changed-17)
- [Fixed](#fixed-22)
-- [0.33.1](#0331)
+- [0.47.0](#0470)
+ - [Changed](#changed-18)
- [Fixed](#fixed-23)
+- [0.33.1 .. 0.46.0](#0331--0460)
+ - [Added](#added-18)
+ - [Removed](#removed-3)
+ - [Changed](#changed-19)
+ - [Fixed](#fixed-24)
+- [0.33.1](#0331)
+ - [Fixed](#fixed-25)
- [0.33.0](#0330)
- [0.32.2](#0322)
- - [Fixed](#fixed-24)
-- [0.32.1](#0321)
- - [Fixed](#fixed-25)
-- [0.32.0](#0320)
- - [Added](#added-17)
- - [Changed](#changed-19)
- [Fixed](#fixed-26)
-- [0.31.0](#0310)
- - [Added](#added-18)
+- [0.32.1](#0321)
+ - [Fixed](#fixed-27)
+- [0.32.0](#0320)
+ - [Added](#added-19)
- [Changed](#changed-20)
+ - [Fixed](#fixed-28)
+- [0.31.0](#0310)
+ - [Added](#added-20)
+ - [Changed](#changed-21)
- [Deprecated](#deprecated-2)
- [Removed](#removed-4)
- - [Fixed](#fixed-27)
-- [0.30.0](#0300)
- - [Added](#added-19)
- - [Changed](#changed-21)
- - [Deprecated](#deprecated-3)
- - [Fixed](#fixed-28)
-- [0.29.0](#0290)
- - [Added](#added-20)
- - [Changed](#changed-22)
- [Fixed](#fixed-29)
+- [0.30.0](#0300)
+ - [Added](#added-21)
+ - [Changed](#changed-22)
+ - [Deprecated](#deprecated-3)
+ - [Fixed](#fixed-30)
+- [0.29.0](#0290)
+ - [Added](#added-22)
+ - [Changed](#changed-23)
+ - [Fixed](#fixed-31)
<!-- END doctoc generated TOC please keep comment here to allow auto update -->
@@ -144,6 +152,38 @@
## Security
+# 0.59.1
+
+Released 2021/07/26
+
+## Fixed
+
+ * Fixed incorrect bitfield constructors generated for very large bitfields (#2082).
+
+# 0.59.0
+
+Released 2021/07/20
+
+## Added
+
+ * Support emitting Makefile-syntax depfiles (#2026)
+ * Add a C naming option (#2045)
+ * Allow explicit padding (#2060)
+ * Add custom derives callback (#2059)
+ * Let Rust derive everything but Default for large arrays in 1.47 and later (#2070).
+
+## Fixed
+
+ * Constants now have docstrings (#2027)
+ * Don't generate bindings for deleted member functions. (#2044)
+ * Zero out padding in custom Default trait implementations (#2051)
+ * Identify forward declarations in params. (#2052)
+ * Add env var EXTRA_CLANG_ARGS_<target>. (#2031)
+
+## Changed
+
+ * cexpr and nom have been updated, new msrv is 1.44 (#2073).
+
# 0.58.1
Released 2021/04/06
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index d533b06..8a9f868 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -100,7 +100,7 @@
```
$ rustup update nightly
-$ rustup run nightly cargo install -f rustfmt-nightly
+$ rustup component add rustfmt --toolchain nightly
```
Note: running `cargo test` from the root directory of `bindgen`'s repository does not
diff --git a/Cargo.lock b/Cargo.lock
index 443201e..06dae40 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -33,7 +33,7 @@
[[package]]
name = "bindgen"
-version = "0.58.1"
+version = "0.59.1"
dependencies = [
"bitflags",
"cexpr",
@@ -61,19 +61,25 @@
checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
[[package]]
-name = "cexpr"
-version = "0.4.0"
+name = "bitvec"
+version = "0.19.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4aedb84272dbe89af497cf81375129abda4fc0a9e7c5d317498c15cc30c0d27"
+checksum = "8942c8d352ae1838c9dda0b0ca2ab657696ef2232a20147cf1b30ae1a9cb4321"
dependencies = [
- "nom",
+ "funty",
+ "radium",
+ "tap",
+ "wyz",
]
[[package]]
-name = "cfg-if"
-version = "0.1.10"
+name = "cexpr"
+version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
+checksum = "db507a7679252d2276ed0dd8113c6875ec56d3089f9225b2b42c30cc1f8e5c89"
+dependencies = [
+ "nom",
+]
[[package]]
name = "cfg-if"
@@ -83,9 +89,9 @@
[[package]]
name = "clang-sys"
-version = "1.0.3"
+version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0659001ab56b791be01d4b729c44376edc6718cf389a502e579b77b758f3296c"
+checksum = "853eda514c284c2287f4bf20ae614f8781f40a81d32ecda6e91449304dfe077c"
dependencies = [
"glob",
"libc",
@@ -114,10 +120,16 @@
checksum = "0e25ea47919b1560c4e3b7fe0aaab9becf5b84a10325ddf7db0f0ba5e1026499"
[[package]]
-name = "env_logger"
-version = "0.8.1"
+name = "either"
+version = "1.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54532e3223c5af90a6a757c90b5c5521564b07e5e7a958681bcd2afad421cdcd"
+checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
+
+[[package]]
+name = "env_logger"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b2cf0344971ee6c64c31be0d530793fba457d322dfec2810c453d0ef228f9c3"
dependencies = [
"atty",
"humantime",
@@ -127,12 +139,18 @@
]
[[package]]
-name = "getrandom"
-version = "0.2.2"
+name = "funty"
+version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8"
+checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7"
+
+[[package]]
+name = "getrandom"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753"
dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
"libc",
"wasi",
]
@@ -145,18 +163,18 @@
[[package]]
name = "hermit-abi"
-version = "0.1.17"
+version = "0.1.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aca5565f760fb5b220e499d72710ed156fdb74e631659e99377d9ebfbd13ae8"
+checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
dependencies = [
"libc",
]
[[package]]
name = "humantime"
-version = "2.0.1"
+version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c1ad908cc71012b7bea4d0c53ba96a8cba9962f048fa68d143376143d863b7a"
+checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
[[package]]
name = "lazy_static"
@@ -172,27 +190,27 @@
[[package]]
name = "libc"
-version = "0.2.80"
+version = "0.2.98"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d58d1b70b004888f764dfbf6a26a3b0342a1632d33968e4a179d8011c760614"
+checksum = "320cfe77175da3a483efed4bc0adc1968ca050b098ce4f2f1c13a56626128790"
[[package]]
name = "libloading"
-version = "0.6.5"
+version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1090080fe06ec2648d0da3881d9453d97e71a45f00eb179af7fdd7e3f686fdb0"
+checksum = "6f84d96438c15fcd6c3f244c8fce01d1e2b9c6b5623e9c711dc9286d8fc92d6a"
dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
"winapi",
]
[[package]]
name = "log"
-version = "0.4.11"
+version = "0.4.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b"
+checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710"
dependencies = [
- "cfg-if 0.1.10",
+ "cfg-if",
]
[[package]]
@@ -203,10 +221,12 @@
[[package]]
name = "nom"
-version = "5.1.2"
+version = "6.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af"
+checksum = "9c5c51b9083a3c620fa67a2a635d1ce7d95b897e957d6b28ff9a5da960a103a6"
dependencies = [
+ "bitvec",
+ "funty",
"memchr",
"version_check",
]
@@ -225,27 +245,33 @@
[[package]]
name = "proc-macro2"
-version = "1.0.24"
+version = "1.0.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71"
+checksum = "5c7ed8b8c7b886ea3ed7dde405212185f423ab44682667c8c6dd14aa1d9f6612"
dependencies = [
"unicode-xid",
]
[[package]]
name = "quote"
-version = "1.0.7"
+version = "1.0.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37"
+checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7"
dependencies = [
"proc-macro2",
]
[[package]]
-name = "rand"
-version = "0.8.3"
+name = "radium"
+version = "0.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ef9e7e66b4468674bfcb0c81af8b7fa0bb154fa9f28eb840da5c447baeb8d7e"
+checksum = "941ba9d78d8e2f7ce474c015eea4d9c6d25b6a3327f9832ee29a4de27f91bbb8"
+
+[[package]]
+name = "rand"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8"
dependencies = [
"libc",
"rand_chacha",
@@ -255,9 +281,9 @@
[[package]]
name = "rand_chacha"
-version = "0.3.0"
+version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e12735cf05c9e10bf21534da50a147b924d555dc7a547c42e6bb2d5b6017ae0d"
+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
dependencies = [
"ppv-lite86",
"rand_core",
@@ -265,48 +291,47 @@
[[package]]
name = "rand_core"
-version = "0.6.2"
+version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34cf66eb183df1c5876e2dcf6b13d57340741e8dc255b48e40a26de954d06ae7"
+checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"
dependencies = [
"getrandom",
]
[[package]]
name = "rand_hc"
-version = "0.3.0"
+version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3190ef7066a446f2e7f42e239d161e905420ccab01eb967c9eb27d21b2322a73"
+checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7"
dependencies = [
"rand_core",
]
[[package]]
name = "redox_syscall"
-version = "0.2.5"
+version = "0.2.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94341e4e44e24f6b591b59e47a8a027df12e008d73fd5672dbea9cc22f4507d9"
+checksum = "5ab49abadf3f9e1c4bc499e8845e152ad87d2ad2d30371841171169e9d75feee"
dependencies = [
"bitflags",
]
[[package]]
name = "regex"
-version = "1.4.2"
+version = "1.4.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38cf2c13ed4745de91a5eb834e11c00bcc3709e773173b2ce4c56c9fbde04b9c"
+checksum = "2a26af418b574bd56588335b3a3659a65725d4e636eb1016c2f9e3b38c7cc759"
dependencies = [
"aho-corasick",
"memchr",
"regex-syntax",
- "thread_local",
]
[[package]]
name = "regex-syntax"
-version = "0.6.21"
+version = "0.6.25"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b181ba2dcf07aaccad5448e8ead58db5b742cf85dfe035e2227f137a539a189"
+checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"
[[package]]
name = "remove_dir_all"
@@ -336,12 +361,18 @@
checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
[[package]]
+name = "tap"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
+
+[[package]]
name = "tempfile"
version = "3.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22"
dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
"libc",
"rand",
"redox_syscall",
@@ -351,9 +382,9 @@
[[package]]
name = "termcolor"
-version = "1.1.0"
+version = "1.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb6bfa289a4d7c5766392812c0a1f4c1ba45afa1ad47803c11e1f407d846d75f"
+checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4"
dependencies = [
"winapi-util",
]
@@ -368,15 +399,6 @@
]
[[package]]
-name = "thread_local"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14"
-dependencies = [
- "lazy_static",
-]
-
-[[package]]
name = "unicode-width"
version = "0.1.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -384,9 +406,9 @@
[[package]]
name = "unicode-xid"
-version = "0.2.1"
+version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"
+checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"
[[package]]
name = "vec_map"
@@ -396,9 +418,9 @@
[[package]]
name = "version_check"
-version = "0.9.2"
+version = "0.9.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed"
+checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe"
[[package]]
name = "wasi"
@@ -408,10 +430,12 @@
[[package]]
name = "which"
-version = "3.1.1"
+version = "4.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d011071ae14a2f6671d0b74080ae0cd8ebf3a6f8c9589a2cd45f23126fe29724"
+checksum = "7cc009ab82a2afc94b9e467ab4214aee9cad1356cd9191264203d7d72006e00d"
dependencies = [
+ "either",
+ "lazy_static",
"libc",
]
@@ -445,3 +469,9 @@
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+[[package]]
+name = "wyz"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214"
diff --git a/Cargo.toml b/Cargo.toml
index 6140407..0b04cda 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -14,7 +14,7 @@
repository = "https://github.com/rust-lang/rust-bindgen"
documentation = "https://docs.rs/bindgen"
homepage = "https://rust-lang.github.io/rust-bindgen/"
-version = "0.58.1"
+version = "0.59.1"
edition = "2018"
build = "build.rs"
@@ -47,7 +47,7 @@
[dependencies]
bitflags = "1.0.3"
-cexpr = "0.4"
+cexpr = "0.5"
# This kinda sucks: https://github.com/rust-lang/cargo/issues/1982
clap = { version = "2", optional = true }
clang-sys = { version = "1", features = ["clang_6_0"] }
@@ -56,16 +56,14 @@
peeking_take_while = "0.1.2"
quote = { version = "1", default-features = false }
regex = { version = "1.0", default-features = false , features = [ "std", "unicode"]}
-which = { version = "3.0", optional = true, default-features = false }
+which = { version = "4.2.1", optional = true, default-features = false }
shlex = "1"
rustc-hash = "1.0.1"
-# New validation in 0.3.6 breaks bindgen-integration:
-# https://github.com/alexcrichton/proc-macro2/commit/489c642.
proc-macro2 = { version = "1", default-features = false }
[dependencies.env_logger]
optional = true
-version = "0.8"
+version = "0.9.0"
[dependencies.log]
optional = true
diff --git a/README.md b/README.md
index 60e064f..00f66eb 100644
--- a/README.md
+++ b/README.md
@@ -39,7 +39,7 @@
## MSRV
-The minimum supported Rust version is **1.40**.
+The minimum supported Rust version is **1.44**.
No MSRV bump policy has been established yet, so MSRV may increase in any release.
diff --git a/bindgen-integration/build.rs b/bindgen-integration/build.rs
index b28dcee..fa0246c 100644
--- a/bindgen-integration/build.rs
+++ b/bindgen-integration/build.rs
@@ -119,6 +119,17 @@
}
}
}
+
+ // Test the "custom derives" capability by adding `PartialEq` to the `Test` struct.
+ fn add_derives(&self, name: &str) -> Vec<String> {
+ if name == "Test" {
+ vec![
+ "PartialEq".into(),
+ ]
+ } else {
+ vec![]
+ }
+ }
}
impl Drop for MacroCallback {
diff --git a/bindgen-integration/src/lib.rs b/bindgen-integration/src/lib.rs
index 4b288af..f56e725 100755
--- a/bindgen-integration/src/lib.rs
+++ b/bindgen-integration/src/lib.rs
@@ -267,3 +267,12 @@
assert_eq!([1., 2., 3., 4.], coord.v)
}
}
+
+#[test]
+fn test_custom_derive() {
+ // The `add_derives` callback should have added `#[derive(PartialEq)]`
+ // to the `Test` struct. If it didn't, this will fail to compile.
+ let test1 = unsafe { bindings::Test::new(5) };
+ let test2 = unsafe { bindings::Test::new(6) };
+ assert_ne!(test1, test2);
+}
diff --git a/book/src/SUMMARY.md b/book/src/SUMMARY.md
index 65ed087..f9cc869 100644
--- a/book/src/SUMMARY.md
+++ b/book/src/SUMMARY.md
@@ -19,6 +19,7 @@
- [Preventing the Derivation of `Copy` and `Clone`](./nocopy.md)
- [Preventing the Derivation of `Debug`](./nodebug.md)
- [Preventing the Derivation of `Default`](./nodefault.md)
+ - [Annotating types with `#[must-use]`](./must-use-types.md)
- [Generating Bindings to C++](./cpp.md)
- [Generating Bindings to Objective-c](./objc.md)
- [Using Unions](./using-unions.md)
diff --git a/book/src/allowlisting.md b/book/src/allowlisting.md
index 8c57eaf..2e28d80 100644
--- a/book/src/allowlisting.md
+++ b/book/src/allowlisting.md
@@ -16,9 +16,9 @@
### Library
-* [`bindgen::Builder::allowlist_type`](https://docs.rs/bindgen/0.23.1/bindgen/struct.Builder.html#method.allowlist_type)
-* [`bindgen::Builder::allowlist_function`](https://docs.rs/bindgen/0.23.1/bindgen/struct.Builder.html#method.allowlist_function)
-* [`bindgen::Builder::allowlist_var`](https://docs.rs/bindgen/0.23.1/bindgen/struct.Builder.html#method.allowlist_var)
+* [`bindgen::Builder::allowlist_type`](https://docs.rs/bindgen/latest/bindgen/struct.Builder.html#method.allowlist_type)
+* [`bindgen::Builder::allowlist_function`](https://docs.rs/bindgen/latest/bindgen/struct.Builder.html#method.allowlist_function)
+* [`bindgen::Builder::allowlist_var`](https://docs.rs/bindgen/latest/bindgen/struct.Builder.html#method.allowlist_var)
### Command Line
diff --git a/book/src/blocklisting.md b/book/src/blocklisting.md
index 1d60861..5c082dd 100644
--- a/book/src/blocklisting.md
+++ b/book/src/blocklisting.md
@@ -15,7 +15,7 @@
### Library
-* [`bindgen::Builder::blocklist_type`](https://docs.rs/bindgen/0.31.3/bindgen/struct.Builder.html#method.blocklist_type)
+* [`bindgen::Builder::blocklist_type`](https://docs.rs/bindgen/latest/bindgen/struct.Builder.html#method.blocklist_type)
### Command Line
diff --git a/book/src/must-use-types.md b/book/src/must-use-types.md
new file mode 100644
index 0000000..490339c
--- /dev/null
+++ b/book/src/must-use-types.md
@@ -0,0 +1,27 @@
+# Annotating types with `#[must-use]`
+
+`bindgen` can be instructed to annotate certain types with
+[`#[must_use]`](https://doc.rust-lang.org/reference/attributes/diagnostics.html#the-must_use-attribute).
+
+Some libraries have a common error type, returned by lots of their functions,
+which needs to be checked after every call. In these cases it's useful to add `#[must_use]` to this type, so the Rust
+compiler emits a warning when the check is missing.
+### Library
+
+* [`bindgen::Builder::must_use_type`](https://docs.rs/bindgen/latest/bindgen/struct.Builder.html#method.must_use_type)
+
+### Command Line
+
+* `--must-use-type <regex>`
+
+### Annotations
+
+```c
+/** <div rustbindgen mustusetype></div> */
+struct ErrorType {
+ // ...
+};
+
+...
+```
+
diff --git a/book/src/nocopy.md b/book/src/nocopy.md
index ec21f3a..8a637a5 100644
--- a/book/src/nocopy.md
+++ b/book/src/nocopy.md
@@ -8,7 +8,7 @@
### Library
-* [`bindgen::Builder::no_copy`](https://docs.rs/bindgen/0.23.1/bindgen/struct.Builder.html#method.no_copy)
+* [`bindgen::Builder::no_copy`](https://docs.rs/bindgen/latest/bindgen/struct.Builder.html#method.no_copy)
### Command Line
diff --git a/book/src/nodebug.md b/book/src/nodebug.md
index 251b792..c412a7d 100644
--- a/book/src/nodebug.md
+++ b/book/src/nodebug.md
@@ -7,7 +7,7 @@
### Library
-* [`bindgen::Builder::no_debug`](https://docs.rs/bindgen/0.54.2/bindgen/struct.Builder.html#method.no_debug)
+* [`bindgen::Builder::no_debug`](https://docs.rs/bindgen/latest/bindgen/struct.Builder.html#method.no_debug)
### Command Line
diff --git a/book/src/opaque.md b/book/src/opaque.md
index e1bf600..ad15056 100644
--- a/book/src/opaque.md
+++ b/book/src/opaque.md
@@ -10,7 +10,7 @@
### Library
-* [`bindgen::Builder::opaque_type`](https://docs.rs/bindgen/0.23.1/bindgen/struct.Builder.html#method.opaque_type)
+* [`bindgen::Builder::opaque_type`](https://docs.rs/bindgen/latest/bindgen/struct.Builder.html#method.opaque_type)
### Command Line
diff --git a/book/src/using-unions.md b/book/src/using-unions.md
index 9a0cc3e..9e8e9b9 100644
--- a/book/src/using-unions.md
+++ b/book/src/using-unions.md
@@ -35,8 +35,8 @@
### Library
-* [`bindgen::Builder::rust_target()`](https://docs.rs/bindgen/0.29.0/bindgen/struct.Builder.html#method.rust_target) <!-- Update when live -->
-* [`bindgen::Builder::derive_default()`](https://docs.rs/bindgen/0.29.0/bindgen/struct.Builder.html#method.derive_default)
+* [`bindgen::Builder::rust_target()`](https://docs.rs/bindgen/latest/bindgen/struct.Builder.html#method.rust_target) <!-- Update when live -->
+* [`bindgen::Builder::derive_default()`](https://docs.rs/bindgen/latest/bindgen/struct.Builder.html#method.derive_default)
### Command Line
diff --git a/src/callbacks.rs b/src/callbacks.rs
index e288af4..9b34544 100644
--- a/src/callbacks.rs
+++ b/src/callbacks.rs
@@ -95,4 +95,12 @@
) -> Option<ImplementsTrait> {
None
}
+
+ /// Provide a list of custom derive attributes.
+ ///
+ /// If no additional attributes are wanted, this function should return an
+ /// empty `Vec`.
+ fn add_derives(&self, _name: &str) -> Vec<String> {
+ vec![]
+ }
}
diff --git a/src/clang.rs b/src/clang.rs
index 96f7725..db6467e 100644
--- a/src/clang.rs
+++ b/src/clang.rs
@@ -241,7 +241,7 @@
self.x.kind
}
- /// Returns true is the cursor is a definition
+ /// Returns true if the cursor is a definition
pub fn is_definition(&self) -> bool {
unsafe { clang_isCursorDefinition(self.x) != 0 }
}
diff --git a/src/codegen/impl_debug.rs b/src/codegen/impl_debug.rs
index b8fdd0d..661711e 100644
--- a/src/codegen/impl_debug.rs
+++ b/src/codegen/impl_debug.rs
@@ -181,7 +181,9 @@
format!("{}: Array with length {}", name, len),
vec![],
))
- } else if len < RUST_DERIVE_IN_ARRAY_LIMIT {
+ } else if len < RUST_DERIVE_IN_ARRAY_LIMIT ||
+ ctx.options().rust_features().larger_arrays
+ {
// The simple case
debug_print(name, quote! { #name_ident })
} else {
diff --git a/src/codegen/impl_partialeq.rs b/src/codegen/impl_partialeq.rs
index 5f2600e..5a1ba3f 100644
--- a/src/codegen/impl_partialeq.rs
+++ b/src/codegen/impl_partialeq.rs
@@ -114,7 +114,9 @@
}
TypeKind::Array(_, len) => {
- if len <= RUST_DERIVE_IN_ARRAY_LIMIT {
+ if len <= RUST_DERIVE_IN_ARRAY_LIMIT ||
+ ctx.options().rust_features().larger_arrays
+ {
quote_equals(name_ident)
} else {
quote! {
diff --git a/src/codegen/mod.rs b/src/codegen/mod.rs
index 1a702b0..8858377 100644
--- a/src/codegen/mod.rs
+++ b/src/codegen/mod.rs
@@ -1502,7 +1502,10 @@
let mut ctor_impl = quote! {};
// We cannot generate any constructor if the underlying storage can't
- // implement AsRef<[u8]> / AsMut<[u8]> / etc.
+ // implement AsRef<[u8]> / AsMut<[u8]> / etc, or can't derive Default.
+ //
+ // We don't check `larger_arrays` here because Default does still have
+ // the 32 items limitation.
let mut generate_ctor = layout.size <= RUST_DERIVE_IN_ARRAY_LIMIT;
let mut access_spec = !fields_should_be_private;
@@ -1512,7 +1515,9 @@
continue;
}
- if layout.size > RUST_DERIVE_IN_ARRAY_LIMIT {
+ if layout.size > RUST_DERIVE_IN_ARRAY_LIMIT &&
+ !ctx.options().rust_features().larger_arrays
+ {
continue;
}
@@ -1797,6 +1802,14 @@
(),
);
}
+ // Check whether an explicit padding field is needed
+ // at the end.
+ if let Some(comp_layout) = layout {
+ fields.extend(
+ struct_layout
+ .add_tail_padding(&canonical_name, comp_layout),
+ );
+ }
}
if is_opaque {
@@ -1997,10 +2010,24 @@
let mut derives: Vec<_> = derivable_traits.into();
derives.extend(item.annotations().derives().iter().map(String::as_str));
+ // The custom derives callback may return a list of derive attributes;
+ // add them to the end of the list.
+ let custom_derives;
+ if let Some(cb) = &ctx.options().parse_callbacks {
+ custom_derives = cb.add_derives(&canonical_name);
+ // In most cases this will be a no-op, since custom_derives will be empty.
+ derives.extend(custom_derives.iter().map(|s| s.as_str()));
+ };
+
if !derives.is_empty() {
attributes.push(attributes::derives(&derives))
}
+ if item.annotations().must_use_type() || ctx.must_use_type_by_name(item)
+ {
+ attributes.push(attributes::must_use());
+ }
+
let mut tokens = if is_union && struct_layout.is_rust_union() {
quote! {
#( #attributes )*
@@ -2196,9 +2223,32 @@
if needs_default_impl {
let prefix = ctx.trait_prefix();
+ let body = if ctx.options().rust_features().maybe_uninit {
+ quote! {
+ let mut s = ::#prefix::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::#prefix::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
+ }
+ } else {
+ quote! {
+ unsafe {
+ let mut s: Self = ::#prefix::mem::uninitialized();
+ ::#prefix::ptr::write_bytes(&mut s, 0, 1);
+ s
+ }
+ }
+ };
+ // Note we use `ptr::write_bytes()` instead of `mem::zeroed()` because the latter does
+ // not necessarily ensure padding bytes are zeroed. Some C libraries are sensitive to
+ // non-zero padding bytes, especially when forwards/backwards compatability is
+ // involved.
result.push(quote! {
impl #generics Default for #ty_for_impl {
- fn default() -> Self { unsafe { ::#prefix::mem::zeroed() } }
+ fn default() -> Self {
+ #body
+ }
}
});
}
@@ -2953,18 +3003,33 @@
attrs.push(attributes::doc(comment));
}
+ if item.annotations().must_use_type() || ctx.must_use_type_by_name(item)
+ {
+ attrs.push(attributes::must_use());
+ }
+
if !variation.is_const() {
let mut derives = derives_of_item(item, ctx);
- // For backwards compat, enums always derive Clone/Eq/PartialEq/Hash, even
+ // For backwards compat, enums always derive Debug/Clone/Eq/PartialEq/Hash, even
// if we don't generate those by default.
+ if !item.annotations().disallow_debug() {
+ derives.insert(DerivableTraits::DEBUG);
+ }
+ if !item.annotations().disallow_copy() {
+ derives.insert(DerivableTraits::COPY);
+ }
derives.insert(
DerivableTraits::CLONE |
- DerivableTraits::COPY |
DerivableTraits::HASH |
DerivableTraits::PARTIAL_EQ |
DerivableTraits::EQ,
);
- let derives: Vec<_> = derives.into();
+ let mut derives: Vec<_> = derives.into();
+ for derive in item.annotations().derives().iter() {
+ if !derives.contains(&derive.as_str()) {
+ derives.push(&derive);
+ }
+ }
attrs.push(attributes::derives(&derives));
}
diff --git a/src/codegen/struct_layout.rs b/src/codegen/struct_layout.rs
index 2e4b973..1c6b977 100644
--- a/src/codegen/struct_layout.rs
+++ b/src/codegen/struct_layout.rs
@@ -217,8 +217,11 @@
let padding_layout = if self.is_packed || is_union {
None
} else {
+ let force_padding = self.ctx.options().force_explicit_padding;
+
// Otherwise the padding is useless.
- let need_padding = padding_bytes >= field_layout.align ||
+ let need_padding = force_padding ||
+ padding_bytes >= field_layout.align ||
field_layout.align > MAX_GUARANTEED_ALIGN;
debug!(
@@ -236,11 +239,14 @@
field_layout
);
+ let padding_align = if force_padding {
+ 1
+ } else {
+ cmp::min(field_layout.align, MAX_GUARANTEED_ALIGN)
+ };
+
if need_padding && padding_bytes != 0 {
- Some(Layout::new(
- padding_bytes,
- cmp::min(field_layout.align, MAX_GUARANTEED_ALIGN),
- ))
+ Some(Layout::new(padding_bytes, padding_align))
} else {
None
}
@@ -262,6 +268,32 @@
padding_layout.map(|layout| self.padding_field(layout))
}
+ pub fn add_tail_padding(
+ &mut self,
+ comp_name: &str,
+ comp_layout: Layout,
+ ) -> Option<proc_macro2::TokenStream> {
+ // Only emit an padding field at the end of a struct if the
+ // user configures explicit padding.
+ if !self.ctx.options().force_explicit_padding {
+ return None;
+ }
+
+ if self.latest_offset == comp_layout.size {
+ // This struct does not contain tail padding.
+ return None;
+ }
+
+ trace!(
+ "need a tail padding field for {}: offset {} -> size {}",
+ comp_name,
+ self.latest_offset,
+ comp_layout.size
+ );
+ let size = comp_layout.size - self.latest_offset;
+ Some(self.padding_field(Layout::new(size, 0)))
+ }
+
pub fn pad_struct(
&mut self,
layout: Layout,
diff --git a/src/features.rs b/src/features.rs
index 4ec9dee..99b789e 100644
--- a/src/features.rs
+++ b/src/features.rs
@@ -123,6 +123,9 @@
/// Rust stable 1.40
/// * `non_exhaustive` enums/structs ([Tracking issue](https://github.com/rust-lang/rust/issues/44109))
=> Stable_1_40 => 1.40;
+ /// Rust stable 1.47
+ /// * `larger_arrays` ([Tracking issue](https://github.com/rust-lang/rust/pull/74060))
+ => Stable_1_47 => 1.47;
/// Nightly rust
/// * `thiscall` calling convention ([Tracking issue](https://github.com/rust-lang/rust/issues/42202))
=> Nightly => nightly;
@@ -134,7 +137,7 @@
rust_target_base!(rust_target_values_def);
/// Latest stable release of Rust
-pub const LATEST_STABLE_RUST: RustTarget = RustTarget::Stable_1_40;
+pub const LATEST_STABLE_RUST: RustTarget = RustTarget::Stable_1_47;
/// Create RustFeatures struct definition, new(), and a getter for each field
macro_rules! rust_feature_def {
@@ -222,6 +225,9 @@
Stable_1_40 {
=> non_exhaustive;
}
+ Stable_1_47 {
+ => larger_arrays;
+ }
Nightly {
=> thiscall_abi;
}
diff --git a/src/ir/analysis/derive.rs b/src/ir/analysis/derive.rs
index be62666..44e6702 100644
--- a/src/ir/analysis/derive.rs
+++ b/src/ir/analysis/derive.rs
@@ -255,7 +255,7 @@
return CanDerive::No;
}
- if self.derive_trait.can_derive_large_array() {
+ if self.derive_trait.can_derive_large_array(&self.ctx) {
trace!(" array can derive {}", self.derive_trait);
return CanDerive::Yes;
}
@@ -377,7 +377,7 @@
// Bitfield units are always represented as arrays of u8, but
// they're not traced as arrays, so we need to check here
// instead.
- if !self.derive_trait.can_derive_large_array() &&
+ if !self.derive_trait.can_derive_large_array(&self.ctx) &&
info.has_too_large_bitfield_unit() &&
!item.is_opaque(self.ctx, &())
{
@@ -496,10 +496,17 @@
}
}
- fn can_derive_large_array(&self) -> bool {
- match self {
- DeriveTrait::Copy => true,
- _ => false,
+ fn can_derive_large_array(&self, ctx: &BindgenContext) -> bool {
+ if ctx.options().rust_features().larger_arrays {
+ match self {
+ DeriveTrait::Default => false,
+ _ => true,
+ }
+ } else {
+ match self {
+ DeriveTrait::Copy => true,
+ _ => false,
+ }
}
}
@@ -686,7 +693,7 @@
Some(ty) => {
let mut can_derive = self.constrain_type(item, ty);
if let CanDerive::Yes = can_derive {
- if !self.derive_trait.can_derive_large_array() &&
+ if !self.derive_trait.can_derive_large_array(&self.ctx) &&
ty.layout(self.ctx).map_or(false, |l| {
l.align > RUST_DERIVE_IN_ARRAY_LIMIT
})
diff --git a/src/ir/annotations.rs b/src/ir/annotations.rs
index 12664f6..4b571ea 100644
--- a/src/ir/annotations.rs
+++ b/src/ir/annotations.rs
@@ -42,6 +42,8 @@
disallow_debug: bool,
/// Manually disable deriving/implement default on this type.
disallow_default: bool,
+ /// Whether to add a #[must_use] annotation to this type.
+ must_use_type: bool,
/// Whether fields should be marked as private or not. You can set this on
/// structs (it will apply to all the fields), or individual fields.
private_fields: Option<bool>,
@@ -84,6 +86,7 @@
disallow_copy: false,
disallow_debug: false,
disallow_default: false,
+ must_use_type: false,
private_fields: None,
accessor_kind: None,
constify_enum_variant: false,
@@ -163,6 +166,11 @@
self.disallow_default
}
+ /// Should this type get a `#[must_use]` annotation?
+ pub fn must_use_type(&self) -> bool {
+ self.must_use_type
+ }
+
/// Should the fields be private?
pub fn private_fields(&self) -> Option<bool> {
self.private_fields
@@ -190,6 +198,7 @@
"nocopy" => self.disallow_copy = true,
"nodebug" => self.disallow_debug = true,
"nodefault" => self.disallow_default = true,
+ "mustusetype" => self.must_use_type = true,
"replaces" => {
self.use_instead_of = Some(
attr.value.split("::").map(Into::into).collect(),
diff --git a/src/ir/comp.rs b/src/ir/comp.rs
index 52dcddd..9798330 100644
--- a/src/ir/comp.rs
+++ b/src/ir/comp.rs
@@ -1113,21 +1113,17 @@
}
// empty union case
- if self.fields().is_empty() {
+ if !self.has_fields() {
return None;
}
let mut max_size = 0;
// Don't allow align(0)
let mut max_align = 1;
- for field in self.fields() {
- let field_layout = field.layout(ctx);
-
- if let Some(layout) = field_layout {
- max_size = cmp::max(max_size, layout.size);
- max_align = cmp::max(max_align, layout.align);
- }
- }
+ self.each_known_field_layout(ctx, |layout| {
+ max_size = cmp::max(max_size, layout.size);
+ max_align = cmp::max(max_align, layout.align);
+ });
Some(Layout::new(max_size, max_align))
}
@@ -1139,12 +1135,49 @@
CompFields::AfterComputingBitfieldUnits { ref fields, .. } => {
fields
}
- CompFields::BeforeComputingBitfieldUnits(_) => {
+ CompFields::BeforeComputingBitfieldUnits(..) => {
panic!("Should always have computed bitfield units first");
}
}
}
+ fn has_fields(&self) -> bool {
+ match self.fields {
+ CompFields::ErrorComputingBitfieldUnits => false,
+ CompFields::AfterComputingBitfieldUnits { ref fields, .. } => {
+ !fields.is_empty()
+ }
+ CompFields::BeforeComputingBitfieldUnits(ref raw_fields) => {
+ !raw_fields.is_empty()
+ }
+ }
+ }
+
+ fn each_known_field_layout(
+ &self,
+ ctx: &BindgenContext,
+ mut callback: impl FnMut(Layout),
+ ) {
+ match self.fields {
+ CompFields::ErrorComputingBitfieldUnits => return,
+ CompFields::AfterComputingBitfieldUnits { ref fields, .. } => {
+ for field in fields.iter() {
+ if let Some(layout) = field.layout(ctx) {
+ callback(layout);
+ }
+ }
+ }
+ CompFields::BeforeComputingBitfieldUnits(ref raw_fields) => {
+ for field in raw_fields.iter() {
+ let field_ty = ctx.resolve_type(field.0.ty);
+ if let Some(layout) = field_ty.layout(ctx) {
+ callback(layout);
+ }
+ }
+ }
+ }
+ }
+
fn has_bitfields(&self) -> bool {
match self.fields {
CompFields::ErrorComputingBitfieldUnits => false,
@@ -1249,6 +1282,7 @@
let mut ci = CompInfo::new(kind);
ci.is_forward_declaration =
location.map_or(true, |cur| match cur.kind() {
+ CXCursor_ParmDecl => true,
CXCursor_StructDecl | CXCursor_UnionDecl |
CXCursor_ClassDecl => !cur.is_definition(),
_ => false,
@@ -1374,21 +1408,26 @@
let inner = Item::parse(cur, Some(potential_id), ctx)
.expect("Inner ClassDecl");
- let inner = inner.expect_type_id(ctx);
+ // If we avoided recursion parsing this type (in
+ // `Item::from_ty_with_id()`), then this might not be a
+ // valid type ID, so check and gracefully handle this.
+ if ctx.resolve_item_fallible(inner).is_some() {
+ let inner = inner.expect_type_id(ctx);
- ci.inner_types.push(inner);
+ ci.inner_types.push(inner);
- // A declaration of an union or a struct without name could
- // also be an unnamed field, unfortunately.
- if cur.spelling().is_empty() &&
- cur.kind() != CXCursor_EnumDecl
- {
- let ty = cur.cur_type();
- let public = cur.public_accessible();
- let offset = cur.offset_of_field().ok();
+ // A declaration of an union or a struct without name
+ // could also be an unnamed field, unfortunately.
+ if cur.spelling().is_empty() &&
+ cur.kind() != CXCursor_EnumDecl
+ {
+ let ty = cur.cur_type();
+ let public = cur.public_accessible();
+ let offset = cur.offset_of_field().ok();
- maybe_anonymous_struct_field =
- Some((inner, ty, public, offset));
+ maybe_anonymous_struct_field =
+ Some((inner, ty, public, offset));
+ }
}
}
CXCursor_PackedAttr => {
@@ -1597,23 +1636,17 @@
// Even though `libclang` doesn't expose `#pragma packed(...)`, we can
// detect it through its effects.
if let Some(parent_layout) = layout {
- if self.fields().iter().any(|f| match *f {
- Field::Bitfields(ref unit) => {
- unit.layout().align > parent_layout.align
- }
- Field::DataMember(ref data) => {
- let field_ty = ctx.resolve_type(data.ty());
- field_ty.layout(ctx).map_or(false, |field_ty_layout| {
- field_ty_layout.align > parent_layout.align
- })
- }
- }) {
+ let mut packed = false;
+ self.each_known_field_layout(ctx, |layout| {
+ packed = packed || layout.align > parent_layout.align;
+ });
+ if packed {
info!("Found a struct that was defined within `#pragma packed(...)`");
return true;
- } else if self.has_own_virtual_method {
- if parent_layout.align == 1 {
- return true;
- }
+ }
+
+ if self.has_own_virtual_method && parent_layout.align == 1 {
+ return true;
}
}
@@ -1626,10 +1659,13 @@
}
/// Compute this compound structure's bitfield allocation units.
- pub fn compute_bitfield_units(&mut self, ctx: &BindgenContext) {
- // TODO(emilio): If we could detect #pragma packed here we'd fix layout
- // tests in divide-by-zero-in-struct-layout.rs
- self.fields.compute_bitfield_units(ctx, self.packed_attr)
+ pub fn compute_bitfield_units(
+ &mut self,
+ ctx: &BindgenContext,
+ layout: Option<&Layout>,
+ ) {
+ let packed = self.is_packed(ctx, layout);
+ self.fields.compute_bitfield_units(ctx, packed)
}
/// Assign for each anonymous field a generated name.
diff --git a/src/ir/context.rs b/src/ir/context.rs
index 4faf6cd..44df063 100644
--- a/src/ir/context.rs
+++ b/src/ir/context.rs
@@ -981,12 +981,11 @@
mem::replace(&mut self.need_bitfield_allocation, vec![]);
for id in need_bitfield_allocation {
self.with_loaned_item(id, |ctx, item| {
- item.kind_mut()
- .as_type_mut()
+ let ty = item.kind_mut().as_type_mut().unwrap();
+ let layout = ty.layout(ctx);
+ ty.as_comp_mut()
.unwrap()
- .as_comp_mut()
- .unwrap()
- .compute_bitfield_units(ctx);
+ .compute_bitfield_units(ctx, layout.as_ref());
});
}
}
@@ -2664,6 +2663,12 @@
let name = item.path_for_allowlisting(self)[1..].join("::");
self.options().no_hash_types.matches(&name)
}
+
+ /// Check if `--must-use-type` flag is enabled for this item.
+ pub fn must_use_type_by_name(&self, item: &Item) -> bool {
+ let name = item.path_for_allowlisting(self)[1..].join("::");
+ self.options().must_use_types.matches(&name)
+ }
}
/// A builder struct for configuring item resolution options.
@@ -2718,8 +2723,16 @@
assert!(ctx.collected_typerefs());
let mut id = self.id;
+ let mut seen_ids = HashSet::default();
loop {
let item = ctx.resolve_item(id);
+
+ // Detect cycles and bail out. These can happen in certain cases
+ // involving incomplete qualified dependent types (#2085).
+ if !seen_ids.insert(id) {
+ return item;
+ }
+
let ty_kind = item.as_type().map(|t| t.kind());
match ty_kind {
Some(&TypeKind::ResolvedTypeRef(next_id))
diff --git a/src/ir/item.rs b/src/ir/item.rs
index 4e0ba80..a38c8e5 100644
--- a/src/ir/item.rs
+++ b/src/ir/item.rs
@@ -1594,8 +1594,8 @@
}
let decl = {
- let decl = ty.declaration();
- decl.definition().unwrap_or(decl)
+ let canonical_def = ty.canonical_type().declaration().definition();
+ canonical_def.unwrap_or_else(|| ty.declaration())
};
let comment = decl.raw_comment().or_else(|| location.raw_comment());
diff --git a/src/ir/ty.rs b/src/ir/ty.rs
index e6eecc3..e049ed6 100644
--- a/src/ir/ty.rs
+++ b/src/ir/ty.rs
@@ -39,7 +39,6 @@
/// traits, and so if we have a type containing an array with more than this
/// many items, we won't be able to derive common traits on that type.
///
-/// We need type-level integers yesterday :'(
pub const RUST_DERIVE_IN_ARRAY_LIMIT: usize = 32;
impl Type {
diff --git a/src/lib.rs b/src/lib.rs
index 1ac053b..67cfeb3 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -317,6 +317,7 @@
(&self.options.no_debug_types, "--no-debug"),
(&self.options.no_default_types, "--no-default"),
(&self.options.no_hash_types, "--no-hash"),
+ (&self.options.must_use_types, "--must-use-type"),
];
for (set, flag) in regex_sets {
@@ -562,6 +563,10 @@
output_vector.push("--c-naming".into());
}
+ if self.options.force_explicit_padding {
+ output_vector.push("--explicit-padding".into());
+ }
+
// Add clang arguments
output_vector.push("--".into());
@@ -1419,6 +1424,17 @@
self
}
+ /// If true, always emit explicit padding fields.
+ ///
+ /// If a struct needs to be serialized in its native format (padding bytes
+ /// and all), for example writing it to a file or sending it on the network,
+ /// then this should be enabled, as anything reading the padding bytes of
+ /// a struct may lead to Undefined Behavior.
+ pub fn explicit_padding(mut self, doit: bool) -> Self {
+ self.options.force_explicit_padding = doit;
+ self
+ }
+
/// Generate the Rust bindings using the options built up thus far.
pub fn generate(mut self) -> Result<Bindings, ()> {
// Add any extra arguments from the environment to the clang command line.
@@ -1573,6 +1589,13 @@
self
}
+ /// Add `#[must_use]` for the given type. Regular
+ /// expressions are supported.
+ pub fn must_use_type<T: Into<String>>(mut self, arg: T) -> Builder {
+ self.options.must_use_types.insert(arg.into());
+ self
+ }
+
/// Set whether `arr[size]` should be treated as `*mut T` or `*mut [T; size]` (same for mut)
pub fn array_pointers_in_arguments(mut self, doit: bool) -> Self {
self.options.array_pointers_in_arguments = doit;
@@ -1913,6 +1936,9 @@
/// The set of types that we should not derive `Hash` for.
no_hash_types: RegexSet,
+ /// The set of types that we should be annotated with `#[must_use]`.
+ must_use_types: RegexSet,
+
/// Decide if C arrays should be regular pointers in rust or array pointers
array_pointers_in_arguments: bool,
@@ -1937,6 +1963,9 @@
/// Generate types with C style naming.
c_naming: bool,
+
+ /// Always output explicit padding fields
+ force_explicit_padding: bool,
}
/// TODO(emilio): This is sort of a lie (see the error message that results from
@@ -1968,6 +1997,7 @@
&mut self.no_debug_types,
&mut self.no_default_types,
&mut self.no_hash_types,
+ &mut self.must_use_types,
];
let record_matches = self.record_matches;
for regex_set in &mut regex_sets {
@@ -2072,6 +2102,7 @@
no_debug_types: Default::default(),
no_default_types: Default::default(),
no_hash_types: Default::default(),
+ must_use_types: Default::default(),
array_pointers_in_arguments: false,
wasm_import_module_name: None,
dynamic_library_name: None,
@@ -2079,6 +2110,7 @@
respect_cxx_access_specs: false,
translate_enum_integer_types: false,
c_naming: false,
+ force_explicit_padding: false,
}
}
}
diff --git a/src/options.rs b/src/options.rs
index cbdc945..0524871 100644
--- a/src/options.rs
+++ b/src/options.rs
@@ -486,6 +486,13 @@
.takes_value(true)
.multiple(true)
.number_of_values(1),
+ Arg::with_name("must-use-type")
+ .long("must-use-type")
+ .help("Add #[must_use] annotation to types matching <regex>.")
+ .value_name("regex")
+ .takes_value(true)
+ .multiple(true)
+ .number_of_values(1),
Arg::with_name("enable-function-attribute-detection")
.long("enable-function-attribute-detection")
.help(
@@ -516,6 +523,9 @@
Arg::with_name("c-naming")
.long("c-naming")
.help("Generate types with C style naming."),
+ Arg::with_name("explicit-padding")
+ .long("explicit-padding")
+ .help("Always output explicit padding fields."),
]) // .args()
.get_matches_from(args);
@@ -940,6 +950,12 @@
}
}
+ if let Some(must_use_type) = matches.values_of("must-use-type") {
+ for regex in must_use_type {
+ builder = builder.must_use_type(regex);
+ }
+ }
+
if let Some(dynamic_library_name) = matches.value_of("dynamic-loading") {
builder = builder.dynamic_library_name(dynamic_library_name);
}
@@ -960,6 +976,10 @@
builder = builder.c_naming(true);
}
+ if matches.is_present("explicit-padding") {
+ builder = builder.explicit_padding(true);
+ }
+
let verbose = matches.is_present("verbose");
Ok((builder, output, verbose))
diff --git a/tests/expectations/tests/16-byte-alignment.rs b/tests/expectations/tests/16-byte-alignment.rs
index 0bb92fd..058568f 100644
--- a/tests/expectations/tests/16-byte-alignment.rs
+++ b/tests/expectations/tests/16-byte-alignment.rs
@@ -99,7 +99,11 @@
}
impl Default for rte_ipv4_tuple__bindgen_ty_1 {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[test]
@@ -143,7 +147,11 @@
}
impl Default for rte_ipv4_tuple {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
@@ -240,7 +248,11 @@
}
impl Default for rte_ipv6_tuple__bindgen_ty_1 {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[test]
@@ -284,7 +296,11 @@
}
impl Default for rte_ipv6_tuple {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
@@ -333,6 +349,10 @@
}
impl Default for rte_thash_tuple {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
diff --git a/tests/expectations/tests/16-byte-alignment_1_0.rs b/tests/expectations/tests/16-byte-alignment_1_0.rs
index 8b10557..1df6778 100644
--- a/tests/expectations/tests/16-byte-alignment_1_0.rs
+++ b/tests/expectations/tests/16-byte-alignment_1_0.rs
@@ -390,6 +390,10 @@
}
impl Default for rte_thash_tuple {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ unsafe {
+ let mut s: Self = ::std::mem::uninitialized();
+ ::std::ptr::write_bytes(&mut s, 0, 1);
+ s
+ }
}
}
diff --git a/tests/expectations/tests/allowlist_basic.rs b/tests/expectations/tests/allowlist_basic.rs
index 4e72e8b..5bfe42e 100644
--- a/tests/expectations/tests/allowlist_basic.rs
+++ b/tests/expectations/tests/allowlist_basic.rs
@@ -20,11 +20,19 @@
}
impl<T> Default for AllowlistMe_Inner<T> {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
impl<T> Default for AllowlistMe<T> {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
diff --git a/tests/expectations/tests/anon-fields-prefix.rs b/tests/expectations/tests/anon-fields-prefix.rs
index f358dbd..edd551d 100644
--- a/tests/expectations/tests/anon-fields-prefix.rs
+++ b/tests/expectations/tests/anon-fields-prefix.rs
@@ -150,6 +150,10 @@
}
impl Default for color {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
diff --git a/tests/expectations/tests/anon_struct_in_union.rs b/tests/expectations/tests/anon_struct_in_union.rs
index 008ab61..1a40401 100644
--- a/tests/expectations/tests/anon_struct_in_union.rs
+++ b/tests/expectations/tests/anon_struct_in_union.rs
@@ -74,7 +74,11 @@
}
impl Default for s__bindgen_ty_1 {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[test]
@@ -97,6 +101,10 @@
}
impl Default for s {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
diff --git a/tests/expectations/tests/anon_union.rs b/tests/expectations/tests/anon_union.rs
index 386d8fa..8caf7d1 100644
--- a/tests/expectations/tests/anon_union.rs
+++ b/tests/expectations/tests/anon_union.rs
@@ -38,12 +38,20 @@
}
impl Default for TErrorResult__bindgen_ty_1 {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
impl Default for TErrorResult {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
@@ -65,7 +73,11 @@
}
impl Default for ErrorResult {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[test]
diff --git a/tests/expectations/tests/anon_union_1_0.rs b/tests/expectations/tests/anon_union_1_0.rs
index fbd6b36..63273e6 100644
--- a/tests/expectations/tests/anon_union_1_0.rs
+++ b/tests/expectations/tests/anon_union_1_0.rs
@@ -83,7 +83,11 @@
}
impl Default for TErrorResult {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ unsafe {
+ let mut s: Self = ::std::mem::uninitialized();
+ ::std::ptr::write_bytes(&mut s, 0, 1);
+ s
+ }
}
}
#[repr(C)]
@@ -111,7 +115,11 @@
}
impl Default for ErrorResult {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ unsafe {
+ let mut s: Self = ::std::mem::uninitialized();
+ ::std::ptr::write_bytes(&mut s, 0, 1);
+ s
+ }
}
}
#[test]
diff --git a/tests/expectations/tests/anonymous-template-types.rs b/tests/expectations/tests/anonymous-template-types.rs
index 3d07286..14afd6b 100644
--- a/tests/expectations/tests/anonymous-template-types.rs
+++ b/tests/expectations/tests/anonymous-template-types.rs
@@ -13,7 +13,11 @@
}
impl<T> Default for Foo<T> {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
@@ -29,7 +33,11 @@
}
impl<V> Default for Quux<V> {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
diff --git a/tests/expectations/tests/bad-namespace-parenthood-inheritance.rs b/tests/expectations/tests/bad-namespace-parenthood-inheritance.rs
index 228dafd..4d0d6bc 100644
--- a/tests/expectations/tests/bad-namespace-parenthood-inheritance.rs
+++ b/tests/expectations/tests/bad-namespace-parenthood-inheritance.rs
@@ -12,7 +12,11 @@
}
impl Default for std_char_traits {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
diff --git a/tests/expectations/tests/bitfield_align_2.rs b/tests/expectations/tests/bitfield_align_2.rs
index f4f0c98..1a1f7dd 100644
--- a/tests/expectations/tests/bitfield_align_2.rs
+++ b/tests/expectations/tests/bitfield_align_2.rs
@@ -121,7 +121,11 @@
}
impl Default for TaggedPtr {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
impl TaggedPtr {
diff --git a/tests/expectations/tests/bitfield_pragma_packed.rs b/tests/expectations/tests/bitfield_pragma_packed.rs
new file mode 100644
index 0000000..27cd90f
--- /dev/null
+++ b/tests/expectations/tests/bitfield_pragma_packed.rs
@@ -0,0 +1,211 @@
+#![allow(
+ dead_code,
+ non_snake_case,
+ non_camel_case_types,
+ non_upper_case_globals
+)]
+
+#[repr(C)]
+#[derive(Copy, Clone, Debug, Default, Eq, Hash, Ord, PartialEq, PartialOrd)]
+pub struct __BindgenBitfieldUnit<Storage> {
+ storage: Storage,
+}
+impl<Storage> __BindgenBitfieldUnit<Storage> {
+ #[inline]
+ pub const fn new(storage: Storage) -> Self {
+ Self { storage }
+ }
+}
+impl<Storage> __BindgenBitfieldUnit<Storage>
+where
+ Storage: AsRef<[u8]> + AsMut<[u8]>,
+{
+ #[inline]
+ pub fn get_bit(&self, index: usize) -> bool {
+ debug_assert!(index / 8 < self.storage.as_ref().len());
+ let byte_index = index / 8;
+ let byte = self.storage.as_ref()[byte_index];
+ let bit_index = if cfg!(target_endian = "big") {
+ 7 - (index % 8)
+ } else {
+ index % 8
+ };
+ let mask = 1 << bit_index;
+ byte & mask == mask
+ }
+ #[inline]
+ pub fn set_bit(&mut self, index: usize, val: bool) {
+ debug_assert!(index / 8 < self.storage.as_ref().len());
+ let byte_index = index / 8;
+ let byte = &mut self.storage.as_mut()[byte_index];
+ let bit_index = if cfg!(target_endian = "big") {
+ 7 - (index % 8)
+ } else {
+ index % 8
+ };
+ let mask = 1 << bit_index;
+ if val {
+ *byte |= mask;
+ } else {
+ *byte &= !mask;
+ }
+ }
+ #[inline]
+ pub fn get(&self, bit_offset: usize, bit_width: u8) -> u64 {
+ debug_assert!(bit_width <= 64);
+ debug_assert!(bit_offset / 8 < self.storage.as_ref().len());
+ debug_assert!(
+ (bit_offset + (bit_width as usize)) / 8 <=
+ self.storage.as_ref().len()
+ );
+ let mut val = 0;
+ for i in 0..(bit_width as usize) {
+ if self.get_bit(i + bit_offset) {
+ let index = if cfg!(target_endian = "big") {
+ bit_width as usize - 1 - i
+ } else {
+ i
+ };
+ val |= 1 << index;
+ }
+ }
+ val
+ }
+ #[inline]
+ pub fn set(&mut self, bit_offset: usize, bit_width: u8, val: u64) {
+ debug_assert!(bit_width <= 64);
+ debug_assert!(bit_offset / 8 < self.storage.as_ref().len());
+ debug_assert!(
+ (bit_offset + (bit_width as usize)) / 8 <=
+ self.storage.as_ref().len()
+ );
+ for i in 0..(bit_width as usize) {
+ let mask = 1 << i;
+ let val_bit_is_set = val & mask == mask;
+ let index = if cfg!(target_endian = "big") {
+ bit_width as usize - 1 - i
+ } else {
+ i
+ };
+ self.set_bit(index + bit_offset, val_bit_is_set);
+ }
+ }
+}
+#[repr(C, packed)]
+#[derive(Debug, Default, Copy, Clone)]
+pub struct Struct {
+ pub _bitfield_align_1: [u8; 0],
+ pub _bitfield_1: __BindgenBitfieldUnit<[u8; 4usize]>,
+}
+#[test]
+fn bindgen_test_layout_Struct() {
+ assert_eq!(
+ ::std::mem::size_of::<Struct>(),
+ 4usize,
+ concat!("Size of: ", stringify!(Struct))
+ );
+ assert_eq!(
+ ::std::mem::align_of::<Struct>(),
+ 1usize,
+ concat!("Alignment of ", stringify!(Struct))
+ );
+}
+impl Struct {
+ #[inline]
+ pub fn a(&self) -> ::std::os::raw::c_uchar {
+ unsafe {
+ ::std::mem::transmute(self._bitfield_1.get(0usize, 1u8) as u8)
+ }
+ }
+ #[inline]
+ pub fn set_a(&mut self, val: ::std::os::raw::c_uchar) {
+ unsafe {
+ let val: u8 = ::std::mem::transmute(val);
+ self._bitfield_1.set(0usize, 1u8, val as u64)
+ }
+ }
+ #[inline]
+ pub fn b(&self) -> ::std::os::raw::c_uchar {
+ unsafe {
+ ::std::mem::transmute(self._bitfield_1.get(1usize, 1u8) as u8)
+ }
+ }
+ #[inline]
+ pub fn set_b(&mut self, val: ::std::os::raw::c_uchar) {
+ unsafe {
+ let val: u8 = ::std::mem::transmute(val);
+ self._bitfield_1.set(1usize, 1u8, val as u64)
+ }
+ }
+ #[inline]
+ pub fn c(&self) -> ::std::os::raw::c_uchar {
+ unsafe {
+ ::std::mem::transmute(self._bitfield_1.get(2usize, 6u8) as u8)
+ }
+ }
+ #[inline]
+ pub fn set_c(&mut self, val: ::std::os::raw::c_uchar) {
+ unsafe {
+ let val: u8 = ::std::mem::transmute(val);
+ self._bitfield_1.set(2usize, 6u8, val as u64)
+ }
+ }
+ #[inline]
+ pub fn d(&self) -> ::std::os::raw::c_ushort {
+ unsafe {
+ ::std::mem::transmute(self._bitfield_1.get(8usize, 16u8) as u16)
+ }
+ }
+ #[inline]
+ pub fn set_d(&mut self, val: ::std::os::raw::c_ushort) {
+ unsafe {
+ let val: u16 = ::std::mem::transmute(val);
+ self._bitfield_1.set(8usize, 16u8, val as u64)
+ }
+ }
+ #[inline]
+ pub fn e(&self) -> ::std::os::raw::c_uchar {
+ unsafe {
+ ::std::mem::transmute(self._bitfield_1.get(24usize, 8u8) as u8)
+ }
+ }
+ #[inline]
+ pub fn set_e(&mut self, val: ::std::os::raw::c_uchar) {
+ unsafe {
+ let val: u8 = ::std::mem::transmute(val);
+ self._bitfield_1.set(24usize, 8u8, val as u64)
+ }
+ }
+ #[inline]
+ pub fn new_bitfield_1(
+ a: ::std::os::raw::c_uchar,
+ b: ::std::os::raw::c_uchar,
+ c: ::std::os::raw::c_uchar,
+ d: ::std::os::raw::c_ushort,
+ e: ::std::os::raw::c_uchar,
+ ) -> __BindgenBitfieldUnit<[u8; 4usize]> {
+ let mut __bindgen_bitfield_unit: __BindgenBitfieldUnit<[u8; 4usize]> =
+ Default::default();
+ __bindgen_bitfield_unit.set(0usize, 1u8, {
+ let a: u8 = unsafe { ::std::mem::transmute(a) };
+ a as u64
+ });
+ __bindgen_bitfield_unit.set(1usize, 1u8, {
+ let b: u8 = unsafe { ::std::mem::transmute(b) };
+ b as u64
+ });
+ __bindgen_bitfield_unit.set(2usize, 6u8, {
+ let c: u8 = unsafe { ::std::mem::transmute(c) };
+ c as u64
+ });
+ __bindgen_bitfield_unit.set(8usize, 16u8, {
+ let d: u16 = unsafe { ::std::mem::transmute(d) };
+ d as u64
+ });
+ __bindgen_bitfield_unit.set(24usize, 8u8, {
+ let e: u8 = unsafe { ::std::mem::transmute(e) };
+ e as u64
+ });
+ __bindgen_bitfield_unit
+ }
+}
diff --git a/tests/expectations/tests/blocklist-and-impl-debug.rs b/tests/expectations/tests/blocklist-and-impl-debug.rs
index f272f9b..ba39fb1 100644
--- a/tests/expectations/tests/blocklist-and-impl-debug.rs
+++ b/tests/expectations/tests/blocklist-and-impl-debug.rs
@@ -40,7 +40,11 @@
}
impl Default for ShouldManuallyImplDebug {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
impl ::std::fmt::Debug for ShouldManuallyImplDebug {
diff --git a/tests/expectations/tests/blocks-signature.rs b/tests/expectations/tests/blocks-signature.rs
index bd9d815..22136dd 100644
--- a/tests/expectations/tests/blocks-signature.rs
+++ b/tests/expectations/tests/blocks-signature.rs
@@ -76,7 +76,11 @@
}
impl Default for contains_block_pointers {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
pub type _bindgen_ty_id_33 = *const ::block::Block<(), ()>;
diff --git a/tests/expectations/tests/blocks.rs b/tests/expectations/tests/blocks.rs
index 4c731f8..b2ae0b2 100644
--- a/tests/expectations/tests/blocks.rs
+++ b/tests/expectations/tests/blocks.rs
@@ -75,6 +75,10 @@
}
impl Default for contains_block_pointers {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
diff --git a/tests/expectations/tests/c_naming.rs b/tests/expectations/tests/c_naming.rs
index 041e75e..abcccf1 100644
--- a/tests/expectations/tests/c_naming.rs
+++ b/tests/expectations/tests/c_naming.rs
@@ -75,7 +75,11 @@
}
impl Default for union_b {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
pub type b = union_b;
diff --git a/tests/expectations/tests/canonical-types.rs b/tests/expectations/tests/canonical-types.rs
new file mode 100644
index 0000000..80d7fec
--- /dev/null
+++ b/tests/expectations/tests/canonical-types.rs
@@ -0,0 +1,278 @@
+#![allow(
+ dead_code,
+ non_snake_case,
+ non_camel_case_types,
+ non_upper_case_globals
+)]
+
+#[repr(C)]
+#[derive(Debug, Default, Copy, Clone)]
+pub struct ClassA {
+ pub _address: u8,
+}
+#[repr(C)]
+#[derive(Debug, Copy, Clone)]
+pub struct ClassA_ClassAInner<T> {
+ pub x: *mut T,
+ pub _phantom_0: ::std::marker::PhantomData<::std::cell::UnsafeCell<T>>,
+}
+impl<T> Default for ClassA_ClassAInner<T> {
+ fn default() -> Self {
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
+ }
+}
+#[repr(C)]
+#[derive(Debug, Default, Copy, Clone)]
+pub struct ClassB {
+ pub _address: u8,
+}
+#[repr(C)]
+#[derive(Debug, Default, Copy, Clone)]
+pub struct ClassC {
+ pub _address: u8,
+}
+#[repr(C)]
+#[derive(Debug, Copy, Clone)]
+pub struct ClassC_ClassCInnerB {
+ pub cache: *mut ClassC_ClassCInnerA,
+}
+impl Default for ClassC_ClassCInnerB {
+ fn default() -> Self {
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
+ }
+}
+#[repr(C)]
+#[derive(Debug, Copy, Clone)]
+pub struct ClassC_ClassCInnerA {
+ pub member: *mut ClassC_ClassCInnerB,
+}
+impl Default for ClassC_ClassCInnerA {
+ fn default() -> Self {
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
+ }
+}
+#[repr(C)]
+#[derive(Debug, Copy, Clone)]
+pub struct ClassC_ClassCInnerCRTP {
+ pub _address: u8,
+}
+impl Default for ClassC_ClassCInnerCRTP {
+ fn default() -> Self {
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
+ }
+}
+#[repr(C)]
+#[derive(Debug, Copy, Clone)]
+pub struct ClassD {
+ pub _address: u8,
+}
+#[test]
+fn bindgen_test_layout_ClassD() {
+ assert_eq!(
+ ::std::mem::size_of::<ClassD>(),
+ 1usize,
+ concat!("Size of: ", stringify!(ClassD))
+ );
+ assert_eq!(
+ ::std::mem::align_of::<ClassD>(),
+ 1usize,
+ concat!("Alignment of ", stringify!(ClassD))
+ );
+}
+impl Default for ClassD {
+ fn default() -> Self {
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
+ }
+}
+#[test]
+fn __bindgen_test_layout_ClassB_open0_ClassD_ClassCInnerCRTP_close0_instantiation(
+) {
+ assert_eq!(
+ ::std::mem::size_of::<ClassB>(),
+ 1usize,
+ concat!("Size of template specialization: ", stringify!(ClassB))
+ );
+ assert_eq!(
+ ::std::mem::align_of::<ClassB>(),
+ 1usize,
+ concat!("Alignment of template specialization: ", stringify!(ClassB))
+ );
+}
+#[repr(C)]
+#[derive(Debug, Copy, Clone)]
+pub struct ClassCInnerCRTP {
+ pub _address: u8,
+}
+#[test]
+fn bindgen_test_layout_ClassCInnerCRTP() {
+ assert_eq!(
+ ::std::mem::size_of::<ClassCInnerCRTP>(),
+ 1usize,
+ concat!("Size of: ", stringify!(ClassCInnerCRTP))
+ );
+ assert_eq!(
+ ::std::mem::align_of::<ClassCInnerCRTP>(),
+ 1usize,
+ concat!("Alignment of ", stringify!(ClassCInnerCRTP))
+ );
+}
+impl Default for ClassCInnerCRTP {
+ fn default() -> Self {
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
+ }
+}
+#[test]
+fn __bindgen_test_layout_ClassB_open0_ClassCInnerCRTP_ClassAInner_close0_instantiation(
+) {
+ assert_eq!(
+ ::std::mem::size_of::<ClassB>(),
+ 1usize,
+ concat!("Size of template specialization: ", stringify!(ClassB))
+ );
+ assert_eq!(
+ ::std::mem::align_of::<ClassB>(),
+ 1usize,
+ concat!("Alignment of template specialization: ", stringify!(ClassB))
+ );
+}
+#[repr(C)]
+#[derive(Debug, Copy, Clone)]
+pub struct ClassAInner {
+ pub x: *mut ClassCInnerA,
+}
+#[test]
+fn bindgen_test_layout_ClassAInner() {
+ assert_eq!(
+ ::std::mem::size_of::<ClassAInner>(),
+ 8usize,
+ concat!("Size of: ", stringify!(ClassAInner))
+ );
+ assert_eq!(
+ ::std::mem::align_of::<ClassAInner>(),
+ 8usize,
+ concat!("Alignment of ", stringify!(ClassAInner))
+ );
+ assert_eq!(
+ unsafe {
+ &(*(::std::ptr::null::<ClassAInner>())).x as *const _ as usize
+ },
+ 0usize,
+ concat!(
+ "Offset of field: ",
+ stringify!(ClassAInner),
+ "::",
+ stringify!(x)
+ )
+ );
+}
+impl Default for ClassAInner {
+ fn default() -> Self {
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
+ }
+}
+#[repr(C)]
+#[derive(Debug, Copy, Clone)]
+pub struct ClassCInnerA {
+ pub member: *mut ClassCInnerB,
+}
+#[test]
+fn bindgen_test_layout_ClassCInnerA() {
+ assert_eq!(
+ ::std::mem::size_of::<ClassCInnerA>(),
+ 8usize,
+ concat!("Size of: ", stringify!(ClassCInnerA))
+ );
+ assert_eq!(
+ ::std::mem::align_of::<ClassCInnerA>(),
+ 8usize,
+ concat!("Alignment of ", stringify!(ClassCInnerA))
+ );
+ assert_eq!(
+ unsafe {
+ &(*(::std::ptr::null::<ClassCInnerA>())).member as *const _ as usize
+ },
+ 0usize,
+ concat!(
+ "Offset of field: ",
+ stringify!(ClassCInnerA),
+ "::",
+ stringify!(member)
+ )
+ );
+}
+impl Default for ClassCInnerA {
+ fn default() -> Self {
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
+ }
+}
+#[repr(C)]
+#[derive(Debug, Copy, Clone)]
+pub struct ClassCInnerB {
+ pub cache: *mut ClassCInnerA,
+}
+#[test]
+fn bindgen_test_layout_ClassCInnerB() {
+ assert_eq!(
+ ::std::mem::size_of::<ClassCInnerB>(),
+ 8usize,
+ concat!("Size of: ", stringify!(ClassCInnerB))
+ );
+ assert_eq!(
+ ::std::mem::align_of::<ClassCInnerB>(),
+ 8usize,
+ concat!("Alignment of ", stringify!(ClassCInnerB))
+ );
+ assert_eq!(
+ unsafe {
+ &(*(::std::ptr::null::<ClassCInnerB>())).cache as *const _ as usize
+ },
+ 0usize,
+ concat!(
+ "Offset of field: ",
+ stringify!(ClassCInnerB),
+ "::",
+ stringify!(cache)
+ )
+ );
+}
+impl Default for ClassCInnerB {
+ fn default() -> Self {
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
+ }
+}
diff --git a/tests/expectations/tests/class.rs b/tests/expectations/tests/class.rs
index b13b3c8..3d3afb1 100644
--- a/tests/expectations/tests/class.rs
+++ b/tests/expectations/tests/class.rs
@@ -71,7 +71,11 @@
}
impl Default for C {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
@@ -134,7 +138,11 @@
}
impl Default for C_with_zero_length_array {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
@@ -203,7 +211,11 @@
}
impl Default for C_with_incomplete_array {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
@@ -253,7 +265,11 @@
}
impl Default for C_with_zero_length_array_and_incomplete_array {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
@@ -332,7 +348,11 @@
}
impl Default for IncompleteArrayNonCopiable {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
@@ -366,7 +386,11 @@
}
impl Default for Union {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
@@ -401,7 +425,11 @@
}
impl Default for WithUnion {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
diff --git a/tests/expectations/tests/class_1_0.rs b/tests/expectations/tests/class_1_0.rs
index b341bdb..3f948bb 100644
--- a/tests/expectations/tests/class_1_0.rs
+++ b/tests/expectations/tests/class_1_0.rs
@@ -119,7 +119,11 @@
}
impl Default for C {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ unsafe {
+ let mut s: Self = ::std::mem::uninitialized();
+ ::std::ptr::write_bytes(&mut s, 0, 1);
+ s
+ }
}
}
impl ::std::cmp::PartialEq for C {
@@ -187,7 +191,11 @@
}
impl Default for C_with_zero_length_array {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ unsafe {
+ let mut s: Self = ::std::mem::uninitialized();
+ ::std::ptr::write_bytes(&mut s, 0, 1);
+ s
+ }
}
}
#[repr(C)]
@@ -256,7 +264,11 @@
}
impl Default for C_with_incomplete_array {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ unsafe {
+ let mut s: Self = ::std::mem::uninitialized();
+ ::std::ptr::write_bytes(&mut s, 0, 1);
+ s
+ }
}
}
#[repr(C)]
@@ -306,7 +318,11 @@
}
impl Default for C_with_zero_length_array_and_incomplete_array {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ unsafe {
+ let mut s: Self = ::std::mem::uninitialized();
+ ::std::ptr::write_bytes(&mut s, 0, 1);
+ s
+ }
}
}
#[repr(C)]
@@ -385,7 +401,11 @@
}
impl Default for IncompleteArrayNonCopiable {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ unsafe {
+ let mut s: Self = ::std::mem::uninitialized();
+ ::std::ptr::write_bytes(&mut s, 0, 1);
+ s
+ }
}
}
#[repr(C)]
diff --git a/tests/expectations/tests/class_nested.rs b/tests/expectations/tests/class_nested.rs
index 5f7a1df..ecc5c20 100644
--- a/tests/expectations/tests/class_nested.rs
+++ b/tests/expectations/tests/class_nested.rs
@@ -48,7 +48,11 @@
}
impl<T> Default for A_D<T> {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[test]
@@ -159,11 +163,19 @@
}
impl<T> Default for Templated_Templated_inner<T> {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
impl<T> Default for Templated<T> {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
diff --git a/tests/expectations/tests/class_with_dtor.rs b/tests/expectations/tests/class_with_dtor.rs
index 7cefe99..0cf2d8d 100644
--- a/tests/expectations/tests/class_with_dtor.rs
+++ b/tests/expectations/tests/class_with_dtor.rs
@@ -13,7 +13,11 @@
}
impl<T> Default for HandleWithDtor<T> {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
pub type HandleValue = HandleWithDtor<::std::os::raw::c_int>;
@@ -50,7 +54,11 @@
}
impl Default for WithoutDtor {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[test]
diff --git a/tests/expectations/tests/class_with_inner_struct.rs b/tests/expectations/tests/class_with_inner_struct.rs
index eab5411..35ed765 100644
--- a/tests/expectations/tests/class_with_inner_struct.rs
+++ b/tests/expectations/tests/class_with_inner_struct.rs
@@ -87,7 +87,11 @@
}
impl Default for A__bindgen_ty_1 {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
@@ -122,7 +126,11 @@
}
impl Default for A__bindgen_ty_2 {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[test]
@@ -157,7 +165,11 @@
}
impl Default for A {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
@@ -366,7 +378,11 @@
}
impl Default for C__bindgen_ty_1__bindgen_ty_2 {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[test]
@@ -397,7 +413,11 @@
}
impl Default for C__bindgen_ty_1 {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
@@ -463,6 +483,10 @@
}
impl Default for C {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
diff --git a/tests/expectations/tests/class_with_inner_struct_1_0.rs b/tests/expectations/tests/class_with_inner_struct_1_0.rs
index 4bb7160..52cd590 100644
--- a/tests/expectations/tests/class_with_inner_struct_1_0.rs
+++ b/tests/expectations/tests/class_with_inner_struct_1_0.rs
@@ -437,7 +437,11 @@
}
impl Default for C__bindgen_ty_1__bindgen_ty_2 {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ unsafe {
+ let mut s: Self = ::std::mem::uninitialized();
+ ::std::ptr::write_bytes(&mut s, 0, 1);
+ s
+ }
}
}
#[test]
diff --git a/tests/expectations/tests/class_with_typedef.rs b/tests/expectations/tests/class_with_typedef.rs
index 52f89b4..31faa49 100644
--- a/tests/expectations/tests/class_with_typedef.rs
+++ b/tests/expectations/tests/class_with_typedef.rs
@@ -78,7 +78,11 @@
}
impl Default for C {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
impl C {
@@ -125,6 +129,10 @@
}
impl Default for D {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
diff --git a/tests/expectations/tests/complex.rs b/tests/expectations/tests/complex.rs
index b13ac90..4dae071 100644
--- a/tests/expectations/tests/complex.rs
+++ b/tests/expectations/tests/complex.rs
@@ -74,7 +74,11 @@
}
impl Default for TestDoublePtr {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
@@ -140,6 +144,10 @@
}
impl Default for TestFloatPtr {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
diff --git a/tests/expectations/tests/const-const-mut-ptr.rs b/tests/expectations/tests/const-const-mut-ptr.rs
index 789fccd..bc1e762 100644
--- a/tests/expectations/tests/const-const-mut-ptr.rs
+++ b/tests/expectations/tests/const-const-mut-ptr.rs
@@ -30,6 +30,10 @@
}
impl Default for foo {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
diff --git a/tests/expectations/tests/const_tparam.rs b/tests/expectations/tests/const_tparam.rs
index f56561f..ec25687 100644
--- a/tests/expectations/tests/const_tparam.rs
+++ b/tests/expectations/tests/const_tparam.rs
@@ -14,6 +14,10 @@
}
impl<T> Default for C<T> {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
diff --git a/tests/expectations/tests/constify-all-enums.rs b/tests/expectations/tests/constify-all-enums.rs
index 3c450e6..78bb99f 100644
--- a/tests/expectations/tests/constify-all-enums.rs
+++ b/tests/expectations/tests/constify-all-enums.rs
@@ -42,6 +42,10 @@
}
impl Default for bar {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
diff --git a/tests/expectations/tests/constify-module-enums-basic.rs b/tests/expectations/tests/constify-module-enums-basic.rs
index 2cbb09b..59e9ba1 100644
--- a/tests/expectations/tests/constify-module-enums-basic.rs
+++ b/tests/expectations/tests/constify-module-enums-basic.rs
@@ -46,7 +46,11 @@
}
impl Default for bar {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
extern "C" {
diff --git a/tests/expectations/tests/constify-module-enums-namespace.rs b/tests/expectations/tests/constify-module-enums-namespace.rs
index c18b717..e434291 100644
--- a/tests/expectations/tests/constify-module-enums-namespace.rs
+++ b/tests/expectations/tests/constify-module-enums-namespace.rs
@@ -58,7 +58,11 @@
}
impl Default for bar {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
}
diff --git a/tests/expectations/tests/constify-module-enums-shadow-name.rs b/tests/expectations/tests/constify-module-enums-shadow-name.rs
index 16f13fd..60401dc 100644
--- a/tests/expectations/tests/constify-module-enums-shadow-name.rs
+++ b/tests/expectations/tests/constify-module-enums-shadow-name.rs
@@ -42,6 +42,10 @@
}
impl Default for bar {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
diff --git a/tests/expectations/tests/constify-module-enums-simple-alias.rs b/tests/expectations/tests/constify-module-enums-simple-alias.rs
index 64e77c6..317697d 100644
--- a/tests/expectations/tests/constify-module-enums-simple-alias.rs
+++ b/tests/expectations/tests/constify-module-enums-simple-alias.rs
@@ -109,6 +109,10 @@
}
impl Default for Bar {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
diff --git a/tests/expectations/tests/constify-module-enums-simple-nonamespace.rs b/tests/expectations/tests/constify-module-enums-simple-nonamespace.rs
index 3a95b3c..b664479 100644
--- a/tests/expectations/tests/constify-module-enums-simple-nonamespace.rs
+++ b/tests/expectations/tests/constify-module-enums-simple-nonamespace.rs
@@ -41,6 +41,10 @@
}
impl Default for Bar {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
diff --git a/tests/expectations/tests/constify-module-enums-types.rs b/tests/expectations/tests/constify-module-enums-types.rs
index 4ba85b3..ec7e6c0 100644
--- a/tests/expectations/tests/constify-module-enums-types.rs
+++ b/tests/expectations/tests/constify-module-enums-types.rs
@@ -168,7 +168,11 @@
}
impl Default for bar {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
@@ -201,7 +205,11 @@
}
impl Default for Baz {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
pub mod one_Foo {
@@ -234,7 +242,11 @@
}
impl Default for Bar {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
extern "C" {
@@ -261,7 +273,11 @@
}
impl<T> Default for Thing<T> {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
extern "C" {
diff --git a/tests/expectations/tests/convert-cpp-comment-to-rust.rs b/tests/expectations/tests/convert-cpp-comment-to-rust.rs
index 451cfa3..86279ca 100644
--- a/tests/expectations/tests/convert-cpp-comment-to-rust.rs
+++ b/tests/expectations/tests/convert-cpp-comment-to-rust.rs
@@ -68,6 +68,10 @@
}
impl Default for mbedtls_mpi {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
diff --git a/tests/expectations/tests/convert-floats.rs b/tests/expectations/tests/convert-floats.rs
index a183f43..6623159 100644
--- a/tests/expectations/tests/convert-floats.rs
+++ b/tests/expectations/tests/convert-floats.rs
@@ -85,6 +85,10 @@
}
impl Default for foo {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
diff --git a/tests/expectations/tests/ctypes-prefix-path.rs b/tests/expectations/tests/ctypes-prefix-path.rs
index af60878..12cedac 100644
--- a/tests/expectations/tests/ctypes-prefix-path.rs
+++ b/tests/expectations/tests/ctypes-prefix-path.rs
@@ -49,6 +49,10 @@
}
impl Default for foo {
fn default() -> Self {
- unsafe { ::core::mem::zeroed() }
+ let mut s = ::core::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::core::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
diff --git a/tests/expectations/tests/default-template-parameter.rs b/tests/expectations/tests/default-template-parameter.rs
index f42e23b..2cbe463 100644
--- a/tests/expectations/tests/default-template-parameter.rs
+++ b/tests/expectations/tests/default-template-parameter.rs
@@ -15,7 +15,11 @@
}
impl<T, U> Default for Foo<T, U> {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[test]
diff --git a/tests/expectations/tests/derive-bitfield-method-same-name.rs b/tests/expectations/tests/derive-bitfield-method-same-name.rs
index d1c1aef..1dc1d6e 100644
--- a/tests/expectations/tests/derive-bitfield-method-same-name.rs
+++ b/tests/expectations/tests/derive-bitfield-method-same-name.rs
@@ -139,7 +139,11 @@
}
impl Default for Foo {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
impl ::std::fmt::Debug for Foo {
diff --git a/tests/expectations/tests/derive-clone.rs b/tests/expectations/tests/derive-clone.rs
index e2dc7bd..e589a29 100644
--- a/tests/expectations/tests/derive-clone.rs
+++ b/tests/expectations/tests/derive-clone.rs
@@ -39,6 +39,10 @@
}
impl Default for ShouldDeriveClone {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
diff --git a/tests/expectations/tests/derive-clone_1_0.rs b/tests/expectations/tests/derive-clone_1_0.rs
index e5dc92d..a437d5c 100644
--- a/tests/expectations/tests/derive-clone_1_0.rs
+++ b/tests/expectations/tests/derive-clone_1_0.rs
@@ -45,6 +45,10 @@
}
impl Default for ShouldImplClone {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ unsafe {
+ let mut s: Self = ::std::mem::uninitialized();
+ ::std::ptr::write_bytes(&mut s, 0, 1);
+ s
+ }
}
}
diff --git a/tests/expectations/tests/derive-debug-bitfield-core.rs b/tests/expectations/tests/derive-debug-bitfield-core.rs
index 76fa20b..33f0f2f 100644
--- a/tests/expectations/tests/derive-debug-bitfield-core.rs
+++ b/tests/expectations/tests/derive-debug-bitfield-core.rs
@@ -127,7 +127,11 @@
}
impl Default for C {
fn default() -> Self {
- unsafe { ::core::mem::zeroed() }
+ let mut s = ::core::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::core::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
impl ::core::fmt::Debug for C {
diff --git a/tests/expectations/tests/derive-debug-bitfield.rs b/tests/expectations/tests/derive-debug-bitfield.rs
index d07642a..00976b5 100644
--- a/tests/expectations/tests/derive-debug-bitfield.rs
+++ b/tests/expectations/tests/derive-debug-bitfield.rs
@@ -125,7 +125,11 @@
}
impl Default for C {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
impl ::std::fmt::Debug for C {
diff --git a/tests/expectations/tests/derive-debug-function-pointer.rs b/tests/expectations/tests/derive-debug-function-pointer.rs
index 7052ff0..c031897 100644
--- a/tests/expectations/tests/derive-debug-function-pointer.rs
+++ b/tests/expectations/tests/derive-debug-function-pointer.rs
@@ -52,7 +52,11 @@
}
impl Default for Nice {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
impl ::std::fmt::Debug for Nice {
diff --git a/tests/expectations/tests/derive-debug-generic.rs b/tests/expectations/tests/derive-debug-generic.rs
index 88fd972..49d4e9b 100644
--- a/tests/expectations/tests/derive-debug-generic.rs
+++ b/tests/expectations/tests/derive-debug-generic.rs
@@ -12,7 +12,11 @@
}
impl<T> Default for Generic<T> {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
impl<T> ::std::fmt::Debug for Generic<T> {
diff --git a/tests/expectations/tests/derive-debug-mangle-name.rs b/tests/expectations/tests/derive-debug-mangle-name.rs
index d7f5c89..ed54164 100644
--- a/tests/expectations/tests/derive-debug-mangle-name.rs
+++ b/tests/expectations/tests/derive-debug-mangle-name.rs
@@ -59,7 +59,11 @@
}
impl Default for perf_event_attr__bindgen_ty_1 {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
impl ::std::fmt::Debug for perf_event_attr__bindgen_ty_1 {
@@ -107,7 +111,11 @@
}
impl Default for perf_event_attr {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
impl ::std::fmt::Debug for perf_event_attr {
diff --git a/tests/expectations/tests/derive-debug-opaque-template-instantiation.rs b/tests/expectations/tests/derive-debug-opaque-template-instantiation.rs
index 4e87368..ceb70ff 100644
--- a/tests/expectations/tests/derive-debug-opaque-template-instantiation.rs
+++ b/tests/expectations/tests/derive-debug-opaque-template-instantiation.rs
@@ -36,7 +36,11 @@
}
impl Default for Instance {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
impl ::std::fmt::Debug for Instance {
diff --git a/tests/expectations/tests/derive-debug-opaque.rs b/tests/expectations/tests/derive-debug-opaque.rs
index dfb264c..411c7a7 100644
--- a/tests/expectations/tests/derive-debug-opaque.rs
+++ b/tests/expectations/tests/derive-debug-opaque.rs
@@ -25,7 +25,11 @@
}
impl Default for Opaque {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
impl ::std::fmt::Debug for Opaque {
@@ -64,7 +68,11 @@
}
impl Default for OpaqueUser {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
impl ::std::fmt::Debug for OpaqueUser {
diff --git a/tests/expectations/tests/derive-default-and-blocklist.rs b/tests/expectations/tests/derive-default-and-blocklist.rs
index fca9c7f..5d53ede 100644
--- a/tests/expectations/tests/derive-default-and-blocklist.rs
+++ b/tests/expectations/tests/derive-default-and-blocklist.rs
@@ -41,6 +41,10 @@
}
impl Default for ShouldNotDeriveDefault {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
diff --git a/tests/expectations/tests/derive-hash-and-blocklist.rs b/tests/expectations/tests/derive-hash-and-blocklist.rs
index ba606a2..8e1190e 100644
--- a/tests/expectations/tests/derive-hash-and-blocklist.rs
+++ b/tests/expectations/tests/derive-hash-and-blocklist.rs
@@ -40,6 +40,10 @@
}
impl Default for ShouldNotDeriveHash {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
diff --git a/tests/expectations/tests/derive-hash-blocklisting.rs b/tests/expectations/tests/derive-hash-blocklisting.rs
index f9dbc82..7cd29c2 100644
--- a/tests/expectations/tests/derive-hash-blocklisting.rs
+++ b/tests/expectations/tests/derive-hash-blocklisting.rs
@@ -45,7 +45,11 @@
}
impl Default for AllowlistedOne {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
/// This can't derive(Hash/Eq) even if it didn't contain a blocklisted type.
@@ -80,6 +84,10 @@
}
impl Default for AllowlistedTwo {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
diff --git a/tests/expectations/tests/derive-hash-struct-with-pointer.rs b/tests/expectations/tests/derive-hash-struct-with-pointer.rs
index 152bffc..e98bbf0 100644
--- a/tests/expectations/tests/derive-hash-struct-with-pointer.rs
+++ b/tests/expectations/tests/derive-hash-struct-with-pointer.rs
@@ -38,7 +38,11 @@
}
impl Default for ConstPtrMutObj {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
@@ -73,7 +77,11 @@
}
impl Default for MutPtrMutObj {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
@@ -108,7 +116,11 @@
}
impl Default for MutPtrConstObj {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
@@ -144,6 +156,10 @@
}
impl Default for ConstPtrConstObj {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
diff --git a/tests/expectations/tests/derive-hash-template-def-float.rs b/tests/expectations/tests/derive-hash-template-def-float.rs
index 554eb8b..5e07a61 100644
--- a/tests/expectations/tests/derive-hash-template-def-float.rs
+++ b/tests/expectations/tests/derive-hash-template-def-float.rs
@@ -15,6 +15,10 @@
}
impl<T> Default for foo<T> {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
diff --git a/tests/expectations/tests/derive-hash-template-inst-float.rs b/tests/expectations/tests/derive-hash-template-inst-float.rs
index c0a7272..f861815 100644
--- a/tests/expectations/tests/derive-hash-template-inst-float.rs
+++ b/tests/expectations/tests/derive-hash-template-inst-float.rs
@@ -14,7 +14,11 @@
}
impl<T> Default for foo<T> {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
/// Can derive Hash/PartialOrd/Ord/PartialEq/Eq when instantiated with int
@@ -43,7 +47,11 @@
}
impl Default for IntStr {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
/// Cannot derive Hash/Eq/Ord when instantiated with float but can derive PartialEq/PartialOrd
@@ -77,7 +85,11 @@
}
impl Default for FloatStr {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[test]
diff --git a/tests/expectations/tests/derive-partialeq-and-blocklist.rs b/tests/expectations/tests/derive-partialeq-and-blocklist.rs
index b211933..d9dfb44 100644
--- a/tests/expectations/tests/derive-partialeq-and-blocklist.rs
+++ b/tests/expectations/tests/derive-partialeq-and-blocklist.rs
@@ -41,6 +41,10 @@
}
impl Default for ShouldNotDerivePartialEq {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
diff --git a/tests/expectations/tests/derive-partialeq-anonfield.rs b/tests/expectations/tests/derive-partialeq-anonfield.rs
index 8834ca3..16d4381 100644
--- a/tests/expectations/tests/derive-partialeq-anonfield.rs
+++ b/tests/expectations/tests/derive-partialeq-anonfield.rs
@@ -32,7 +32,11 @@
}
impl Default for rte_mbuf__bindgen_ty_1 {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[test]
@@ -50,6 +54,10 @@
}
impl Default for rte_mbuf {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
diff --git a/tests/expectations/tests/derive-partialeq-base.rs b/tests/expectations/tests/derive-partialeq-base.rs
index 9946616..cdf8dff 100644
--- a/tests/expectations/tests/derive-partialeq-base.rs
+++ b/tests/expectations/tests/derive-partialeq-base.rs
@@ -35,7 +35,11 @@
}
impl Default for Base {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
impl ::std::cmp::PartialEq for Base {
@@ -63,7 +67,11 @@
}
impl Default for ShouldDerivePartialEq {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
impl ::std::cmp::PartialEq for ShouldDerivePartialEq {
diff --git a/tests/expectations/tests/derive-partialeq-bitfield.rs b/tests/expectations/tests/derive-partialeq-bitfield.rs
index c7f1231..cffffca 100644
--- a/tests/expectations/tests/derive-partialeq-bitfield.rs
+++ b/tests/expectations/tests/derive-partialeq-bitfield.rs
@@ -125,7 +125,11 @@
}
impl Default for C {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
impl ::std::cmp::PartialEq for C {
diff --git a/tests/expectations/tests/derive-partialeq-core.rs b/tests/expectations/tests/derive-partialeq-core.rs
index cbe1f57..8cdfb92 100644
--- a/tests/expectations/tests/derive-partialeq-core.rs
+++ b/tests/expectations/tests/derive-partialeq-core.rs
@@ -39,7 +39,11 @@
}
impl Default for C {
fn default() -> Self {
- unsafe { ::core::mem::zeroed() }
+ let mut s = ::core::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::core::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
impl ::core::cmp::PartialEq for C {
diff --git a/tests/expectations/tests/derive-partialeq-pointer.rs b/tests/expectations/tests/derive-partialeq-pointer.rs
index 1964e37..17a5edc 100644
--- a/tests/expectations/tests/derive-partialeq-pointer.rs
+++ b/tests/expectations/tests/derive-partialeq-pointer.rs
@@ -30,7 +30,11 @@
}
impl Default for Bar {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
@@ -58,7 +62,11 @@
}
impl Default for c__bindgen_ty_1 {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[test]
@@ -76,7 +84,11 @@
}
impl Default for c {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
@@ -104,6 +116,10 @@
}
impl Default for a {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
diff --git a/tests/expectations/tests/derive-partialeq-union.rs b/tests/expectations/tests/derive-partialeq-union.rs
index b2ccb2e..b97c053 100644
--- a/tests/expectations/tests/derive-partialeq-union.rs
+++ b/tests/expectations/tests/derive-partialeq-union.rs
@@ -53,6 +53,10 @@
}
impl Default for ShouldNotDerivePartialEq {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
diff --git a/tests/expectations/tests/derive-partialeq-union_1_0.rs b/tests/expectations/tests/derive-partialeq-union_1_0.rs
index 4b675fc..2098849 100644
--- a/tests/expectations/tests/derive-partialeq-union_1_0.rs
+++ b/tests/expectations/tests/derive-partialeq-union_1_0.rs
@@ -102,7 +102,11 @@
}
impl Default for ShouldDerivePartialEq {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ unsafe {
+ let mut s: Self = ::std::mem::uninitialized();
+ ::std::ptr::write_bytes(&mut s, 0, 1);
+ s
+ }
}
}
impl ::std::cmp::PartialEq for ShouldDerivePartialEq {
diff --git a/tests/expectations/tests/doggo-or-null.rs b/tests/expectations/tests/doggo-or-null.rs
index 1d3bf5c..fa7a5e8 100644
--- a/tests/expectations/tests/doggo-or-null.rs
+++ b/tests/expectations/tests/doggo-or-null.rs
@@ -73,6 +73,10 @@
}
impl Default for DoggoOrNull {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
diff --git a/tests/expectations/tests/duplicated-namespaces-definitions.rs b/tests/expectations/tests/duplicated-namespaces-definitions.rs
index b79ccae..324fe2a 100644
--- a/tests/expectations/tests/duplicated-namespaces-definitions.rs
+++ b/tests/expectations/tests/duplicated-namespaces-definitions.rs
@@ -91,7 +91,11 @@
}
impl Default for Foo {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
}
diff --git a/tests/expectations/tests/empty-union.rs b/tests/expectations/tests/empty-union.rs
index 1f7d33d..c21ae2f 100644
--- a/tests/expectations/tests/empty-union.rs
+++ b/tests/expectations/tests/empty-union.rs
@@ -12,6 +12,10 @@
}
impl Default for a__bindgen_ty_1 {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
diff --git a/tests/expectations/tests/enum-default-bitfield.rs b/tests/expectations/tests/enum-default-bitfield.rs
index 3e8272a..1dc27fd 100644
--- a/tests/expectations/tests/enum-default-bitfield.rs
+++ b/tests/expectations/tests/enum-default-bitfield.rs
@@ -66,7 +66,11 @@
}
impl Default for foo {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
impl Foo {
@@ -145,3 +149,39 @@
/// <div rustbindgen nodebug></div>
#[derive(Copy, Clone, Hash, PartialEq, Eq)]
pub struct NoDebug(pub ::std::os::raw::c_uint);
+impl Debug {
+ pub const Debug1: Debug = Debug(0);
+}
+impl Debug {
+ pub const Debug2: Debug = Debug(1);
+}
+impl ::std::ops::BitOr<Debug> for Debug {
+ type Output = Self;
+ #[inline]
+ fn bitor(self, other: Self) -> Self {
+ Debug(self.0 | other.0)
+ }
+}
+impl ::std::ops::BitOrAssign for Debug {
+ #[inline]
+ fn bitor_assign(&mut self, rhs: Debug) {
+ self.0 |= rhs.0;
+ }
+}
+impl ::std::ops::BitAnd<Debug> for Debug {
+ type Output = Self;
+ #[inline]
+ fn bitand(self, other: Self) -> Self {
+ Debug(self.0 & other.0)
+ }
+}
+impl ::std::ops::BitAndAssign for Debug {
+ #[inline]
+ fn bitand_assign(&mut self, rhs: Debug) {
+ self.0 &= rhs.0;
+ }
+}
+#[repr(transparent)]
+/// <div rustbindgen derive="Debug"></div>
+#[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)]
+pub struct Debug(pub ::std::os::raw::c_uint);
\ No newline at end of file
diff --git a/tests/expectations/tests/enum-default-consts.rs b/tests/expectations/tests/enum-default-consts.rs
index e913bcb..5c023a3 100644
--- a/tests/expectations/tests/enum-default-consts.rs
+++ b/tests/expectations/tests/enum-default-consts.rs
@@ -38,7 +38,11 @@
}
impl Default for foo {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
pub const Foo_Bar: Foo = 0;
@@ -53,3 +57,7 @@
pub const NoDebug_NoDebug2: NoDebug = 1;
/// <div rustbindgen nodebug></div>
pub type NoDebug = ::std::os::raw::c_uint;
+pub const Debug_Debug1: Debug = 0;
+pub const Debug_Debug2: Debug = 1;
+/// <div rustbindgen derive="Debug"></div>
+pub type Debug = ::std::os::raw::c_uint;
\ No newline at end of file
diff --git a/tests/expectations/tests/enum-default-module.rs b/tests/expectations/tests/enum-default-module.rs
index b8355e3..156bbca 100644
--- a/tests/expectations/tests/enum-default-module.rs
+++ b/tests/expectations/tests/enum-default-module.rs
@@ -40,7 +40,11 @@
}
impl Default for foo {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
pub mod Foo {
@@ -59,3 +63,9 @@
pub const NoDebug1: Type = 0;
pub const NoDebug2: Type = 1;
}
+pub mod Debug {
+ /// <div rustbindgen derive="Debug"></div>
+ pub type Type = ::std::os::raw::c_uint;
+ pub const Debug1: Type = 0;
+ pub const Debug2: Type = 1;
+}
\ No newline at end of file
diff --git a/tests/expectations/tests/enum-default-rust.rs b/tests/expectations/tests/enum-default-rust.rs
index 8c697dc..045330a 100644
--- a/tests/expectations/tests/enum-default-rust.rs
+++ b/tests/expectations/tests/enum-default-rust.rs
@@ -43,7 +43,11 @@
}
impl Default for foo {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(u32)]
@@ -64,3 +68,10 @@
NoDebug1 = 0,
NoDebug2 = 1,
}
+#[repr(u32)]
+/// <div rustbindgen derive="Debug"></div>
+#[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)]
+pub enum Debug {
+ Debug1 = 0,
+ Debug2 = 1,
+}
\ No newline at end of file
diff --git a/tests/expectations/tests/enum-no-debug-rust.rs b/tests/expectations/tests/enum-no-debug-rust.rs
new file mode 100644
index 0000000..fa06fbc
--- /dev/null
+++ b/tests/expectations/tests/enum-no-debug-rust.rs
@@ -0,0 +1,77 @@
+#![allow(
+ dead_code,
+ non_snake_case,
+ non_camel_case_types,
+ non_upper_case_globals
+)]
+
+#[repr(C)]
+#[derive(Copy, Clone)]
+pub struct foo {
+ pub member: foo__bindgen_ty_1,
+}
+pub const foo_FOO_A: foo__bindgen_ty_1 = foo__bindgen_ty_1::FOO_A;
+pub const foo_FOO_B: foo__bindgen_ty_1 = foo__bindgen_ty_1::FOO_B;
+#[repr(u32)]
+#[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)]
+pub enum foo__bindgen_ty_1 {
+ FOO_A = 0,
+ FOO_B = 1,
+}
+#[test]
+fn bindgen_test_layout_foo() {
+ assert_eq!(
+ ::std::mem::size_of::<foo>(),
+ 4usize,
+ concat!("Size of: ", stringify!(foo))
+ );
+ assert_eq!(
+ ::std::mem::align_of::<foo>(),
+ 4usize,
+ concat!("Alignment of ", stringify!(foo))
+ );
+ assert_eq!(
+ unsafe { &(*(::std::ptr::null::<foo>())).member as *const _ as usize },
+ 0usize,
+ concat!(
+ "Offset of field: ",
+ stringify!(foo),
+ "::",
+ stringify!(member)
+ )
+ );
+}
+impl Default for foo {
+ fn default() -> Self {
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
+ }
+}
+#[repr(u32)]
+#[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)]
+pub enum Foo {
+ Bar = 0,
+ Qux = 1,
+}
+pub mod Neg {
+ pub type Type = ::std::os::raw::c_int;
+ pub const MinusOne: Type = -1;
+ pub const One: Type = 1;
+}
+#[repr(u32)]
+/// <div rustbindgen nodebug></div>
+#[derive(Copy, Clone, Hash, PartialEq, Eq)]
+pub enum NoDebug {
+ NoDebug1 = 0,
+ NoDebug2 = 1,
+}
+#[repr(u32)]
+/// <div rustbindgen derive="Debug"></div>
+#[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)]
+pub enum Debug {
+ Debug1 = 0,
+ Debug2 = 1,
+}
\ No newline at end of file
diff --git a/tests/expectations/tests/enum.rs b/tests/expectations/tests/enum.rs
index e4a7227..cc3f493 100644
--- a/tests/expectations/tests/enum.rs
+++ b/tests/expectations/tests/enum.rs
@@ -38,7 +38,11 @@
}
impl Default for foo {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
pub const Foo_Bar: Foo = 0;
@@ -51,3 +55,7 @@
pub const NoDebug_NoDebug2: NoDebug = 1;
/// <div rustbindgen nodebug></div>
pub type NoDebug = ::std::os::raw::c_uint;
+pub const Debug_Debug1: Debug = 0;
+pub const Debug_Debug2: Debug = 1;
+/// <div rustbindgen derive="Debug"></div>
+pub type Debug = ::std::os::raw::c_uint;
\ No newline at end of file
diff --git a/tests/expectations/tests/enum_and_vtable_mangling.rs b/tests/expectations/tests/enum_and_vtable_mangling.rs
index 5eaaec9..9e9c6bc 100644
--- a/tests/expectations/tests/enum_and_vtable_mangling.rs
+++ b/tests/expectations/tests/enum_and_vtable_mangling.rs
@@ -41,7 +41,11 @@
}
impl Default for C {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
extern "C" {
diff --git a/tests/expectations/tests/explicit-padding.rs b/tests/expectations/tests/explicit-padding.rs
new file mode 100644
index 0000000..e395e5d
--- /dev/null
+++ b/tests/expectations/tests/explicit-padding.rs
@@ -0,0 +1,65 @@
+#![allow(
+ dead_code,
+ non_snake_case,
+ non_camel_case_types,
+ non_upper_case_globals
+)]
+
+#[repr(C)]
+#[derive(Debug, Default, Copy, Clone)]
+pub struct pad_me {
+ pub first: u8,
+ pub __bindgen_padding_0: [u8; 3usize],
+ pub second: u32,
+ pub third: u16,
+ pub __bindgen_padding_1: [u8; 2usize],
+}
+#[test]
+fn bindgen_test_layout_pad_me() {
+ assert_eq!(
+ ::std::mem::size_of::<pad_me>(),
+ 12usize,
+ concat!("Size of: ", stringify!(pad_me))
+ );
+ assert_eq!(
+ ::std::mem::align_of::<pad_me>(),
+ 4usize,
+ concat!("Alignment of ", stringify!(pad_me))
+ );
+ assert_eq!(
+ unsafe {
+ &(*(::std::ptr::null::<pad_me>())).first as *const _ as usize
+ },
+ 0usize,
+ concat!(
+ "Offset of field: ",
+ stringify!(pad_me),
+ "::",
+ stringify!(first)
+ )
+ );
+ assert_eq!(
+ unsafe {
+ &(*(::std::ptr::null::<pad_me>())).second as *const _ as usize
+ },
+ 4usize,
+ concat!(
+ "Offset of field: ",
+ stringify!(pad_me),
+ "::",
+ stringify!(second)
+ )
+ );
+ assert_eq!(
+ unsafe {
+ &(*(::std::ptr::null::<pad_me>())).third as *const _ as usize
+ },
+ 8usize,
+ concat!(
+ "Offset of field: ",
+ stringify!(pad_me),
+ "::",
+ stringify!(third)
+ )
+ );
+}
diff --git a/tests/expectations/tests/extern-const-struct.rs b/tests/expectations/tests/extern-const-struct.rs
index 0f515ed..fa0018b 100644
--- a/tests/expectations/tests/extern-const-struct.rs
+++ b/tests/expectations/tests/extern-const-struct.rs
@@ -37,7 +37,11 @@
}
impl Default for nsFoo {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
extern "C" {
diff --git a/tests/expectations/tests/forward-declaration-autoptr.rs b/tests/expectations/tests/forward-declaration-autoptr.rs
index 33a92bb..bf0b692 100644
--- a/tests/expectations/tests/forward-declaration-autoptr.rs
+++ b/tests/expectations/tests/forward-declaration-autoptr.rs
@@ -18,7 +18,11 @@
}
impl<T> Default for RefPtr<T> {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
@@ -53,7 +57,11 @@
}
impl Default for Bar {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[test]
diff --git a/tests/expectations/tests/forward-inherit-struct-with-fields.rs b/tests/expectations/tests/forward-inherit-struct-with-fields.rs
index cae75bf..330d766 100644
--- a/tests/expectations/tests/forward-inherit-struct-with-fields.rs
+++ b/tests/expectations/tests/forward-inherit-struct-with-fields.rs
@@ -14,7 +14,11 @@
}
impl<T> Default for js_RootedBase<T> {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
@@ -25,6 +29,10 @@
}
impl<T> Default for Rooted<T> {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
diff --git a/tests/expectations/tests/forward-inherit-struct.rs b/tests/expectations/tests/forward-inherit-struct.rs
index ae565be..2c4546e 100644
--- a/tests/expectations/tests/forward-inherit-struct.rs
+++ b/tests/expectations/tests/forward-inherit-struct.rs
@@ -17,6 +17,10 @@
}
impl Default for Rooted {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
diff --git a/tests/expectations/tests/forward_declared_complex_types.rs b/tests/expectations/tests/forward_declared_complex_types.rs
index c35d914..e185e83 100644
--- a/tests/expectations/tests/forward_declared_complex_types.rs
+++ b/tests/expectations/tests/forward_declared_complex_types.rs
@@ -53,7 +53,11 @@
}
impl Default for Bar {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
extern "C" {
diff --git a/tests/expectations/tests/forward_declared_complex_types_1_0.rs b/tests/expectations/tests/forward_declared_complex_types_1_0.rs
index 9fea597..c6331c6 100644
--- a/tests/expectations/tests/forward_declared_complex_types_1_0.rs
+++ b/tests/expectations/tests/forward_declared_complex_types_1_0.rs
@@ -68,7 +68,11 @@
}
impl Default for Bar {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ unsafe {
+ let mut s: Self = ::std::mem::uninitialized();
+ ::std::ptr::write_bytes(&mut s, 0, 1);
+ s
+ }
}
}
extern "C" {
diff --git a/tests/expectations/tests/incomplete-array-padding.rs b/tests/expectations/tests/incomplete-array-padding.rs
index a0fa750..18061ea 100644
--- a/tests/expectations/tests/incomplete-array-padding.rs
+++ b/tests/expectations/tests/incomplete-array-padding.rs
@@ -143,7 +143,11 @@
}
impl Default for foo {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
impl foo {
diff --git a/tests/expectations/tests/inherit-from-template-instantiation-with-vtable.rs b/tests/expectations/tests/inherit-from-template-instantiation-with-vtable.rs
index c488713..f292125 100644
--- a/tests/expectations/tests/inherit-from-template-instantiation-with-vtable.rs
+++ b/tests/expectations/tests/inherit-from-template-instantiation-with-vtable.rs
@@ -17,7 +17,11 @@
}
impl<T> Default for BaseWithVtable<T> {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
/// This should not have an explicit vtable.
@@ -41,7 +45,11 @@
}
impl Default for DerivedWithNoVirtualMethods {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
/// This should not have an explicit vtable.
@@ -65,7 +73,11 @@
}
impl Default for DerivedWithVirtualMethods {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
/// This should not have any vtable.
@@ -77,7 +89,11 @@
}
impl<U> Default for BaseWithoutVtable<U> {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
@@ -104,7 +120,11 @@
}
impl Default for DerivedWithVtable {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
/// This should not have any vtable.
@@ -128,7 +148,11 @@
}
impl Default for DerivedWithoutVtable {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[test]
diff --git a/tests/expectations/tests/inherit-namespaced.rs b/tests/expectations/tests/inherit-namespaced.rs
index ae565be..2c4546e 100644
--- a/tests/expectations/tests/inherit-namespaced.rs
+++ b/tests/expectations/tests/inherit-namespaced.rs
@@ -17,6 +17,10 @@
}
impl Default for Rooted {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
diff --git a/tests/expectations/tests/inherit_named.rs b/tests/expectations/tests/inherit_named.rs
index 77de3ec..a8eee20 100644
--- a/tests/expectations/tests/inherit_named.rs
+++ b/tests/expectations/tests/inherit_named.rs
@@ -18,6 +18,10 @@
}
impl<T> Default for Weeee<T> {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
diff --git a/tests/expectations/tests/inline_namespace_no_ns_enabled.rs b/tests/expectations/tests/inline_namespace_no_ns_enabled.rs
index 20bac9a..7a0c993 100644
--- a/tests/expectations/tests/inline_namespace_no_ns_enabled.rs
+++ b/tests/expectations/tests/inline_namespace_no_ns_enabled.rs
@@ -20,7 +20,11 @@
}
impl Default for std_basic_string_Alloc_hider {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
@@ -31,11 +35,19 @@
}
impl<CharT> Default for std_basic_string__bindgen_ty_1<CharT> {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
impl<CharT> Default for std_basic_string<CharT> {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
diff --git a/tests/expectations/tests/inner_template_self.rs b/tests/expectations/tests/inner_template_self.rs
index f3e153f..3361a1f 100644
--- a/tests/expectations/tests/inner_template_self.rs
+++ b/tests/expectations/tests/inner_template_self.rs
@@ -13,7 +13,11 @@
}
impl Default for LinkedList {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
@@ -49,7 +53,11 @@
}
impl Default for InstantiateIt {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[test]
diff --git a/tests/expectations/tests/issue-1113-template-references.rs b/tests/expectations/tests/issue-1113-template-references.rs
index 79a06da..c146583 100644
--- a/tests/expectations/tests/issue-1113-template-references.rs
+++ b/tests/expectations/tests/issue-1113-template-references.rs
@@ -15,7 +15,11 @@
}
impl<K, V> Default for Entry<K, V> {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
@@ -34,6 +38,10 @@
}
impl<K, V> Default for nsBaseHashtable_EntryPtr<K, V> {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
diff --git a/tests/expectations/tests/issue-1118-using-forward-decl.rs b/tests/expectations/tests/issue-1118-using-forward-decl.rs
index df764a5..99f0341 100644
--- a/tests/expectations/tests/issue-1118-using-forward-decl.rs
+++ b/tests/expectations/tests/issue-1118-using-forward-decl.rs
@@ -38,7 +38,11 @@
}
impl Default for nsTArray_base {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
@@ -48,7 +52,11 @@
}
impl Default for nsTArray {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
@@ -83,7 +91,11 @@
}
impl Default for nsIContent {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
extern "C" {
diff --git a/tests/expectations/tests/issue-1197-pure-virtual-stuff.rs b/tests/expectations/tests/issue-1197-pure-virtual-stuff.rs
index 9232767..fd02336 100644
--- a/tests/expectations/tests/issue-1197-pure-virtual-stuff.rs
+++ b/tests/expectations/tests/issue-1197-pure-virtual-stuff.rs
@@ -27,6 +27,10 @@
}
impl Default for Foo {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
diff --git a/tests/expectations/tests/issue-1285.rs b/tests/expectations/tests/issue-1285.rs
index 4ca8452..15b8c9e 100644
--- a/tests/expectations/tests/issue-1285.rs
+++ b/tests/expectations/tests/issue-1285.rs
@@ -55,7 +55,11 @@
}
impl Default for foo__bindgen_ty_1 {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[test]
@@ -78,6 +82,10 @@
}
impl Default for foo {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
diff --git a/tests/expectations/tests/issue-1443.rs b/tests/expectations/tests/issue-1443.rs
index b02a2c4..f422f4c 100644
--- a/tests/expectations/tests/issue-1443.rs
+++ b/tests/expectations/tests/issue-1443.rs
@@ -41,7 +41,11 @@
}
impl Default for Bar {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
@@ -75,7 +79,11 @@
}
impl Default for Baz {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
@@ -109,7 +117,11 @@
}
impl Default for Tar {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
@@ -143,6 +155,10 @@
}
impl Default for Taz {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
diff --git a/tests/expectations/tests/issue-1498.rs b/tests/expectations/tests/issue-1498.rs
index b14f06c..4f8a893 100644
--- a/tests/expectations/tests/issue-1498.rs
+++ b/tests/expectations/tests/issue-1498.rs
@@ -72,7 +72,11 @@
}
impl Default for rte_memseg__bindgen_ty_1 {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[test]
@@ -165,6 +169,10 @@
}
impl Default for rte_memseg {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
diff --git a/tests/expectations/tests/issue-1514.rs b/tests/expectations/tests/issue-1514.rs
index b2c11ea..31939ca 100644
--- a/tests/expectations/tests/issue-1514.rs
+++ b/tests/expectations/tests/issue-1514.rs
@@ -18,7 +18,11 @@
}
impl<T> Default for Thing_Inner<T> {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
@@ -29,6 +33,10 @@
}
impl<T> Default for Thing_AnotherInner<T> {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
diff --git a/tests/expectations/tests/issue-1977-larger-arrays.rs b/tests/expectations/tests/issue-1977-larger-arrays.rs
new file mode 100644
index 0000000..54e5b43
--- /dev/null
+++ b/tests/expectations/tests/issue-1977-larger-arrays.rs
@@ -0,0 +1,61 @@
+#![allow(
+ dead_code,
+ non_snake_case,
+ non_camel_case_types,
+ non_upper_case_globals
+)]
+
+#[repr(C)]
+#[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)]
+pub struct S {
+ pub large_array: [::std::os::raw::c_char; 33usize],
+}
+#[test]
+fn bindgen_test_layout_S() {
+ assert_eq!(
+ ::std::mem::size_of::<S>(),
+ 33usize,
+ concat!("Size of: ", stringify!(S))
+ );
+ assert_eq!(
+ ::std::mem::align_of::<S>(),
+ 1usize,
+ concat!("Alignment of ", stringify!(S))
+ );
+ assert_eq!(
+ unsafe {
+ &(*(::std::ptr::null::<S>())).large_array as *const _ as usize
+ },
+ 0usize,
+ concat!(
+ "Offset of field: ",
+ stringify!(S),
+ "::",
+ stringify!(large_array)
+ )
+ );
+}
+impl Default for S {
+ fn default() -> Self {
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
+ }
+}
+#[repr(C)]
+#[derive(Debug, Hash, PartialEq, Eq)]
+pub struct ST<T> {
+ pub large_array: [T; 33usize],
+ pub _phantom_0: ::std::marker::PhantomData<::std::cell::UnsafeCell<T>>,
+}
+impl<T> Default for ST<T> {
+ fn default() -> Self {
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
+ }
+}
diff --git a/tests/expectations/tests/issue-358.rs b/tests/expectations/tests/issue-358.rs
index 320c7e1..e9ee0f5 100644
--- a/tests/expectations/tests/issue-358.rs
+++ b/tests/expectations/tests/issue-358.rs
@@ -12,7 +12,11 @@
}
impl Default for JS_PersistentRooted {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
@@ -22,6 +26,10 @@
}
impl Default for a {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
diff --git a/tests/expectations/tests/issue-372.rs b/tests/expectations/tests/issue-372.rs
index ce6e36c..0cd9f7a 100644
--- a/tests/expectations/tests/issue-372.rs
+++ b/tests/expectations/tests/issue-372.rs
@@ -46,7 +46,11 @@
}
impl Default for i {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
@@ -74,7 +78,11 @@
}
impl Default for d {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(u32)]
@@ -117,7 +125,11 @@
}
impl Default for F {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
}
diff --git a/tests/expectations/tests/issue-446.rs b/tests/expectations/tests/issue-446.rs
index 6c9cae4..db69f15 100644
--- a/tests/expectations/tests/issue-446.rs
+++ b/tests/expectations/tests/issue-446.rs
@@ -12,7 +12,11 @@
}
impl Default for List {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
@@ -22,6 +26,10 @@
}
impl Default for PersistentRooted {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
diff --git a/tests/expectations/tests/issue-493.rs b/tests/expectations/tests/issue-493.rs
index d17fbec..61c7f79 100644
--- a/tests/expectations/tests/issue-493.rs
+++ b/tests/expectations/tests/issue-493.rs
@@ -65,7 +65,11 @@
}
impl Default for basic_string___long {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
pub const basic_string___min_cap: basic_string__bindgen_ty_1 =
@@ -87,12 +91,20 @@
}
impl Default for basic_string___short__bindgen_ty_1 {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
impl Default for basic_string___short {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
@@ -104,7 +116,11 @@
}
impl Default for basic_string___ulx {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
pub const basic_string___n_words: basic_string__bindgen_ty_2 =
@@ -121,7 +137,11 @@
}
impl Default for basic_string___raw {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
@@ -138,11 +158,19 @@
}
impl Default for basic_string___rep__bindgen_ty_1 {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
impl Default for basic_string___rep {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
diff --git a/tests/expectations/tests/issue-493_1_0.rs b/tests/expectations/tests/issue-493_1_0.rs
index c42d06b..1a0131c 100644
--- a/tests/expectations/tests/issue-493_1_0.rs
+++ b/tests/expectations/tests/issue-493_1_0.rs
@@ -65,7 +65,11 @@
}
impl Default for basic_string___long {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ unsafe {
+ let mut s: Self = ::std::mem::uninitialized();
+ ::std::ptr::write_bytes(&mut s, 0, 1);
+ s
+ }
}
}
pub const basic_string___min_cap: basic_string__bindgen_ty_1 =
@@ -90,7 +94,11 @@
}
impl Default for basic_string___short {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ unsafe {
+ let mut s: Self = ::std::mem::uninitialized();
+ ::std::ptr::write_bytes(&mut s, 0, 1);
+ s
+ }
}
}
#[repr(C)]
@@ -114,7 +122,11 @@
}
impl Default for basic_string___raw {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ unsafe {
+ let mut s: Self = ::std::mem::uninitialized();
+ ::std::ptr::write_bytes(&mut s, 0, 1);
+ s
+ }
}
}
#[repr(C)]
diff --git a/tests/expectations/tests/issue-544-stylo-creduce-2.rs b/tests/expectations/tests/issue-544-stylo-creduce-2.rs
index 5a6242e..6165419 100644
--- a/tests/expectations/tests/issue-544-stylo-creduce-2.rs
+++ b/tests/expectations/tests/issue-544-stylo-creduce-2.rs
@@ -13,6 +13,10 @@
pub type Foo_SecondAlias = [u8; 0usize];
impl Default for Foo {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
diff --git a/tests/expectations/tests/issue-569-non-type-template-params-causing-layout-test-failures.rs b/tests/expectations/tests/issue-569-non-type-template-params-causing-layout-test-failures.rs
index 4b2fa7a..997a731 100644
--- a/tests/expectations/tests/issue-569-non-type-template-params-causing-layout-test-failures.rs
+++ b/tests/expectations/tests/issue-569-non-type-template-params-causing-layout-test-failures.rs
@@ -21,7 +21,11 @@
}
impl Default for JS_Base {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
@@ -44,7 +48,11 @@
}
impl Default for JS_AutoIdVector {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[test]
diff --git a/tests/expectations/tests/issue-584-stylo-template-analysis-panic.rs b/tests/expectations/tests/issue-584-stylo-template-analysis-panic.rs
index 6148999..01abdcc 100644
--- a/tests/expectations/tests/issue-584-stylo-template-analysis-panic.rs
+++ b/tests/expectations/tests/issue-584-stylo-template-analysis-panic.rs
@@ -33,7 +33,11 @@
}
impl<c> Default for e<c> {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
@@ -65,7 +69,11 @@
}
impl Default for g {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
@@ -87,7 +95,11 @@
}
impl Default for b {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
extern "C" {
diff --git a/tests/expectations/tests/issue-638-stylo-cannot-find-T-in-this-scope.rs b/tests/expectations/tests/issue-638-stylo-cannot-find-T-in-this-scope.rs
index 8c3ad47..ba886f3 100644
--- a/tests/expectations/tests/issue-638-stylo-cannot-find-T-in-this-scope.rs
+++ b/tests/expectations/tests/issue-638-stylo-cannot-find-T-in-this-scope.rs
@@ -13,7 +13,11 @@
}
impl<T> Default for RefPtr<T> {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
@@ -25,6 +29,10 @@
pub type UsesRefPtrWithAliasedTypeParam_V<U> = U;
impl<U> Default for UsesRefPtrWithAliasedTypeParam<U> {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
diff --git a/tests/expectations/tests/issue-643-inner-struct.rs b/tests/expectations/tests/issue-643-inner-struct.rs
index 35a5e52..0728500 100644
--- a/tests/expectations/tests/issue-643-inner-struct.rs
+++ b/tests/expectations/tests/issue-643-inner-struct.rs
@@ -120,7 +120,11 @@
}
impl Default for rte_ring {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
diff --git a/tests/expectations/tests/issue-645-cannot-find-type-T-in-this-scope.rs b/tests/expectations/tests/issue-645-cannot-find-type-T-in-this-scope.rs
index 176fae6..75d6581 100644
--- a/tests/expectations/tests/issue-645-cannot-find-type-T-in-this-scope.rs
+++ b/tests/expectations/tests/issue-645-cannot-find-type-T-in-this-scope.rs
@@ -16,6 +16,10 @@
pub type HasRefPtr_TypedefOfT<T> = T;
impl<T> Default for HasRefPtr<T> {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
diff --git a/tests/expectations/tests/issue-648-derive-debug-with-padding.rs b/tests/expectations/tests/issue-648-derive-debug-with-padding.rs
index e6d529f..4355486 100644
--- a/tests/expectations/tests/issue-648-derive-debug-with-padding.rs
+++ b/tests/expectations/tests/issue-648-derive-debug-with-padding.rs
@@ -6,9 +6,7 @@
)]
/// We emit a `[u8; 63usize]` padding field for this struct, which cannot derive
-/// Debug/Hash because 63 is over the hard coded limit. (Yes, this struct doesn't end
-/// up with the reight alignment, we're waiting on `#[repr(align="N")]` to land
-/// in rustc).
+/// Debug/Hash because 63 is over the hard coded limit.
#[repr(C)]
#[repr(align(64))]
#[derive(Copy, Clone)]
@@ -40,7 +38,11 @@
}
impl Default for NoDebug {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
impl ::std::cmp::PartialEq for NoDebug {
@@ -51,7 +53,7 @@
/// This should derive Debug/Hash/PartialEq/Eq because the padding size is less than the max derive
/// Debug/Hash/PartialEq/Eq impl for arrays. However, we conservatively don't derive Debug/Hash because
/// we determine Debug derive-ability before we compute padding, which happens at
-/// codegen. (Again, we expect to get the alignment wrong for similar reasons.)
+/// codegen.
#[repr(C)]
#[repr(align(64))]
#[derive(Copy, Clone)]
@@ -100,7 +102,11 @@
}
impl Default for ShouldDeriveDebugButDoesNot {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
impl ::std::cmp::PartialEq for ShouldDeriveDebugButDoesNot {
diff --git a/tests/expectations/tests/issue-662-cannot-find-T-in-this-scope.rs b/tests/expectations/tests/issue-662-cannot-find-T-in-this-scope.rs
index d12c871..5636a97 100644
--- a/tests/expectations/tests/issue-662-cannot-find-T-in-this-scope.rs
+++ b/tests/expectations/tests/issue-662-cannot-find-T-in-this-scope.rs
@@ -13,7 +13,11 @@
}
impl<T> Default for RefPtr<T> {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
@@ -24,7 +28,11 @@
}
impl<T> Default for nsMainThreadPtrHolder<T> {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
@@ -35,6 +43,10 @@
}
impl<T> Default for nsMainThreadPtrHandle<T> {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
diff --git a/tests/expectations/tests/issue-662-part-2.rs b/tests/expectations/tests/issue-662-part-2.rs
index d08e6fb..e8d14bf 100644
--- a/tests/expectations/tests/issue-662-part-2.rs
+++ b/tests/expectations/tests/issue-662-part-2.rs
@@ -16,7 +16,11 @@
}
impl<T> Default for nsMainThreadPtrHolder<T> {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
@@ -26,6 +30,10 @@
}
impl<U> Default for nsMainThreadPtrHandle<U> {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
diff --git a/tests/expectations/tests/issue-691-template-parameter-virtual.rs b/tests/expectations/tests/issue-691-template-parameter-virtual.rs
index 3d20728..4747b95 100644
--- a/tests/expectations/tests/issue-691-template-parameter-virtual.rs
+++ b/tests/expectations/tests/issue-691-template-parameter-virtual.rs
@@ -27,7 +27,11 @@
}
impl Default for VirtualMethods {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
@@ -55,7 +59,11 @@
}
impl Default for ServoElementSnapshotTable {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[test]
diff --git a/tests/expectations/tests/issue-710-must-use-type.rs b/tests/expectations/tests/issue-710-must-use-type.rs
new file mode 100644
index 0000000..1d59824
--- /dev/null
+++ b/tests/expectations/tests/issue-710-must-use-type.rs
@@ -0,0 +1,25 @@
+#![allow(
+ dead_code,
+ non_snake_case,
+ non_camel_case_types,
+ non_upper_case_globals
+)]
+
+#[repr(C)]
+#[derive(Debug, Copy, Clone)]
+#[must_use]
+pub struct A {
+ _unused: [u8; 0],
+}
+/// <div rustbindgen mustusetype></div>
+#[repr(C)]
+#[derive(Debug, Copy, Clone)]
+#[must_use]
+pub struct B {
+ _unused: [u8; 0],
+}
+#[repr(C)]
+#[derive(Debug, Copy, Clone)]
+pub struct C {
+ _unused: [u8; 0],
+}
diff --git a/tests/expectations/tests/issue-848-replacement-system-include.rs b/tests/expectations/tests/issue-848-replacement-system-include.rs
index af91e1e..294df57 100644
--- a/tests/expectations/tests/issue-848-replacement-system-include.rs
+++ b/tests/expectations/tests/issue-848-replacement-system-include.rs
@@ -19,7 +19,11 @@
}
impl<T> Default for nsTArray<T> {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
extern "C" {
diff --git a/tests/expectations/tests/issue-944-derive-copy-and-blocklisting.rs b/tests/expectations/tests/issue-944-derive-copy-and-blocklisting.rs
index 51e9796..dc50fe1 100644
--- a/tests/expectations/tests/issue-944-derive-copy-and-blocklisting.rs
+++ b/tests/expectations/tests/issue-944-derive-copy-and-blocklisting.rs
@@ -39,6 +39,10 @@
}
impl Default for ShouldNotBeCopy {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
diff --git a/tests/expectations/tests/jsval_layout_opaque.rs b/tests/expectations/tests/jsval_layout_opaque.rs
index 8a3d7f3..5b84279 100644
--- a/tests/expectations/tests/jsval_layout_opaque.rs
+++ b/tests/expectations/tests/jsval_layout_opaque.rs
@@ -211,7 +211,11 @@
}
impl Default for jsval_layout__bindgen_ty_1 {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
impl jsval_layout__bindgen_ty_1 {
@@ -331,7 +335,11 @@
}
impl Default for jsval_layout__bindgen_ty_2__bindgen_ty_1 {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[test]
@@ -362,7 +370,11 @@
}
impl Default for jsval_layout__bindgen_ty_2 {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[test]
@@ -467,7 +479,11 @@
}
impl Default for jsval_layout {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
@@ -500,6 +516,10 @@
}
impl Default for Value {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
diff --git a/tests/expectations/tests/jsval_layout_opaque_1_0.rs b/tests/expectations/tests/jsval_layout_opaque_1_0.rs
index e593a2c..260282d 100644
--- a/tests/expectations/tests/jsval_layout_opaque_1_0.rs
+++ b/tests/expectations/tests/jsval_layout_opaque_1_0.rs
@@ -260,7 +260,11 @@
}
impl Default for jsval_layout__bindgen_ty_1 {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ unsafe {
+ let mut s: Self = ::std::mem::uninitialized();
+ ::std::ptr::write_bytes(&mut s, 0, 1);
+ s
+ }
}
}
impl jsval_layout__bindgen_ty_1 {
diff --git a/tests/expectations/tests/layout.rs b/tests/expectations/tests/layout.rs
index cf42d30..ae41725 100644
--- a/tests/expectations/tests/layout.rs
+++ b/tests/expectations/tests/layout.rs
@@ -19,6 +19,10 @@
}
impl Default for header {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ unsafe {
+ let mut s: Self = ::std::mem::uninitialized();
+ ::std::ptr::write_bytes(&mut s, 0, 1);
+ s
+ }
}
}
diff --git a/tests/expectations/tests/layout_align.rs b/tests/expectations/tests/layout_align.rs
index 44998a8..cb34df3 100644
--- a/tests/expectations/tests/layout_align.rs
+++ b/tests/expectations/tests/layout_align.rs
@@ -150,7 +150,11 @@
}
impl Default for rte_kni_fifo {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
diff --git a/tests/expectations/tests/layout_array.rs b/tests/expectations/tests/layout_array.rs
index 3ca20b0..3ba1b6d 100644
--- a/tests/expectations/tests/layout_array.rs
+++ b/tests/expectations/tests/layout_array.rs
@@ -160,7 +160,11 @@
}
impl Default for rte_mempool_ops {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
impl ::std::cmp::PartialEq for rte_mempool_ops {
@@ -279,7 +283,11 @@
}
impl Default for rte_mempool_ops_table {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
/// Structure to hold malloc heap
@@ -325,7 +333,11 @@
}
impl Default for malloc_heap__bindgen_ty_1 {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[test]
@@ -394,7 +406,11 @@
}
impl Default for malloc_heap {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
impl ::std::cmp::PartialEq for malloc_heap {
diff --git a/tests/expectations/tests/layout_array_too_long.rs b/tests/expectations/tests/layout_array_too_long.rs
index 9fe993a..c9880ea 100644
--- a/tests/expectations/tests/layout_array_too_long.rs
+++ b/tests/expectations/tests/layout_array_too_long.rs
@@ -78,7 +78,11 @@
}
impl Default for ip_frag {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
/// @internal <src addr, dst_addr, id> to uniquely indetify fragmented datagram.
@@ -209,7 +213,11 @@
}
impl Default for ip_frag_pkt__bindgen_ty_1 {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[test]
@@ -314,7 +322,11 @@
}
impl Default for ip_frag_pkt {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
impl ::std::cmp::PartialEq for ip_frag_pkt {
diff --git a/tests/expectations/tests/layout_cmdline_token.rs b/tests/expectations/tests/layout_cmdline_token.rs
index 601e88b..47170dd 100644
--- a/tests/expectations/tests/layout_cmdline_token.rs
+++ b/tests/expectations/tests/layout_cmdline_token.rs
@@ -54,9 +54,15 @@
}
impl Default for cmdline_token_hdr {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
+/// Stores a pointer to the ops struct, and the offset: the place to
+/// write the parsed result in the destination structure.
pub type cmdline_parse_token_hdr_t = cmdline_token_hdr;
/// A token is defined by this structure.
///
@@ -221,7 +227,11 @@
}
impl Default for cmdline_token_num_data {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
@@ -271,7 +281,11 @@
}
impl Default for cmdline_token_num {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
pub type cmdline_parse_token_num_t = cmdline_token_num;
diff --git a/tests/expectations/tests/layout_eth_conf.rs b/tests/expectations/tests/layout_eth_conf.rs
index fe8b92f..e880608 100644
--- a/tests/expectations/tests/layout_eth_conf.rs
+++ b/tests/expectations/tests/layout_eth_conf.rs
@@ -212,7 +212,11 @@
}
impl Default for rte_eth_rxmode {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
impl rte_eth_rxmode {
@@ -459,7 +463,11 @@
}
impl Default for rte_eth_txmode {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
impl rte_eth_txmode {
@@ -607,7 +615,11 @@
}
impl Default for rte_eth_rss_conf {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(u32)]
@@ -801,7 +813,11 @@
}
impl Default for rte_eth_vmdq_dcb_conf {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
@@ -853,7 +869,11 @@
}
impl Default for rte_eth_dcb_rx_conf {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
@@ -905,7 +925,11 @@
}
impl Default for rte_eth_vmdq_dcb_tx_conf {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
@@ -957,7 +981,11 @@
}
impl Default for rte_eth_dcb_tx_conf {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
@@ -994,7 +1022,11 @@
}
impl Default for rte_eth_vmdq_tx_conf {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
@@ -1171,7 +1203,11 @@
}
impl Default for rte_eth_vmdq_rx_conf {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(u32)]
@@ -1600,7 +1636,11 @@
}
impl Default for rte_eth_flex_payload_cfg {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
/// A structure used to define FDIR masks for flexible payload
@@ -1729,7 +1769,11 @@
}
impl Default for rte_eth_fdir_flex_conf {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
/// A structure used to configure the Flow Director (FDIR) feature
@@ -1841,7 +1885,11 @@
}
impl Default for rte_fdir_conf {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
/// A structure used to enable/disable specific device interrupts.
@@ -2002,7 +2050,11 @@
}
impl Default for rte_eth_conf__bindgen_ty_1 {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
@@ -2066,7 +2118,11 @@
}
impl Default for rte_eth_conf__bindgen_ty_2 {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[test]
@@ -2199,6 +2255,10 @@
}
impl Default for rte_eth_conf {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
diff --git a/tests/expectations/tests/layout_eth_conf_1_0.rs b/tests/expectations/tests/layout_eth_conf_1_0.rs
index 26d2db0..fde1c67 100644
--- a/tests/expectations/tests/layout_eth_conf_1_0.rs
+++ b/tests/expectations/tests/layout_eth_conf_1_0.rs
@@ -260,7 +260,11 @@
}
impl Default for rte_eth_rxmode {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ unsafe {
+ let mut s: Self = ::std::mem::uninitialized();
+ ::std::ptr::write_bytes(&mut s, 0, 1);
+ s
+ }
}
}
impl rte_eth_rxmode {
@@ -512,7 +516,11 @@
}
impl Default for rte_eth_txmode {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ unsafe {
+ let mut s: Self = ::std::mem::uninitialized();
+ ::std::ptr::write_bytes(&mut s, 0, 1);
+ s
+ }
}
}
impl rte_eth_txmode {
@@ -665,7 +673,11 @@
}
impl Default for rte_eth_rss_conf {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ unsafe {
+ let mut s: Self = ::std::mem::uninitialized();
+ ::std::ptr::write_bytes(&mut s, 0, 1);
+ s
+ }
}
}
#[repr(u32)]
@@ -869,7 +881,11 @@
}
impl Default for rte_eth_vmdq_dcb_conf {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ unsafe {
+ let mut s: Self = ::std::mem::uninitialized();
+ ::std::ptr::write_bytes(&mut s, 0, 1);
+ s
+ }
}
}
#[repr(C)]
@@ -926,7 +942,11 @@
}
impl Default for rte_eth_dcb_rx_conf {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ unsafe {
+ let mut s: Self = ::std::mem::uninitialized();
+ ::std::ptr::write_bytes(&mut s, 0, 1);
+ s
+ }
}
}
#[repr(C)]
@@ -983,7 +1003,11 @@
}
impl Default for rte_eth_vmdq_dcb_tx_conf {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ unsafe {
+ let mut s: Self = ::std::mem::uninitialized();
+ ::std::ptr::write_bytes(&mut s, 0, 1);
+ s
+ }
}
}
#[repr(C)]
@@ -1040,7 +1064,11 @@
}
impl Default for rte_eth_dcb_tx_conf {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ unsafe {
+ let mut s: Self = ::std::mem::uninitialized();
+ ::std::ptr::write_bytes(&mut s, 0, 1);
+ s
+ }
}
}
#[repr(C)]
@@ -1082,7 +1110,11 @@
}
impl Default for rte_eth_vmdq_tx_conf {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ unsafe {
+ let mut s: Self = ::std::mem::uninitialized();
+ ::std::ptr::write_bytes(&mut s, 0, 1);
+ s
+ }
}
}
#[repr(C)]
@@ -1269,7 +1301,11 @@
}
impl Default for rte_eth_vmdq_rx_conf {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ unsafe {
+ let mut s: Self = ::std::mem::uninitialized();
+ ::std::ptr::write_bytes(&mut s, 0, 1);
+ s
+ }
}
}
#[repr(u32)]
@@ -1718,7 +1754,11 @@
}
impl Default for rte_eth_flex_payload_cfg {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ unsafe {
+ let mut s: Self = ::std::mem::uninitialized();
+ ::std::ptr::write_bytes(&mut s, 0, 1);
+ s
+ }
}
}
/// A structure used to define FDIR masks for flexible payload
@@ -1857,7 +1897,11 @@
}
impl Default for rte_eth_fdir_flex_conf {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ unsafe {
+ let mut s: Self = ::std::mem::uninitialized();
+ ::std::ptr::write_bytes(&mut s, 0, 1);
+ s
+ }
}
}
/// A structure used to configure the Flow Director (FDIR) feature
@@ -1974,7 +2018,11 @@
}
impl Default for rte_fdir_conf {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ unsafe {
+ let mut s: Self = ::std::mem::uninitialized();
+ ::std::ptr::write_bytes(&mut s, 0, 1);
+ s
+ }
}
}
/// A structure used to enable/disable specific device interrupts.
@@ -2145,7 +2193,11 @@
}
impl Default for rte_eth_conf__bindgen_ty_1 {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ unsafe {
+ let mut s: Self = ::std::mem::uninitialized();
+ ::std::ptr::write_bytes(&mut s, 0, 1);
+ s
+ }
}
}
#[repr(C)]
@@ -2348,6 +2400,10 @@
}
impl Default for rte_eth_conf {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ unsafe {
+ let mut s: Self = ::std::mem::uninitialized();
+ ::std::ptr::write_bytes(&mut s, 0, 1);
+ s
+ }
}
}
diff --git a/tests/expectations/tests/layout_kni_mbuf.rs b/tests/expectations/tests/layout_kni_mbuf.rs
index fce9dba..e73344c 100644
--- a/tests/expectations/tests/layout_kni_mbuf.rs
+++ b/tests/expectations/tests/layout_kni_mbuf.rs
@@ -222,6 +222,10 @@
}
impl Default for rte_kni_mbuf {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
diff --git a/tests/expectations/tests/layout_large_align_field.rs b/tests/expectations/tests/layout_large_align_field.rs
index 3cf3174..4208e72 100644
--- a/tests/expectations/tests/layout_large_align_field.rs
+++ b/tests/expectations/tests/layout_large_align_field.rs
@@ -108,7 +108,11 @@
}
impl Default for ip_frag {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
/// @internal <src addr, dst_addr, id> to uniquely indetify fragmented datagram.
@@ -239,7 +243,11 @@
}
impl Default for ip_frag_pkt__bindgen_ty_1 {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[test]
@@ -344,7 +352,11 @@
}
impl Default for ip_frag_pkt {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
@@ -394,7 +406,11 @@
}
impl Default for ip_pkt_list {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
/// fragmentation table statistics
@@ -508,7 +524,11 @@
}
impl Default for ip_frag_tbl_stat {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
/// fragmentation table
@@ -695,7 +715,11 @@
}
impl Default for rte_ip_frag_tbl {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
///< fragment mbuf
diff --git a/tests/expectations/tests/layout_mbuf.rs b/tests/expectations/tests/layout_mbuf.rs
index bc456a1..aefce3d 100644
--- a/tests/expectations/tests/layout_mbuf.rs
+++ b/tests/expectations/tests/layout_mbuf.rs
@@ -231,7 +231,11 @@
}
impl Default for rte_mbuf__bindgen_ty_1 {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
@@ -433,7 +437,11 @@
}
impl Default for rte_mbuf__bindgen_ty_2 {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
@@ -514,7 +522,11 @@
}
impl Default for rte_mbuf__bindgen_ty_3__bindgen_ty_1__bindgen_ty_1 {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[test]
@@ -551,7 +563,11 @@
}
impl Default for rte_mbuf__bindgen_ty_3__bindgen_ty_1 {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
@@ -672,7 +688,11 @@
}
impl Default for rte_mbuf__bindgen_ty_3 {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
@@ -724,7 +744,11 @@
}
impl Default for rte_mbuf__bindgen_ty_4 {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
@@ -907,7 +931,11 @@
}
impl Default for rte_mbuf__bindgen_ty_5 {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[test]
@@ -1180,7 +1208,11 @@
}
impl Default for rte_mbuf {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
///< Pool from which mbuf was allocated.
diff --git a/tests/expectations/tests/layout_mbuf_1_0.rs b/tests/expectations/tests/layout_mbuf_1_0.rs
index 70d96d9..ce4c66c 100644
--- a/tests/expectations/tests/layout_mbuf_1_0.rs
+++ b/tests/expectations/tests/layout_mbuf_1_0.rs
@@ -1254,7 +1254,11 @@
}
impl Default for rte_mbuf {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ unsafe {
+ let mut s: Self = ::std::mem::uninitialized();
+ ::std::ptr::write_bytes(&mut s, 0, 1);
+ s
+ }
}
}
///< Pool from which mbuf was allocated.
diff --git a/tests/expectations/tests/libclang-3.9/issue-769-bad-instantiation-test.rs b/tests/expectations/tests/libclang-3.9/issue-769-bad-instantiation-test.rs
index c084de9..47e166c 100644
--- a/tests/expectations/tests/libclang-3.9/issue-769-bad-instantiation-test.rs
+++ b/tests/expectations/tests/libclang-3.9/issue-769-bad-instantiation-test.rs
@@ -17,7 +17,11 @@
}
impl<T> Default for Rooted<T> {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[test]
diff --git a/tests/expectations/tests/libclang-4/issue-769-bad-instantiation-test.rs b/tests/expectations/tests/libclang-4/issue-769-bad-instantiation-test.rs
index 45bcb6f..6085796 100644
--- a/tests/expectations/tests/libclang-4/issue-769-bad-instantiation-test.rs
+++ b/tests/expectations/tests/libclang-4/issue-769-bad-instantiation-test.rs
@@ -17,7 +17,11 @@
}
impl<T> Default for Rooted<T> {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
pub type AutoValueVector_Alias = ::std::os::raw::c_int;
diff --git a/tests/expectations/tests/libclang-4/type_alias_template_specialized.rs b/tests/expectations/tests/libclang-4/type_alias_template_specialized.rs
index 38f3bfb..f874e9d 100644
--- a/tests/expectations/tests/libclang-4/type_alias_template_specialized.rs
+++ b/tests/expectations/tests/libclang-4/type_alias_template_specialized.rs
@@ -35,7 +35,11 @@
}
impl Default for Rooted {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
/// <div rustbindgen replaces="MaybeWrapped"></div>
diff --git a/tests/expectations/tests/libclang-5/issue-769-bad-instantiation-test.rs b/tests/expectations/tests/libclang-5/issue-769-bad-instantiation-test.rs
index 45bcb6f..6085796 100644
--- a/tests/expectations/tests/libclang-5/issue-769-bad-instantiation-test.rs
+++ b/tests/expectations/tests/libclang-5/issue-769-bad-instantiation-test.rs
@@ -17,7 +17,11 @@
}
impl<T> Default for Rooted<T> {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
pub type AutoValueVector_Alias = ::std::os::raw::c_int;
diff --git a/tests/expectations/tests/libclang-5/type_alias_template_specialized.rs b/tests/expectations/tests/libclang-5/type_alias_template_specialized.rs
index 38f3bfb..f874e9d 100644
--- a/tests/expectations/tests/libclang-5/type_alias_template_specialized.rs
+++ b/tests/expectations/tests/libclang-5/type_alias_template_specialized.rs
@@ -35,7 +35,11 @@
}
impl Default for Rooted {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
/// <div rustbindgen replaces="MaybeWrapped"></div>
diff --git a/tests/expectations/tests/libclang-9/class.rs b/tests/expectations/tests/libclang-9/class.rs
index beea517..e4527de 100644
--- a/tests/expectations/tests/libclang-9/class.rs
+++ b/tests/expectations/tests/libclang-9/class.rs
@@ -71,7 +71,11 @@
}
impl Default for C {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
@@ -134,7 +138,11 @@
}
impl Default for C_with_zero_length_array {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
@@ -242,7 +250,11 @@
}
impl Default for C_with_incomplete_array {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
@@ -378,7 +390,11 @@
}
impl Default for C_with_zero_length_array_and_incomplete_array {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
@@ -528,7 +544,11 @@
}
impl Default for IncompleteArrayNonCopiable {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
@@ -562,7 +582,11 @@
}
impl Default for Union {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
@@ -597,7 +621,11 @@
}
impl Default for WithUnion {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
diff --git a/tests/expectations/tests/libclang-9/class_1_0.rs b/tests/expectations/tests/libclang-9/class_1_0.rs
index d527dfd..4263bd1 100644
--- a/tests/expectations/tests/libclang-9/class_1_0.rs
+++ b/tests/expectations/tests/libclang-9/class_1_0.rs
@@ -119,7 +119,11 @@
}
impl Default for C {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ unsafe {
+ let mut s: Self = ::std::mem::uninitialized();
+ ::std::ptr::write_bytes(&mut s, 0, 1);
+ s
+ }
}
}
impl ::std::cmp::PartialEq for C {
@@ -187,7 +191,11 @@
}
impl Default for C_with_zero_length_array {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ unsafe {
+ let mut s: Self = ::std::mem::uninitialized();
+ ::std::ptr::write_bytes(&mut s, 0, 1);
+ s
+ }
}
}
#[repr(C)]
@@ -295,7 +303,11 @@
}
impl Default for C_with_incomplete_array {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ unsafe {
+ let mut s: Self = ::std::mem::uninitialized();
+ ::std::ptr::write_bytes(&mut s, 0, 1);
+ s
+ }
}
}
#[repr(C)]
@@ -431,7 +443,11 @@
}
impl Default for C_with_zero_length_array_and_incomplete_array {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ unsafe {
+ let mut s: Self = ::std::mem::uninitialized();
+ ::std::ptr::write_bytes(&mut s, 0, 1);
+ s
+ }
}
}
#[repr(C)]
@@ -581,7 +597,11 @@
}
impl Default for IncompleteArrayNonCopiable {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ unsafe {
+ let mut s: Self = ::std::mem::uninitialized();
+ ::std::ptr::write_bytes(&mut s, 0, 1);
+ s
+ }
}
}
#[repr(C)]
diff --git a/tests/expectations/tests/libclang-9/incomplete-array-padding.rs b/tests/expectations/tests/libclang-9/incomplete-array-padding.rs
index c380a0c..382195d 100644
--- a/tests/expectations/tests/libclang-9/incomplete-array-padding.rs
+++ b/tests/expectations/tests/libclang-9/incomplete-array-padding.rs
@@ -148,7 +148,11 @@
}
impl Default for foo {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
impl foo {
diff --git a/tests/expectations/tests/libclang-9/issue-643-inner-struct.rs b/tests/expectations/tests/libclang-9/issue-643-inner-struct.rs
index d8f2ac6..49664cd 100644
--- a/tests/expectations/tests/libclang-9/issue-643-inner-struct.rs
+++ b/tests/expectations/tests/libclang-9/issue-643-inner-struct.rs
@@ -168,7 +168,11 @@
}
impl Default for rte_ring {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
diff --git a/tests/expectations/tests/libclang-9/issue-769-bad-instantiation-test.rs b/tests/expectations/tests/libclang-9/issue-769-bad-instantiation-test.rs
index 45bcb6f..6085796 100644
--- a/tests/expectations/tests/libclang-9/issue-769-bad-instantiation-test.rs
+++ b/tests/expectations/tests/libclang-9/issue-769-bad-instantiation-test.rs
@@ -17,7 +17,11 @@
}
impl<T> Default for Rooted<T> {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
pub type AutoValueVector_Alias = ::std::os::raw::c_int;
diff --git a/tests/expectations/tests/libclang-9/layout_align.rs b/tests/expectations/tests/libclang-9/layout_align.rs
index d153fa5..4ad5417 100644
--- a/tests/expectations/tests/libclang-9/layout_align.rs
+++ b/tests/expectations/tests/libclang-9/layout_align.rs
@@ -211,7 +211,11 @@
}
impl Default for rte_kni_fifo {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
diff --git a/tests/expectations/tests/libclang-9/type_alias_template_specialized.rs b/tests/expectations/tests/libclang-9/type_alias_template_specialized.rs
index 38f3bfb..f874e9d 100644
--- a/tests/expectations/tests/libclang-9/type_alias_template_specialized.rs
+++ b/tests/expectations/tests/libclang-9/type_alias_template_specialized.rs
@@ -35,7 +35,11 @@
}
impl Default for Rooted {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
/// <div rustbindgen replaces="MaybeWrapped"></div>
diff --git a/tests/expectations/tests/namespace.rs b/tests/expectations/tests/namespace.rs
index 944ec5b..576fc93 100644
--- a/tests/expectations/tests/namespace.rs
+++ b/tests/expectations/tests/namespace.rs
@@ -66,7 +66,11 @@
}
impl<T> Default for C<T> {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
pub mod w {
@@ -82,7 +86,11 @@
}
impl<T> Default for D<T> {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
extern "C" {
diff --git a/tests/expectations/tests/nested-template-typedef.rs b/tests/expectations/tests/nested-template-typedef.rs
new file mode 100644
index 0000000..ab761d2
--- /dev/null
+++ b/tests/expectations/tests/nested-template-typedef.rs
@@ -0,0 +1,17 @@
+#![allow(
+ dead_code,
+ non_snake_case,
+ non_camel_case_types,
+ non_upper_case_globals
+)]
+
+#[repr(C)]
+#[derive(Debug, Default, Copy, Clone)]
+pub struct Foo {
+ pub _address: u8,
+}
+#[repr(C)]
+#[derive(Debug, Default, Copy, Clone)]
+pub struct Foo_Bar {
+ pub _address: u8,
+}
diff --git a/tests/expectations/tests/nested_vtable.rs b/tests/expectations/tests/nested_vtable.rs
index 8ea9984..0218777 100644
--- a/tests/expectations/tests/nested_vtable.rs
+++ b/tests/expectations/tests/nested_vtable.rs
@@ -27,7 +27,11 @@
}
impl Default for nsISupports {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
extern "C" {
@@ -56,7 +60,11 @@
}
impl Default for nsIRunnable {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
@@ -79,6 +87,10 @@
}
impl Default for Runnable {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
diff --git a/tests/expectations/tests/no-derive-debug.rs b/tests/expectations/tests/no-derive-debug.rs
index d58093e..a62eaa5 100644
--- a/tests/expectations/tests/no-derive-debug.rs
+++ b/tests/expectations/tests/no-derive-debug.rs
@@ -44,6 +44,10 @@
}
impl Default for bar {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
diff --git a/tests/expectations/tests/no-recursive-allowlisting.rs b/tests/expectations/tests/no-recursive-allowlisting.rs
index 047b22e..0aa0b5e 100644
--- a/tests/expectations/tests/no-recursive-allowlisting.rs
+++ b/tests/expectations/tests/no-recursive-allowlisting.rs
@@ -32,6 +32,10 @@
}
impl Default for Foo {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
diff --git a/tests/expectations/tests/no-std.rs b/tests/expectations/tests/no-std.rs
index ea16dc4..f63ac45 100644
--- a/tests/expectations/tests/no-std.rs
+++ b/tests/expectations/tests/no-std.rs
@@ -47,6 +47,10 @@
}
impl Default for foo {
fn default() -> Self {
- unsafe { ::core::mem::zeroed() }
+ let mut s = ::core::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::core::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
diff --git a/tests/expectations/tests/no_debug_bypass_impl_debug.rs b/tests/expectations/tests/no_debug_bypass_impl_debug.rs
index adb80ea..334f39d 100644
--- a/tests/expectations/tests/no_debug_bypass_impl_debug.rs
+++ b/tests/expectations/tests/no_debug_bypass_impl_debug.rs
@@ -12,7 +12,11 @@
}
impl<T> Default for Generic<T> {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
impl<T> ::std::fmt::Debug for Generic<T> {
@@ -27,6 +31,10 @@
}
impl<T> Default for NoDebug<T> {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
diff --git a/tests/expectations/tests/no_default.rs b/tests/expectations/tests/no_default.rs
index 27ea303..22fdbf3 100644
--- a/tests/expectations/tests/no_default.rs
+++ b/tests/expectations/tests/no_default.rs
@@ -18,6 +18,10 @@
}
impl Default for DefaultButWaitDerived {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
diff --git a/tests/expectations/tests/no_default_bypass_derive_default.rs b/tests/expectations/tests/no_default_bypass_derive_default.rs
index 4b97e3f..6c44a9d 100644
--- a/tests/expectations/tests/no_default_bypass_derive_default.rs
+++ b/tests/expectations/tests/no_default_bypass_derive_default.rs
@@ -12,7 +12,11 @@
}
impl<T> Default for Generic<T> {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
diff --git a/tests/expectations/tests/nsBaseHashtable.rs b/tests/expectations/tests/nsBaseHashtable.rs
index e26190b..d7607b9 100644
--- a/tests/expectations/tests/nsBaseHashtable.rs
+++ b/tests/expectations/tests/nsBaseHashtable.rs
@@ -31,7 +31,11 @@
}
impl Default for nsBaseHashtable_LookupResult {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
@@ -42,11 +46,19 @@
}
impl Default for nsBaseHashtable_EntryPtr {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
impl Default for nsBaseHashtable {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
diff --git a/tests/expectations/tests/nsStyleAutoArray.rs b/tests/expectations/tests/nsStyleAutoArray.rs
index 091be3d..fab18c1 100644
--- a/tests/expectations/tests/nsStyleAutoArray.rs
+++ b/tests/expectations/tests/nsStyleAutoArray.rs
@@ -13,7 +13,11 @@
}
impl<T> Default for nsTArray<T> {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
@@ -30,6 +34,10 @@
}
impl<T> Default for nsStyleAutoArray<T> {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
diff --git a/tests/expectations/tests/objc_interface_type.rs b/tests/expectations/tests/objc_interface_type.rs
index 2585df6..cef29c8 100644
--- a/tests/expectations/tests/objc_interface_type.rs
+++ b/tests/expectations/tests/objc_interface_type.rs
@@ -59,7 +59,11 @@
}
impl Default for FooStruct {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
extern "C" {
diff --git a/tests/expectations/tests/opaque-template-inst-member-2.rs b/tests/expectations/tests/opaque-template-inst-member-2.rs
index 7d3e83a..f47aff0 100644
--- a/tests/expectations/tests/opaque-template-inst-member-2.rs
+++ b/tests/expectations/tests/opaque-template-inst-member-2.rs
@@ -93,6 +93,10 @@
}
impl Default for InheritsOpaqueTemplate {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
diff --git a/tests/expectations/tests/opaque-template-inst-member.rs b/tests/expectations/tests/opaque-template-inst-member.rs
index ea821fc..a3c6778 100644
--- a/tests/expectations/tests/opaque-template-inst-member.rs
+++ b/tests/expectations/tests/opaque-template-inst-member.rs
@@ -58,7 +58,11 @@
}
impl Default for ContainsOpaqueTemplate {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
impl ::std::cmp::PartialEq for ContainsOpaqueTemplate {
@@ -101,7 +105,11 @@
}
impl Default for InheritsOpaqueTemplate {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
impl ::std::cmp::PartialEq for InheritsOpaqueTemplate {
diff --git a/tests/expectations/tests/opaque-template-instantiation-namespaced.rs b/tests/expectations/tests/opaque-template-instantiation-namespaced.rs
index 7f1aac8..e972443 100644
--- a/tests/expectations/tests/opaque-template-instantiation-namespaced.rs
+++ b/tests/expectations/tests/opaque-template-instantiation-namespaced.rs
@@ -21,7 +21,11 @@
}
impl<T> Default for Template<T> {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
@@ -117,7 +121,11 @@
}
impl Default for ContainsInstantiation {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
diff --git a/tests/expectations/tests/opaque-template-instantiation.rs b/tests/expectations/tests/opaque-template-instantiation.rs
index 771a519..6f0f31b 100644
--- a/tests/expectations/tests/opaque-template-instantiation.rs
+++ b/tests/expectations/tests/opaque-template-instantiation.rs
@@ -13,7 +13,11 @@
}
impl<T> Default for Template<T> {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
@@ -49,7 +53,11 @@
}
impl Default for ContainsInstantiation {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
diff --git a/tests/expectations/tests/opaque_pointer.rs b/tests/expectations/tests/opaque_pointer.rs
index f5fecd4..90b019b 100644
--- a/tests/expectations/tests/opaque_pointer.rs
+++ b/tests/expectations/tests/opaque_pointer.rs
@@ -90,6 +90,10 @@
}
impl Default for WithOpaquePtr {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
diff --git a/tests/expectations/tests/packed-vtable.rs b/tests/expectations/tests/packed-vtable.rs
index 7f12a36..0069ead 100644
--- a/tests/expectations/tests/packed-vtable.rs
+++ b/tests/expectations/tests/packed-vtable.rs
@@ -28,7 +28,11 @@
}
impl Default for PackedVtable {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ unsafe {
+ let mut s: Self = ::std::mem::uninitialized();
+ ::std::ptr::write_bytes(&mut s, 0, 1);
+ s
+ }
}
}
extern "C" {
diff --git a/tests/expectations/tests/parm-union.rs b/tests/expectations/tests/parm-union.rs
new file mode 100644
index 0000000..9f7dd20
--- /dev/null
+++ b/tests/expectations/tests/parm-union.rs
@@ -0,0 +1,40 @@
+#![allow(
+ dead_code,
+ non_snake_case,
+ non_camel_case_types,
+ non_upper_case_globals
+)]
+
+#[repr(C)]
+#[derive(Debug, Default, Copy, Clone)]
+pub struct Struct {
+ pub _address: u8,
+}
+#[test]
+fn bindgen_test_layout_Struct() {
+ assert_eq!(
+ ::std::mem::size_of::<Struct>(),
+ 1usize,
+ concat!("Size of: ", stringify!(Struct))
+ );
+ assert_eq!(
+ ::std::mem::align_of::<Struct>(),
+ 1usize,
+ concat!("Alignment of ", stringify!(Struct))
+ );
+}
+extern "C" {
+ #[link_name = "\u{1}_ZN6Struct8FunctionER5Union"]
+ pub fn Struct_Function(this: *mut Struct, arg1: *mut Union);
+}
+impl Struct {
+ #[inline]
+ pub unsafe fn Function(&mut self, arg1: *mut Union) {
+ Struct_Function(self, arg1)
+ }
+}
+#[repr(C)]
+#[derive(Copy, Clone)]
+pub struct Union {
+ _unused: [u8; 0],
+}
diff --git a/tests/expectations/tests/private_fields.rs b/tests/expectations/tests/private_fields.rs
index d5371e1..92a4bf6 100644
--- a/tests/expectations/tests/private_fields.rs
+++ b/tests/expectations/tests/private_fields.rs
@@ -498,7 +498,11 @@
}
impl Default for WithAnonUnion__bindgen_ty_1 {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[test]
@@ -516,6 +520,10 @@
}
impl Default for WithAnonUnion {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
diff --git a/tests/expectations/tests/qualified-dependent-types.rs b/tests/expectations/tests/qualified-dependent-types.rs
new file mode 100644
index 0000000..f1b2c84
--- /dev/null
+++ b/tests/expectations/tests/qualified-dependent-types.rs
@@ -0,0 +1,17 @@
+#![allow(
+ dead_code,
+ non_snake_case,
+ non_camel_case_types,
+ non_upper_case_globals
+)]
+
+#[repr(C)]
+#[derive(Debug, Default, Copy, Clone)]
+pub struct Foo {
+ pub _address: u8,
+}
+#[repr(C)]
+#[derive(Debug, Default, Copy, Clone)]
+pub struct Bar {
+ pub _address: u8,
+}
diff --git a/tests/expectations/tests/ref_argument_array.rs b/tests/expectations/tests/ref_argument_array.rs
index 0643d47..799dd81 100644
--- a/tests/expectations/tests/ref_argument_array.rs
+++ b/tests/expectations/tests/ref_argument_array.rs
@@ -28,7 +28,11 @@
}
impl Default for nsID {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
extern "C" {
diff --git a/tests/expectations/tests/replace_template_alias.rs b/tests/expectations/tests/replace_template_alias.rs
index 0c5500e..4f46412 100644
--- a/tests/expectations/tests/replace_template_alias.rs
+++ b/tests/expectations/tests/replace_template_alias.rs
@@ -17,6 +17,10 @@
}
impl<T> Default for JS_Rooted<T> {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
diff --git a/tests/expectations/tests/replaces_double.rs b/tests/expectations/tests/replaces_double.rs
index 7b7ec00..99de132 100644
--- a/tests/expectations/tests/replaces_double.rs
+++ b/tests/expectations/tests/replaces_double.rs
@@ -13,7 +13,11 @@
}
impl<T> Default for Wrapper_Wrapped<T> {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
pub type Wrapper_Type<T> = Wrapper_Wrapped<T>;
@@ -27,6 +31,10 @@
pub type Rooted_MaybeWrapped<T> = T;
impl<T> Default for Rooted<T> {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
diff --git a/tests/expectations/tests/size_t_is_usize.rs b/tests/expectations/tests/size_t_is_usize.rs
index 43dda32..0d9ab2c 100644
--- a/tests/expectations/tests/size_t_is_usize.rs
+++ b/tests/expectations/tests/size_t_is_usize.rs
@@ -42,6 +42,10 @@
}
impl Default for A {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
diff --git a/tests/expectations/tests/struct_containing_forward_declared_struct.rs b/tests/expectations/tests/struct_containing_forward_declared_struct.rs
index 4844186..7298095 100644
--- a/tests/expectations/tests/struct_containing_forward_declared_struct.rs
+++ b/tests/expectations/tests/struct_containing_forward_declared_struct.rs
@@ -30,7 +30,11 @@
}
impl Default for a {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
diff --git a/tests/expectations/tests/struct_typedef.rs b/tests/expectations/tests/struct_typedef.rs
index 5756ab8..34c9dbd 100644
--- a/tests/expectations/tests/struct_typedef.rs
+++ b/tests/expectations/tests/struct_typedef.rs
@@ -69,7 +69,11 @@
}
impl Default for _bindgen_ty_1 {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
pub type struct_ptr_t = *mut _bindgen_ty_1;
diff --git a/tests/expectations/tests/struct_with_anon_struct_pointer.rs b/tests/expectations/tests/struct_with_anon_struct_pointer.rs
index 04e11af..0ed19f7 100644
--- a/tests/expectations/tests/struct_with_anon_struct_pointer.rs
+++ b/tests/expectations/tests/struct_with_anon_struct_pointer.rs
@@ -73,6 +73,10 @@
}
impl Default for foo {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
diff --git a/tests/expectations/tests/struct_with_anon_union.rs b/tests/expectations/tests/struct_with_anon_union.rs
index 4ca8452..15b8c9e 100644
--- a/tests/expectations/tests/struct_with_anon_union.rs
+++ b/tests/expectations/tests/struct_with_anon_union.rs
@@ -55,7 +55,11 @@
}
impl Default for foo__bindgen_ty_1 {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[test]
@@ -78,6 +82,10 @@
}
impl Default for foo {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
diff --git a/tests/expectations/tests/struct_with_anon_unnamed_union.rs b/tests/expectations/tests/struct_with_anon_unnamed_union.rs
index 5d03b7f..17a8357 100644
--- a/tests/expectations/tests/struct_with_anon_unnamed_union.rs
+++ b/tests/expectations/tests/struct_with_anon_unnamed_union.rs
@@ -55,7 +55,11 @@
}
impl Default for foo__bindgen_ty_1 {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[test]
@@ -73,6 +77,10 @@
}
impl Default for foo {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
diff --git a/tests/expectations/tests/struct_with_derive_debug.rs b/tests/expectations/tests/struct_with_derive_debug.rs
index 0a704fe..721ba96 100644
--- a/tests/expectations/tests/struct_with_derive_debug.rs
+++ b/tests/expectations/tests/struct_with_derive_debug.rs
@@ -65,7 +65,11 @@
}
impl Default for BigArray {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
@@ -130,6 +134,10 @@
}
impl Default for WithBigArray {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
diff --git a/tests/expectations/tests/struct_with_large_array.rs b/tests/expectations/tests/struct_with_large_array.rs
index 850ded5..56179c2 100644
--- a/tests/expectations/tests/struct_with_large_array.rs
+++ b/tests/expectations/tests/struct_with_large_array.rs
@@ -37,7 +37,11 @@
}
impl Default for S {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
@@ -47,6 +51,10 @@
}
impl<T> Default for ST<T> {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
diff --git a/tests/expectations/tests/struct_with_nesting.rs b/tests/expectations/tests/struct_with_nesting.rs
index a98bd8c..7ced63e 100644
--- a/tests/expectations/tests/struct_with_nesting.rs
+++ b/tests/expectations/tests/struct_with_nesting.rs
@@ -163,7 +163,11 @@
}
impl Default for foo__bindgen_ty_1 {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[test]
@@ -186,6 +190,10 @@
}
impl Default for foo {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
diff --git a/tests/expectations/tests/template-param-usage-0.rs b/tests/expectations/tests/template-param-usage-0.rs
index f473b74..2acfb06 100644
--- a/tests/expectations/tests/template-param-usage-0.rs
+++ b/tests/expectations/tests/template-param-usage-0.rs
@@ -13,6 +13,10 @@
}
impl<T> Default for UsesTemplateParameter<T> {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
diff --git a/tests/expectations/tests/template-param-usage-10.rs b/tests/expectations/tests/template-param-usage-10.rs
index 0afc595..c6034fb 100644
--- a/tests/expectations/tests/template-param-usage-10.rs
+++ b/tests/expectations/tests/template-param-usage-10.rs
@@ -24,11 +24,19 @@
}
impl<T, U> Default for DoublyIndirectUsage_IndirectUsage<T, U> {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
impl<T, U> Default for DoublyIndirectUsage<T, U> {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
diff --git a/tests/expectations/tests/template-param-usage-12.rs b/tests/expectations/tests/template-param-usage-12.rs
index 9f964b2..626e451 100644
--- a/tests/expectations/tests/template-param-usage-12.rs
+++ b/tests/expectations/tests/template-param-usage-12.rs
@@ -13,7 +13,11 @@
}
impl<T> Default for BaseUsesT<T> {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
@@ -25,6 +29,10 @@
}
impl<U> Default for CrtpUsesU<U> {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
diff --git a/tests/expectations/tests/template-param-usage-13.rs b/tests/expectations/tests/template-param-usage-13.rs
index 64e08da..70c1778 100644
--- a/tests/expectations/tests/template-param-usage-13.rs
+++ b/tests/expectations/tests/template-param-usage-13.rs
@@ -19,6 +19,10 @@
}
impl<U> Default for CrtpUsesU<U> {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
diff --git a/tests/expectations/tests/template-param-usage-14.rs b/tests/expectations/tests/template-param-usage-14.rs
index 8826105..0e0fd0c 100644
--- a/tests/expectations/tests/template-param-usage-14.rs
+++ b/tests/expectations/tests/template-param-usage-14.rs
@@ -18,6 +18,10 @@
}
impl Default for CrtpIgnoresU {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
diff --git a/tests/expectations/tests/template-param-usage-15.rs b/tests/expectations/tests/template-param-usage-15.rs
index 45f3422..941c607 100644
--- a/tests/expectations/tests/template-param-usage-15.rs
+++ b/tests/expectations/tests/template-param-usage-15.rs
@@ -13,7 +13,11 @@
}
impl<T> Default for BaseUsesT<T> {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
@@ -24,6 +28,10 @@
}
impl Default for CrtpIgnoresU {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
diff --git a/tests/expectations/tests/template-param-usage-2.rs b/tests/expectations/tests/template-param-usage-2.rs
index 3270e16..0ad5d7b 100644
--- a/tests/expectations/tests/template-param-usage-2.rs
+++ b/tests/expectations/tests/template-param-usage-2.rs
@@ -19,11 +19,19 @@
}
impl<T> Default for UsesTemplateParameter_AlsoUsesTemplateParameter<T> {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
impl<T> Default for UsesTemplateParameter<T> {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
diff --git a/tests/expectations/tests/template-param-usage-3.rs b/tests/expectations/tests/template-param-usage-3.rs
index 9d9d8f9..414818d 100644
--- a/tests/expectations/tests/template-param-usage-3.rs
+++ b/tests/expectations/tests/template-param-usage-3.rs
@@ -23,11 +23,19 @@
for UsesTemplateParameter_AlsoUsesTemplateParameterAndMore<T, U>
{
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
impl<T> Default for UsesTemplateParameter<T> {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
diff --git a/tests/expectations/tests/template-param-usage-4.rs b/tests/expectations/tests/template-param-usage-4.rs
index 38479ac..afcba97 100644
--- a/tests/expectations/tests/template-param-usage-4.rs
+++ b/tests/expectations/tests/template-param-usage-4.rs
@@ -18,6 +18,10 @@
}
impl<T> Default for UsesTemplateParameter<T> {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
diff --git a/tests/expectations/tests/template-param-usage-5.rs b/tests/expectations/tests/template-param-usage-5.rs
index 6976841..2cc8db6 100644
--- a/tests/expectations/tests/template-param-usage-5.rs
+++ b/tests/expectations/tests/template-param-usage-5.rs
@@ -14,6 +14,10 @@
pub type IndirectlyUsesTemplateParameter_Aliased<T> = T;
impl<T> Default for IndirectlyUsesTemplateParameter<T> {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
diff --git a/tests/expectations/tests/template-param-usage-7.rs b/tests/expectations/tests/template-param-usage-7.rs
index 6f7544f..3ed7a45 100644
--- a/tests/expectations/tests/template-param-usage-7.rs
+++ b/tests/expectations/tests/template-param-usage-7.rs
@@ -15,7 +15,11 @@
}
impl<T, V> Default for DoesNotUseU<T, V> {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
pub type Alias = DoesNotUseU<::std::os::raw::c_int, ::std::os::raw::c_char>;
diff --git a/tests/expectations/tests/template-param-usage-8.rs b/tests/expectations/tests/template-param-usage-8.rs
index 3a0100f..f8ac671 100644
--- a/tests/expectations/tests/template-param-usage-8.rs
+++ b/tests/expectations/tests/template-param-usage-8.rs
@@ -17,6 +17,10 @@
pub type IndirectUsage_Aliased<U> = U;
impl<T, U> Default for IndirectUsage<T, U> {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
diff --git a/tests/expectations/tests/template-param-usage-9.rs b/tests/expectations/tests/template-param-usage-9.rs
index a93e4b7..a50079a 100644
--- a/tests/expectations/tests/template-param-usage-9.rs
+++ b/tests/expectations/tests/template-param-usage-9.rs
@@ -22,6 +22,10 @@
}
impl<T, U> Default for DoesNotUse_IndirectUsage<T, U> {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
diff --git a/tests/expectations/tests/template.rs b/tests/expectations/tests/template.rs
index 67a0f85..9c48488 100644
--- a/tests/expectations/tests/template.rs
+++ b/tests/expectations/tests/template.rs
@@ -15,7 +15,11 @@
}
impl<T> Default for Foo<T> {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
@@ -26,7 +30,11 @@
}
impl<T> Default for B<T> {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
extern "C" {
@@ -231,7 +239,11 @@
}
impl Default for C {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
@@ -249,12 +261,20 @@
}
impl<Z> Default for D_U<Z> {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
impl Default for D {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
@@ -267,7 +287,11 @@
}
impl<T> Default for Rooted<T> {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
@@ -303,7 +327,11 @@
}
impl Default for RootedContainer {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
pub type WithDtorIntFwd = WithDtor<::std::os::raw::c_int>;
@@ -315,7 +343,11 @@
}
impl<T> Default for WithDtor<T> {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
@@ -351,7 +383,11 @@
}
impl Default for PODButContainsDtor {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
/// <div rustbindgen opaque>
@@ -399,7 +435,11 @@
}
impl<T> Default for NestedReplaced<T> {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
@@ -410,7 +450,11 @@
}
impl<T> Default for NestedBase<T> {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
@@ -423,7 +467,11 @@
}
impl<T> Default for NestedContainer<T> {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
@@ -434,7 +482,11 @@
}
impl<T> Default for Incomplete<T> {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
@@ -472,7 +524,11 @@
}
impl<T> Default for ReplacedWithoutDestructor<T> {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
@@ -483,7 +539,11 @@
}
impl<T> Default for ShouldNotBeCopiable<T> {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
@@ -494,7 +554,11 @@
}
impl<U> Default for ShouldNotBeCopiableAsWell<U> {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
/// If the replacement doesn't happen at the parse level the container would be
@@ -509,7 +573,11 @@
}
impl<T> Default for ReplacedWithoutDestructorFwd<T> {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[test]
diff --git a/tests/expectations/tests/template_alias.rs b/tests/expectations/tests/template_alias.rs
index 3b79a3d..7e0af20 100644
--- a/tests/expectations/tests/template_alias.rs
+++ b/tests/expectations/tests/template_alias.rs
@@ -14,6 +14,10 @@
}
impl<T> Default for JS_Rooted<T> {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
diff --git a/tests/expectations/tests/template_alias_namespace.rs b/tests/expectations/tests/template_alias_namespace.rs
index fd20bab..7196b53 100644
--- a/tests/expectations/tests/template_alias_namespace.rs
+++ b/tests/expectations/tests/template_alias_namespace.rs
@@ -26,7 +26,11 @@
}
impl<T> Default for Rooted<T> {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
}
diff --git a/tests/expectations/tests/template_typedef_transitive_param.rs b/tests/expectations/tests/template_typedef_transitive_param.rs
index 8c9dd4d..68ca126 100644
--- a/tests/expectations/tests/template_typedef_transitive_param.rs
+++ b/tests/expectations/tests/template_typedef_transitive_param.rs
@@ -18,7 +18,11 @@
}
impl<T> Default for Wrapper_Wrapped<T> {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
pub type Wrapper_Type<T> = Wrapper_Wrapped<T>;
diff --git a/tests/expectations/tests/timex.rs b/tests/expectations/tests/timex.rs
index 63917d6..b2a84d8 100644
--- a/tests/expectations/tests/timex.rs
+++ b/tests/expectations/tests/timex.rs
@@ -92,7 +92,7 @@
}
}
#[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Debug, Copy, Clone)]
pub struct timex {
pub tai: ::std::os::raw::c_int,
pub _bitfield_align_1: [u8; 0],
@@ -123,11 +123,15 @@
}
impl Default for timex {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Debug, Copy, Clone)]
pub struct timex_named {
pub tai: ::std::os::raw::c_int,
pub _bitfield_align_1: [u32; 0],
@@ -160,6 +164,155 @@
}
impl Default for timex_named {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
+ }
+}
+impl timex_named {
+ #[inline]
+ pub fn a(&self) -> ::std::os::raw::c_int {
+ unsafe {
+ ::std::mem::transmute(self._bitfield_1.get(0usize, 32u8) as u32)
+ }
+ }
+ #[inline]
+ pub fn set_a(&mut self, val: ::std::os::raw::c_int) {
+ unsafe {
+ let val: u32 = ::std::mem::transmute(val);
+ self._bitfield_1.set(0usize, 32u8, val as u64)
+ }
+ }
+ #[inline]
+ pub fn b(&self) -> ::std::os::raw::c_int {
+ unsafe {
+ ::std::mem::transmute(self._bitfield_1.get(32usize, 32u8) as u32)
+ }
+ }
+ #[inline]
+ pub fn set_b(&mut self, val: ::std::os::raw::c_int) {
+ unsafe {
+ let val: u32 = ::std::mem::transmute(val);
+ self._bitfield_1.set(32usize, 32u8, val as u64)
+ }
+ }
+ #[inline]
+ pub fn c(&self) -> ::std::os::raw::c_int {
+ unsafe {
+ ::std::mem::transmute(self._bitfield_1.get(64usize, 32u8) as u32)
+ }
+ }
+ #[inline]
+ pub fn set_c(&mut self, val: ::std::os::raw::c_int) {
+ unsafe {
+ let val: u32 = ::std::mem::transmute(val);
+ self._bitfield_1.set(64usize, 32u8, val as u64)
+ }
+ }
+ #[inline]
+ pub fn d(&self) -> ::std::os::raw::c_int {
+ unsafe {
+ ::std::mem::transmute(self._bitfield_1.get(96usize, 32u8) as u32)
+ }
+ }
+ #[inline]
+ pub fn set_d(&mut self, val: ::std::os::raw::c_int) {
+ unsafe {
+ let val: u32 = ::std::mem::transmute(val);
+ self._bitfield_1.set(96usize, 32u8, val as u64)
+ }
+ }
+ #[inline]
+ pub fn e(&self) -> ::std::os::raw::c_int {
+ unsafe {
+ ::std::mem::transmute(self._bitfield_1.get(128usize, 32u8) as u32)
+ }
+ }
+ #[inline]
+ pub fn set_e(&mut self, val: ::std::os::raw::c_int) {
+ unsafe {
+ let val: u32 = ::std::mem::transmute(val);
+ self._bitfield_1.set(128usize, 32u8, val as u64)
+ }
+ }
+ #[inline]
+ pub fn f(&self) -> ::std::os::raw::c_int {
+ unsafe {
+ ::std::mem::transmute(self._bitfield_1.get(160usize, 32u8) as u32)
+ }
+ }
+ #[inline]
+ pub fn set_f(&mut self, val: ::std::os::raw::c_int) {
+ unsafe {
+ let val: u32 = ::std::mem::transmute(val);
+ self._bitfield_1.set(160usize, 32u8, val as u64)
+ }
+ }
+ #[inline]
+ pub fn g(&self) -> ::std::os::raw::c_int {
+ unsafe {
+ ::std::mem::transmute(self._bitfield_1.get(192usize, 32u8) as u32)
+ }
+ }
+ #[inline]
+ pub fn set_g(&mut self, val: ::std::os::raw::c_int) {
+ unsafe {
+ let val: u32 = ::std::mem::transmute(val);
+ self._bitfield_1.set(192usize, 32u8, val as u64)
+ }
+ }
+ #[inline]
+ pub fn h(&self) -> ::std::os::raw::c_int {
+ unsafe {
+ ::std::mem::transmute(self._bitfield_1.get(224usize, 32u8) as u32)
+ }
+ }
+ #[inline]
+ pub fn set_h(&mut self, val: ::std::os::raw::c_int) {
+ unsafe {
+ let val: u32 = ::std::mem::transmute(val);
+ self._bitfield_1.set(224usize, 32u8, val as u64)
+ }
+ }
+ #[inline]
+ pub fn i(&self) -> ::std::os::raw::c_int {
+ unsafe {
+ ::std::mem::transmute(self._bitfield_1.get(256usize, 32u8) as u32)
+ }
+ }
+ #[inline]
+ pub fn set_i(&mut self, val: ::std::os::raw::c_int) {
+ unsafe {
+ let val: u32 = ::std::mem::transmute(val);
+ self._bitfield_1.set(256usize, 32u8, val as u64)
+ }
+ }
+ #[inline]
+ pub fn j(&self) -> ::std::os::raw::c_int {
+ unsafe {
+ ::std::mem::transmute(self._bitfield_1.get(288usize, 32u8) as u32)
+ }
+ }
+ #[inline]
+ pub fn set_j(&mut self, val: ::std::os::raw::c_int) {
+ unsafe {
+ let val: u32 = ::std::mem::transmute(val);
+ self._bitfield_1.set(288usize, 32u8, val as u64)
+ }
+ }
+ #[inline]
+ pub fn k(&self) -> ::std::os::raw::c_int {
+ unsafe {
+ ::std::mem::transmute(self._bitfield_1.get(320usize, 32u8) as u32)
+ }
+ }
+ #[inline]
+ pub fn set_k(&mut self, val: ::std::os::raw::c_int) {
+ unsafe {
+ let val: u32 = ::std::mem::transmute(val);
+ self._bitfield_1.set(320usize, 32u8, val as u64)
+ }
}
}
diff --git a/tests/expectations/tests/transform-op.rs b/tests/expectations/tests/transform-op.rs
index 64c588d..84a9460 100644
--- a/tests/expectations/tests/transform-op.rs
+++ b/tests/expectations/tests/transform-op.rs
@@ -57,7 +57,11 @@
}
impl<T> Default for StylePoint<T> {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ unsafe {
+ let mut s: Self = ::std::mem::uninitialized();
+ ::std::ptr::write_bytes(&mut s, 0, 1);
+ s
+ }
}
}
#[repr(C)]
@@ -86,7 +90,11 @@
}
impl<T> Default for StyleFoo_Foo_Body<T> {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ unsafe {
+ let mut s: Self = ::std::mem::uninitialized();
+ ::std::ptr::write_bytes(&mut s, 0, 1);
+ s
+ }
}
}
#[repr(C)]
@@ -98,7 +106,11 @@
}
impl<T> Default for StyleFoo_Bar_Body<T> {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ unsafe {
+ let mut s: Self = ::std::mem::uninitialized();
+ ::std::ptr::write_bytes(&mut s, 0, 1);
+ s
+ }
}
}
#[repr(C)]
@@ -110,7 +122,11 @@
}
impl<T> Default for StyleFoo_Baz_Body<T> {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ unsafe {
+ let mut s: Self = ::std::mem::uninitialized();
+ ::std::ptr::write_bytes(&mut s, 0, 1);
+ s
+ }
}
}
#[repr(C)]
@@ -120,7 +136,11 @@
}
impl Default for StyleFoo__bindgen_ty_1 {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ unsafe {
+ let mut s: Self = ::std::mem::uninitialized();
+ ::std::ptr::write_bytes(&mut s, 0, 1);
+ s
+ }
}
}
#[repr(C)]
@@ -145,7 +165,11 @@
}
impl<T> Default for StyleBar_StyleBar1_Body<T> {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ unsafe {
+ let mut s: Self = ::std::mem::uninitialized();
+ ::std::ptr::write_bytes(&mut s, 0, 1);
+ s
+ }
}
}
#[repr(C)]
@@ -156,7 +180,11 @@
}
impl<T> Default for StyleBar_StyleBar2_Body<T> {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ unsafe {
+ let mut s: Self = ::std::mem::uninitialized();
+ ::std::ptr::write_bytes(&mut s, 0, 1);
+ s
+ }
}
}
#[repr(C)]
@@ -167,7 +195,11 @@
}
impl<T> Default for StyleBar_StyleBar3_Body<T> {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ unsafe {
+ let mut s: Self = ::std::mem::uninitialized();
+ ::std::ptr::write_bytes(&mut s, 0, 1);
+ s
+ }
}
}
#[repr(C)]
@@ -181,7 +213,11 @@
}
impl<T> Default for StyleBar<T> {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ unsafe {
+ let mut s: Self = ::std::mem::uninitialized();
+ ::std::ptr::write_bytes(&mut s, 0, 1);
+ s
+ }
}
}
#[test]
diff --git a/tests/expectations/tests/type_alias_partial_template_especialization.rs b/tests/expectations/tests/type_alias_partial_template_especialization.rs
index a80f46b..44449f2 100644
--- a/tests/expectations/tests/type_alias_partial_template_especialization.rs
+++ b/tests/expectations/tests/type_alias_partial_template_especialization.rs
@@ -14,6 +14,10 @@
}
impl<T> Default for Rooted<T> {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
diff --git a/tests/expectations/tests/typeref.rs b/tests/expectations/tests/typeref.rs
index b62ce92..1c34be7 100644
--- a/tests/expectations/tests/typeref.rs
+++ b/tests/expectations/tests/typeref.rs
@@ -65,12 +65,20 @@
}
impl Default for mozilla_StyleShapeSource__bindgen_ty_1 {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
impl Default for mozilla_StyleShapeSource {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
@@ -98,7 +106,11 @@
}
impl Default for Bar {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
@@ -130,7 +142,11 @@
}
impl Default for nsFoo {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[test]
diff --git a/tests/expectations/tests/typeref_1_0.rs b/tests/expectations/tests/typeref_1_0.rs
index 75b4196..2820d9f 100644
--- a/tests/expectations/tests/typeref_1_0.rs
+++ b/tests/expectations/tests/typeref_1_0.rs
@@ -149,7 +149,11 @@
}
impl Default for Bar {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ unsafe {
+ let mut s: Self = ::std::mem::uninitialized();
+ ::std::ptr::write_bytes(&mut s, 0, 1);
+ s
+ }
}
}
#[repr(C)]
diff --git a/tests/expectations/tests/union-align.rs b/tests/expectations/tests/union-align.rs
index 7151ba4..8612764 100644
--- a/tests/expectations/tests/union-align.rs
+++ b/tests/expectations/tests/union-align.rs
@@ -31,7 +31,11 @@
}
impl Default for Bar {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ unsafe {
+ let mut s: Self = ::std::mem::uninitialized();
+ ::std::ptr::write_bytes(&mut s, 0, 1);
+ s
+ }
}
}
#[repr(C)]
@@ -60,6 +64,10 @@
}
impl Default for Baz {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ unsafe {
+ let mut s: Self = ::std::mem::uninitialized();
+ ::std::ptr::write_bytes(&mut s, 0, 1);
+ s
+ }
}
}
diff --git a/tests/expectations/tests/union-in-ns.rs b/tests/expectations/tests/union-in-ns.rs
index abb330b..b52c6c3 100644
--- a/tests/expectations/tests/union-in-ns.rs
+++ b/tests/expectations/tests/union-in-ns.rs
@@ -39,7 +39,11 @@
}
impl Default for bar {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
}
diff --git a/tests/expectations/tests/union_bitfield.rs b/tests/expectations/tests/union_bitfield.rs
index cf3595e..9e07a1d 100644
--- a/tests/expectations/tests/union_bitfield.rs
+++ b/tests/expectations/tests/union_bitfield.rs
@@ -113,7 +113,11 @@
}
impl Default for U4 {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
impl U4 {
@@ -165,7 +169,11 @@
}
impl Default for B {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
impl B {
diff --git a/tests/expectations/tests/union_bitfield_1_0.rs b/tests/expectations/tests/union_bitfield_1_0.rs
index 7c846da..2227746 100644
--- a/tests/expectations/tests/union_bitfield_1_0.rs
+++ b/tests/expectations/tests/union_bitfield_1_0.rs
@@ -284,7 +284,11 @@
}
impl Default for HasBigBitfield {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ unsafe {
+ let mut s: Self = ::std::mem::uninitialized();
+ ::std::ptr::write_bytes(&mut s, 0, 1);
+ s
+ }
}
}
impl ::std::cmp::PartialEq for HasBigBitfield {
diff --git a/tests/expectations/tests/union_dtor.rs b/tests/expectations/tests/union_dtor.rs
index a06e8cc..94ad3fd 100644
--- a/tests/expectations/tests/union_dtor.rs
+++ b/tests/expectations/tests/union_dtor.rs
@@ -53,7 +53,11 @@
}
impl Default for UnionWithDtor {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
impl UnionWithDtor {
diff --git a/tests/expectations/tests/union_fields.rs b/tests/expectations/tests/union_fields.rs
index e605b0b..6cd0d56 100644
--- a/tests/expectations/tests/union_fields.rs
+++ b/tests/expectations/tests/union_fields.rs
@@ -64,6 +64,10 @@
}
impl Default for nsStyleUnion {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
diff --git a/tests/expectations/tests/union_template.rs b/tests/expectations/tests/union_template.rs
index 6a366f9..9c3d7a0 100644
--- a/tests/expectations/tests/union_template.rs
+++ b/tests/expectations/tests/union_template.rs
@@ -18,7 +18,11 @@
}
impl Default for NastyStruct__bindgen_ty_1 {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
@@ -28,12 +32,20 @@
}
impl Default for NastyStruct__bindgen_ty_2 {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
impl Default for NastyStruct {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
@@ -43,6 +55,10 @@
}
impl Default for Whatever {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
diff --git a/tests/expectations/tests/union_with_anon_struct.rs b/tests/expectations/tests/union_with_anon_struct.rs
index 7d061ce..afb7350 100644
--- a/tests/expectations/tests/union_with_anon_struct.rs
+++ b/tests/expectations/tests/union_with_anon_struct.rs
@@ -73,6 +73,10 @@
}
impl Default for foo {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
diff --git a/tests/expectations/tests/union_with_anon_struct_bitfield.rs b/tests/expectations/tests/union_with_anon_struct_bitfield.rs
index 2e3e641..09ed515 100644
--- a/tests/expectations/tests/union_with_anon_struct_bitfield.rs
+++ b/tests/expectations/tests/union_with_anon_struct_bitfield.rs
@@ -182,6 +182,10 @@
}
impl Default for foo {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
diff --git a/tests/expectations/tests/union_with_anon_union.rs b/tests/expectations/tests/union_with_anon_union.rs
index 83e4801..a24962c 100644
--- a/tests/expectations/tests/union_with_anon_union.rs
+++ b/tests/expectations/tests/union_with_anon_union.rs
@@ -55,7 +55,11 @@
}
impl Default for foo__bindgen_ty_1 {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[test]
@@ -78,6 +82,10 @@
}
impl Default for foo {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
diff --git a/tests/expectations/tests/union_with_anon_unnamed_struct.rs b/tests/expectations/tests/union_with_anon_unnamed_struct.rs
index 5802f56..94380d1 100644
--- a/tests/expectations/tests/union_with_anon_unnamed_struct.rs
+++ b/tests/expectations/tests/union_with_anon_unnamed_struct.rs
@@ -109,6 +109,10 @@
}
impl Default for pixel {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
diff --git a/tests/expectations/tests/union_with_anon_unnamed_union.rs b/tests/expectations/tests/union_with_anon_unnamed_union.rs
index fc46573..2004ff4 100644
--- a/tests/expectations/tests/union_with_anon_unnamed_union.rs
+++ b/tests/expectations/tests/union_with_anon_unnamed_union.rs
@@ -56,7 +56,11 @@
}
impl Default for foo__bindgen_ty_1 {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[test]
@@ -79,6 +83,10 @@
}
impl Default for foo {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
diff --git a/tests/expectations/tests/union_with_big_member.rs b/tests/expectations/tests/union_with_big_member.rs
index 6425c11..3f9294d 100644
--- a/tests/expectations/tests/union_with_big_member.rs
+++ b/tests/expectations/tests/union_with_big_member.rs
@@ -50,7 +50,11 @@
}
impl Default for WithBigArray {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
@@ -98,7 +102,11 @@
}
impl Default for WithBigArray2 {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
@@ -146,6 +154,10 @@
}
impl Default for WithBigMember {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
diff --git a/tests/expectations/tests/union_with_big_member_1_0.rs b/tests/expectations/tests/union_with_big_member_1_0.rs
index 3aba485..541c9d4 100644
--- a/tests/expectations/tests/union_with_big_member_1_0.rs
+++ b/tests/expectations/tests/union_with_big_member_1_0.rs
@@ -99,7 +99,11 @@
}
impl Default for WithBigArray {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ unsafe {
+ let mut s: Self = ::std::mem::uninitialized();
+ ::std::ptr::write_bytes(&mut s, 0, 1);
+ s
+ }
}
}
#[repr(C)]
@@ -202,6 +206,10 @@
}
impl Default for WithBigMember {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ unsafe {
+ let mut s: Self = ::std::mem::uninitialized();
+ ::std::ptr::write_bytes(&mut s, 0, 1);
+ s
+ }
}
}
diff --git a/tests/expectations/tests/union_with_nesting.rs b/tests/expectations/tests/union_with_nesting.rs
index 55045f2..54a3179 100644
--- a/tests/expectations/tests/union_with_nesting.rs
+++ b/tests/expectations/tests/union_with_nesting.rs
@@ -64,7 +64,11 @@
}
impl Default for foo__bindgen_ty_1__bindgen_ty_1 {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
@@ -114,7 +118,11 @@
}
impl Default for foo__bindgen_ty_1__bindgen_ty_2 {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[test]
@@ -132,7 +140,11 @@
}
impl Default for foo__bindgen_ty_1 {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[test]
@@ -155,6 +167,10 @@
}
impl Default for foo {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
diff --git a/tests/expectations/tests/use-core.rs b/tests/expectations/tests/use-core.rs
index 4cb2851..d919b6e 100644
--- a/tests/expectations/tests/use-core.rs
+++ b/tests/expectations/tests/use-core.rs
@@ -44,7 +44,11 @@
}
impl Default for foo {
fn default() -> Self {
- unsafe { ::core::mem::zeroed() }
+ let mut s = ::core::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::core::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
@@ -92,7 +96,11 @@
}
impl Default for _bindgen_ty_1 {
fn default() -> Self {
- unsafe { ::core::mem::zeroed() }
+ let mut s = ::core::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::core::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
extern "C" {
diff --git a/tests/expectations/tests/use-core_1_0.rs b/tests/expectations/tests/use-core_1_0.rs
index 2d3b39d..61ddfc4 100644
--- a/tests/expectations/tests/use-core_1_0.rs
+++ b/tests/expectations/tests/use-core_1_0.rs
@@ -92,7 +92,11 @@
}
impl Default for foo {
fn default() -> Self {
- unsafe { ::core::mem::zeroed() }
+ unsafe {
+ let mut s: Self = ::core::mem::uninitialized();
+ ::core::ptr::write_bytes(&mut s, 0, 1);
+ s
+ }
}
}
#[repr(C)]
diff --git a/tests/expectations/tests/using.rs b/tests/expectations/tests/using.rs
index 28b4308..4749ed5 100644
--- a/tests/expectations/tests/using.rs
+++ b/tests/expectations/tests/using.rs
@@ -14,7 +14,11 @@
}
impl<T> Default for Point<T> {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
pub type IntPoint2D = Point<::std::os::raw::c_int>;
diff --git a/tests/expectations/tests/virtual_dtor.rs b/tests/expectations/tests/virtual_dtor.rs
index f50130c..c3c66e9 100644
--- a/tests/expectations/tests/virtual_dtor.rs
+++ b/tests/expectations/tests/virtual_dtor.rs
@@ -27,7 +27,11 @@
}
impl Default for nsSlots {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
extern "C" {
diff --git a/tests/expectations/tests/virtual_inheritance.rs b/tests/expectations/tests/virtual_inheritance.rs
index 8283b6d..eac6aa6 100644
--- a/tests/expectations/tests/virtual_inheritance.rs
+++ b/tests/expectations/tests/virtual_inheritance.rs
@@ -56,7 +56,11 @@
}
impl Default for B {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
@@ -87,7 +91,11 @@
}
impl Default for C {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
#[repr(C)]
@@ -112,6 +120,10 @@
}
impl Default for D {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
diff --git a/tests/expectations/tests/virtual_overloaded.rs b/tests/expectations/tests/virtual_overloaded.rs
index 9a9d642..4556b1b 100644
--- a/tests/expectations/tests/virtual_overloaded.rs
+++ b/tests/expectations/tests/virtual_overloaded.rs
@@ -27,7 +27,11 @@
}
impl Default for C {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
extern "C" {
diff --git a/tests/expectations/tests/vtable_recursive_sig.rs b/tests/expectations/tests/vtable_recursive_sig.rs
index 0285154..ca77bc8 100644
--- a/tests/expectations/tests/vtable_recursive_sig.rs
+++ b/tests/expectations/tests/vtable_recursive_sig.rs
@@ -27,7 +27,11 @@
}
impl Default for Base {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
extern "C" {
@@ -54,6 +58,10 @@
}
impl Default for Derived {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
diff --git a/tests/expectations/tests/weird_bitfields.rs b/tests/expectations/tests/weird_bitfields.rs
index d25c802..c4dfa55 100644
--- a/tests/expectations/tests/weird_bitfields.rs
+++ b/tests/expectations/tests/weird_bitfields.rs
@@ -286,7 +286,11 @@
}
impl Default for Weird {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
impl Weird {
diff --git a/tests/expectations/tests/what_is_going_on.rs b/tests/expectations/tests/what_is_going_on.rs
index 8f70466..b4f4279 100644
--- a/tests/expectations/tests/what_is_going_on.rs
+++ b/tests/expectations/tests/what_is_going_on.rs
@@ -33,7 +33,11 @@
}
impl<F> Default for PointTyped<F> {
fn default() -> Self {
- unsafe { ::std::mem::zeroed() }
+ let mut s = ::std::mem::MaybeUninit::<Self>::uninit();
+ unsafe {
+ ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1);
+ s.assume_init()
+ }
}
}
pub type IntPoint = PointTyped<f32>;
diff --git a/tests/headers/bitfield_pragma_packed.h b/tests/headers/bitfield_pragma_packed.h
new file mode 100644
index 0000000..b4011ca
--- /dev/null
+++ b/tests/headers/bitfield_pragma_packed.h
@@ -0,0 +1,9 @@
+#pragma pack(push, 1)
+struct Struct {
+ unsigned char a : 1;
+ unsigned char b : 1;
+ unsigned char c : 6;
+ unsigned short int d : 16;
+ unsigned char e : 8;
+};
+#pragma pack(pop)
diff --git a/tests/headers/canonical-types.hpp b/tests/headers/canonical-types.hpp
new file mode 100644
index 0000000..c8eadd7
--- /dev/null
+++ b/tests/headers/canonical-types.hpp
@@ -0,0 +1,51 @@
+// bindgen-flags: -- -std=c++14
+
+// Issue #2078. To pick up the definition of `ClassCInnerA`,
+// `ty.canonical_type().declaration().definition()` is needed.
+
+template<class T>
+class ClassA {
+public:
+ class ClassAInner {
+ public:
+ T *x;
+ };
+};
+
+template<class D, class I>
+class ClassB {
+public:
+ void foo() {
+ ((D *)0)->quux();
+ }
+};
+
+template<typename T>
+class ClassC {
+ struct ClassCInnerA;
+
+ struct ClassCInnerB {
+ ClassCInnerA *cache;
+ };
+ static_assert(sizeof(ClassCInnerB) > 0, "");
+
+ struct ClassCInnerA {
+ ClassCInnerB *member;
+ };
+
+public:
+ class ClassCInnerCRTP : public ClassB<ClassCInnerCRTP, typename ClassA<ClassCInnerA>::ClassAInner> {
+ public:
+ void quux() {
+ ((typename ClassA<ClassCInnerA>::ClassAInner *)0)->x->member;
+ }
+ };
+};
+
+class ClassD : public ClassB<ClassD, ClassC<int>::ClassCInnerCRTP> {
+public:
+ void bar() {
+ ((ClassC<int>::ClassCInnerCRTP *)0)->foo();
+ }
+};
+
diff --git a/tests/headers/class.hpp b/tests/headers/class.hpp
index f77ac92..a90e373 100644
--- a/tests/headers/class.hpp
+++ b/tests/headers/class.hpp
@@ -1,4 +1,4 @@
-// bindgen-flags: --with-derive-hash --with-derive-partialeq --with-derive-eq --with-derive-partialord --with-derive-ord
+// bindgen-flags: --with-derive-hash --with-derive-partialeq --with-derive-eq --with-derive-partialord --with-derive-ord --rust-target 1.40
//
class C {
int a;
diff --git a/tests/headers/derive-bitfield-method-same-name.hpp b/tests/headers/derive-bitfield-method-same-name.hpp
index 4b7b21e..ea9d801 100644
--- a/tests/headers/derive-bitfield-method-same-name.hpp
+++ b/tests/headers/derive-bitfield-method-same-name.hpp
@@ -1,4 +1,4 @@
-// bindgen-flags: --with-derive-partialeq --impl-partialeq --impl-debug
+// bindgen-flags: --with-derive-partialeq --impl-partialeq --impl-debug --rust-target 1.40
/// Because this struct have array larger than 32 items
/// and --with-derive-partialeq --impl-partialeq --impl-debug is provided,
diff --git a/tests/headers/derive-clone.h b/tests/headers/derive-clone.h
index a84d35c..aacbcaf 100644
--- a/tests/headers/derive-clone.h
+++ b/tests/headers/derive-clone.h
@@ -1,3 +1,5 @@
+// bindgen-flags: --rust-target 1.40
+//
/// This struct should derive `Clone`.
struct ShouldDeriveClone {
diff --git a/tests/headers/derive-debug-bitfield-core.hpp b/tests/headers/derive-debug-bitfield-core.hpp
index 5d78e74..2073cc2 100644
--- a/tests/headers/derive-debug-bitfield-core.hpp
+++ b/tests/headers/derive-debug-bitfield-core.hpp
@@ -1,4 +1,4 @@
-// bindgen-flags: --impl-debug --use-core --raw-line "extern crate core;"
+// bindgen-flags: --impl-debug --use-core --raw-line "extern crate core;" --rust-target 1.40
class C {
bool a: 1;
diff --git a/tests/headers/derive-debug-bitfield.hpp b/tests/headers/derive-debug-bitfield.hpp
index df43e6a..b689190 100644
--- a/tests/headers/derive-debug-bitfield.hpp
+++ b/tests/headers/derive-debug-bitfield.hpp
@@ -1,4 +1,4 @@
-// bindgen-flags: --impl-debug
+// bindgen-flags: --impl-debug --rust-target 1.40
class C {
bool a: 1;
diff --git a/tests/headers/derive-debug-function-pointer.hpp b/tests/headers/derive-debug-function-pointer.hpp
index a370dee..147097f 100644
--- a/tests/headers/derive-debug-function-pointer.hpp
+++ b/tests/headers/derive-debug-function-pointer.hpp
@@ -1,4 +1,4 @@
-// bindgen-flags: --impl-debug
+// bindgen-flags: --impl-debug --rust-target 1.40
class Nice {
typedef void (*Function) (int data);
diff --git a/tests/headers/derive-debug-generic.hpp b/tests/headers/derive-debug-generic.hpp
index d515851..50122fa 100644
--- a/tests/headers/derive-debug-generic.hpp
+++ b/tests/headers/derive-debug-generic.hpp
@@ -1,4 +1,4 @@
-// bindgen-flags: --impl-debug
+// bindgen-flags: --impl-debug --rust-target 1.40
template<typename T>
class Generic {
diff --git a/tests/headers/derive-debug-opaque-template-instantiation.hpp b/tests/headers/derive-debug-opaque-template-instantiation.hpp
index 0dead78..0c70fcc 100644
--- a/tests/headers/derive-debug-opaque-template-instantiation.hpp
+++ b/tests/headers/derive-debug-opaque-template-instantiation.hpp
@@ -1,4 +1,4 @@
-// bindgen-flags: --impl-debug
+// bindgen-flags: --impl-debug --rust-target 1.40
// This type is opaque because the second template parameter
// is a non-type template parameter
diff --git a/tests/headers/derive-debug-opaque.hpp b/tests/headers/derive-debug-opaque.hpp
index 0ce1d63..715d3c8 100644
--- a/tests/headers/derive-debug-opaque.hpp
+++ b/tests/headers/derive-debug-opaque.hpp
@@ -1,4 +1,4 @@
-// bindgen-flags: --opaque-type "Opaque" --impl-debug
+// bindgen-flags: --opaque-type "Opaque" --impl-debug --rust-target 1.40
class Opaque {
int i;
diff --git a/tests/headers/derive-partialeq-base.hpp b/tests/headers/derive-partialeq-base.hpp
index 989cbe6..2a57dca 100644
--- a/tests/headers/derive-partialeq-base.hpp
+++ b/tests/headers/derive-partialeq-base.hpp
@@ -1,4 +1,4 @@
-// bindgen-flags: --with-derive-partialeq --impl-partialeq
+// bindgen-flags: --with-derive-partialeq --impl-partialeq --rust-target 1.40
class Base {
int large[33];
diff --git a/tests/headers/derive-partialeq-bitfield.hpp b/tests/headers/derive-partialeq-bitfield.hpp
index ac2cac6..f6dd82e 100644
--- a/tests/headers/derive-partialeq-bitfield.hpp
+++ b/tests/headers/derive-partialeq-bitfield.hpp
@@ -1,4 +1,4 @@
-// bindgen-flags: --with-derive-partialeq --impl-partialeq
+// bindgen-flags: --with-derive-partialeq --impl-partialeq --rust-target 1.40
class C {
bool a: 1;
diff --git a/tests/headers/derive-partialeq-core.h b/tests/headers/derive-partialeq-core.h
index 6da5b78..18eed8b 100644
--- a/tests/headers/derive-partialeq-core.h
+++ b/tests/headers/derive-partialeq-core.h
@@ -1,4 +1,4 @@
-// bindgen-flags: --with-derive-partialeq --impl-partialeq --use-core --raw-line "extern crate core;"
+// bindgen-flags: --with-derive-partialeq --impl-partialeq --use-core --raw-line "extern crate core;" --rust-target 1.40
struct C {
int large_array[420];
diff --git a/tests/headers/enum-no-debug-rust.h b/tests/headers/enum-no-debug-rust.h
new file mode 100644
index 0000000..7cb7398
--- /dev/null
+++ b/tests/headers/enum-no-debug-rust.h
@@ -0,0 +1,3 @@
+// bindgen-flags: --no-derive-debug --default-enum-style=rust --constified-enum-module=Neg
+
+#include "enum.h"
diff --git a/tests/headers/enum.h b/tests/headers/enum.h
index 8b41f85..0147433 100644
--- a/tests/headers/enum.h
+++ b/tests/headers/enum.h
@@ -23,3 +23,9 @@
NoDebug1,
NoDebug2,
};
+
+/** <div rustbindgen derive="Debug"></div> */
+enum Debug {
+ Debug1,
+ Debug2,
+};
\ No newline at end of file
diff --git a/tests/headers/explicit-padding.h b/tests/headers/explicit-padding.h
new file mode 100644
index 0000000..d228961
--- /dev/null
+++ b/tests/headers/explicit-padding.h
@@ -0,0 +1,11 @@
+// bindgen-flags: --explicit-padding
+
+typedef unsigned char uint8_t;
+typedef unsigned short uint16_t;
+typedef unsigned int uint32_t;
+
+struct pad_me {
+ uint8_t first;
+ uint32_t second;
+ uint16_t third;
+};
diff --git a/tests/headers/extern-const-struct.h b/tests/headers/extern-const-struct.h
index 10006e8..1027127 100644
--- a/tests/headers/extern-const-struct.h
+++ b/tests/headers/extern-const-struct.h
@@ -1,3 +1,5 @@
+// bindgen-flags: --rust-target 1.40
+
struct nsFoo {
float details[400];
};
diff --git a/tests/headers/issue-1977-larger-arrays.hpp b/tests/headers/issue-1977-larger-arrays.hpp
new file mode 100644
index 0000000..58e8e4d
--- /dev/null
+++ b/tests/headers/issue-1977-larger-arrays.hpp
@@ -0,0 +1,9 @@
+// bindgen-flags: --with-derive-hash --with-derive-partialeq --with-derive-eq
+//
+struct S {
+ char large_array[33];
+};
+
+template<typename T> struct ST {
+ T large_array[33];
+};
diff --git a/tests/headers/issue-372.hpp b/tests/headers/issue-372.hpp
index 7127be2..a2a5d45 100644
--- a/tests/headers/issue-372.hpp
+++ b/tests/headers/issue-372.hpp
@@ -1,4 +1,4 @@
-// bindgen-flags: --enable-cxx-namespaces --rustified-enum ".*"
+// bindgen-flags: --enable-cxx-namespaces --rustified-enum ".*" --rust-target 1.40
template <typename a, int b> class c { a e[b]; };
class d;
template <typename g, g f> class C { c<d, f> h; };
diff --git a/tests/headers/issue-648-derive-debug-with-padding.h b/tests/headers/issue-648-derive-debug-with-padding.h
index f528c10..0860ce9 100644
--- a/tests/headers/issue-648-derive-debug-with-padding.h
+++ b/tests/headers/issue-648-derive-debug-with-padding.h
@@ -1,9 +1,7 @@
-// bindgen-flags: --with-derive-hash --with-derive-partialeq --with-derive-eq --impl-partialeq
+// bindgen-flags: --with-derive-hash --with-derive-partialeq --with-derive-eq --impl-partialeq --rust-target 1.40
/**
* We emit a `[u8; 63usize]` padding field for this struct, which cannot derive
- * Debug/Hash because 63 is over the hard coded limit. (Yes, this struct doesn't end
- * up with the reight alignment, we're waiting on `#[repr(align="N")]` to land
- * in rustc).
+ * Debug/Hash because 63 is over the hard coded limit.
*/
struct NoDebug {
char c;
@@ -14,7 +12,7 @@
* This should derive Debug/Hash/PartialEq/Eq because the padding size is less than the max derive
* Debug/Hash/PartialEq/Eq impl for arrays. However, we conservatively don't derive Debug/Hash because
* we determine Debug derive-ability before we compute padding, which happens at
- * codegen. (Again, we expect to get the alignment wrong for similar reasons.)
+ * codegen.
*/
struct ShouldDeriveDebugButDoesNot {
char c[32];
diff --git a/tests/headers/issue-710-must-use-type.h b/tests/headers/issue-710-must-use-type.h
new file mode 100644
index 0000000..276f636
--- /dev/null
+++ b/tests/headers/issue-710-must-use-type.h
@@ -0,0 +1,8 @@
+// bindgen-flags: --must-use-type A
+
+struct A;
+
+/** <div rustbindgen mustusetype></div> */
+struct B;
+
+struct C;
diff --git a/tests/headers/layout_array.h b/tests/headers/layout_array.h
index 239e52b..e6a57f7 100644
--- a/tests/headers/layout_array.h
+++ b/tests/headers/layout_array.h
@@ -1,4 +1,4 @@
-// bindgen-flags: --with-derive-hash --with-derive-partialeq --with-derive-eq --impl-partialeq
+// bindgen-flags: --with-derive-hash --with-derive-partialeq --with-derive-eq --impl-partialeq --rust-target 1.40
typedef unsigned char uint8_t;
typedef unsigned short uint16_t;
typedef unsigned int uint32_t;
diff --git a/tests/headers/layout_array_too_long.h b/tests/headers/layout_array_too_long.h
index d0d34ba..53e4d8b 100644
--- a/tests/headers/layout_array_too_long.h
+++ b/tests/headers/layout_array_too_long.h
@@ -1,4 +1,4 @@
-// bindgen-flags: --with-derive-hash --with-derive-partialeq --with-derive-eq --impl-partialeq --rustified-enum ".*"
+// bindgen-flags: --with-derive-hash --with-derive-partialeq --with-derive-eq --impl-partialeq --rustified-enum ".*" --rust-target 1.40
typedef unsigned char uint8_t;
typedef unsigned short uint16_t;
typedef unsigned int uint32_t;
diff --git a/tests/headers/layout_eth_conf.h b/tests/headers/layout_eth_conf.h
index 93ab840..9446bff 100644
--- a/tests/headers/layout_eth_conf.h
+++ b/tests/headers/layout_eth_conf.h
@@ -1,4 +1,4 @@
-// bindgen-flags: --with-derive-hash --with-derive-partialeq --with-derive-eq --rustified-enum ".*"
+// bindgen-flags: --with-derive-hash --with-derive-partialeq --with-derive-eq --rustified-enum ".*" --rust-target 1.40
typedef unsigned char uint8_t;
typedef unsigned short uint16_t;
typedef unsigned int uint32_t;
diff --git a/tests/headers/layout_kni_mbuf.h b/tests/headers/layout_kni_mbuf.h
index ff16114..4d604aa 100644
--- a/tests/headers/layout_kni_mbuf.h
+++ b/tests/headers/layout_kni_mbuf.h
@@ -1,3 +1,4 @@
+// bindgen-flags: --rust-target 1.40
#define RTE_CACHE_LINE_MIN_SIZE 64 /**< Minimum Cache line size. */
diff --git a/tests/headers/layout_large_align_field.h b/tests/headers/layout_large_align_field.h
index f292bb7..63aea90 100644
--- a/tests/headers/layout_large_align_field.h
+++ b/tests/headers/layout_large_align_field.h
@@ -1,4 +1,4 @@
-// bindgen-flags: --rustified-enum ".*"
+// bindgen-flags: --rustified-enum ".*" --rust-target 1.40
typedef unsigned char uint8_t;
typedef unsigned short uint16_t;
diff --git a/tests/headers/nested-template-typedef.hpp b/tests/headers/nested-template-typedef.hpp
new file mode 100644
index 0000000..8c83de5
--- /dev/null
+++ b/tests/headers/nested-template-typedef.hpp
@@ -0,0 +1,8 @@
+template<typename T>
+class Foo {
+public:
+ template<typename U>
+ struct Bar {
+ typedef Foo<U> FooU;
+ };
+};
diff --git a/tests/headers/no_debug_bypass_impl_debug.hpp b/tests/headers/no_debug_bypass_impl_debug.hpp
index a586441..d934d2c 100644
--- a/tests/headers/no_debug_bypass_impl_debug.hpp
+++ b/tests/headers/no_debug_bypass_impl_debug.hpp
@@ -1,4 +1,4 @@
-// bindgen-flags: --no-debug "NoDebug" --impl-debug
+// bindgen-flags: --no-debug "NoDebug" --impl-debug --rust-target 1.40
template<typename T>
class Generic {
diff --git a/tests/headers/no_default_bypass_derive_default.hpp b/tests/headers/no_default_bypass_derive_default.hpp
index 0f83390..ab0fdfa 100644
--- a/tests/headers/no_default_bypass_derive_default.hpp
+++ b/tests/headers/no_default_bypass_derive_default.hpp
@@ -1,4 +1,4 @@
-// bindgen-flags: --no-default "NoDefault"
+// bindgen-flags: --no-default "NoDefault" --rust-target 1.40
template<typename T>
class Generic {
diff --git a/tests/headers/opaque-template-inst-member.hpp b/tests/headers/opaque-template-inst-member.hpp
index 6516aa5..9b32791 100644
--- a/tests/headers/opaque-template-inst-member.hpp
+++ b/tests/headers/opaque-template-inst-member.hpp
@@ -1,4 +1,4 @@
-// bindgen-flags: --opaque-type 'OpaqueTemplate' --with-derive-hash --with-derive-partialeq --impl-partialeq --with-derive-eq
+// bindgen-flags: --opaque-type 'OpaqueTemplate' --with-derive-hash --with-derive-partialeq --impl-partialeq --with-derive-eq --rust-target 1.40
template<typename T>
class OpaqueTemplate {
diff --git a/tests/headers/parm-union.hpp b/tests/headers/parm-union.hpp
new file mode 100644
index 0000000..e36df69
--- /dev/null
+++ b/tests/headers/parm-union.hpp
@@ -0,0 +1,4 @@
+struct Struct
+{
+ void Function(union Union&);
+};
diff --git a/tests/headers/qualified-dependent-types.hpp b/tests/headers/qualified-dependent-types.hpp
new file mode 100644
index 0000000..fcdfc87
--- /dev/null
+++ b/tests/headers/qualified-dependent-types.hpp
@@ -0,0 +1,16 @@
+// Issue #2085.
+
+template<typename T>
+struct Foo;
+
+template<typename T, typename U>
+struct Bar {};
+
+template<typename T>
+struct Bar<T, void> {
+ using BarDependent = typename Foo<T>::Dependent;
+ void method(const BarDependent &);
+};
+
+template<typename T>
+void Bar<T, void>::method(const BarDependent &) {}
diff --git a/tests/headers/struct_with_derive_debug.h b/tests/headers/struct_with_derive_debug.h
index 201748d..4dc816b 100644
--- a/tests/headers/struct_with_derive_debug.h
+++ b/tests/headers/struct_with_derive_debug.h
@@ -1,4 +1,4 @@
-// bindgen-flags: --with-derive-hash --with-derive-partialeq --with-derive-eq
+// bindgen-flags: --with-derive-hash --with-derive-partialeq --with-derive-eq --rust-target 1.40
//
struct LittleArray {
int a[32];
diff --git a/tests/headers/struct_with_large_array.hpp b/tests/headers/struct_with_large_array.hpp
index 58e8e4d..974ca52 100644
--- a/tests/headers/struct_with_large_array.hpp
+++ b/tests/headers/struct_with_large_array.hpp
@@ -1,4 +1,4 @@
-// bindgen-flags: --with-derive-hash --with-derive-partialeq --with-derive-eq
+// bindgen-flags: --with-derive-hash --with-derive-partialeq --with-derive-eq --rust-target 1.40
//
struct S {
char large_array[33];
diff --git a/tests/tests.rs b/tests/tests.rs
index ced4854..323cf16 100644
--- a/tests/tests.rs
+++ b/tests/tests.rs
@@ -49,7 +49,7 @@
`rustfmt` with:
$ rustup update nightly
- $ rustup run nightly cargo install -f rustfmt-nightly
+ $ rustup component add rustfmt --toolchain nightly
"
);
}
