From cf471074712acaf4f938b6845a2fb9b211c1da79 Mon Sep 17 00:00:00 2001
From: Stephen Touset <stephen@squareup.com>
Date: Fri, 18 Nov 2022 15:18:10 -0500
Subject: [PATCH] Update bindgen bindings

---
 .../src/bindings/sudo_plugin.aarch64.rs       | 301 ++++++------------
 1 file changed, 103 insertions(+), 198 deletions(-)

diff --git a/sudo_plugin-sys/src/bindings/sudo_plugin.aarch64.rs b/sudo_plugin-sys/src/bindings/sudo_plugin.aarch64.rs
index c59fc6a..f7d90a3 100644
--- a/sudo_plugin-sys/src/bindings/sudo_plugin.aarch64.rs
+++ b/sudo_plugin-sys/src/bindings/sudo_plugin.aarch64.rs
@@ -1,4 +1,4 @@
-/* automatically generated by rust-bindgen 0.59.1 */
+/* automatically generated by rust-bindgen 0.61.0 */
 
 pub const SUDO_API_VERSION_MAJOR: u32 = 1;
 pub const SUDO_API_VERSION_MINOR: u32 = 17;
@@ -46,6 +46,9 @@ pub struct sudo_conv_message {
 }
 #[test]
 fn bindgen_test_layout_sudo_conv_message() {
+    const UNINIT: ::std::mem::MaybeUninit<sudo_conv_message> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<sudo_conv_message>(),
         16usize,
@@ -58,8 +61,7 @@ fn bindgen_test_layout_sudo_conv_message() {
     );
     assert_eq!(
         unsafe {
-            &(*(::std::ptr::null::<sudo_conv_message>())).msg_type as *const _
-                as usize
+            ::std::ptr::addr_of!((*ptr).msg_type) as usize - ptr as usize
         },
         0usize,
         concat!(
@@ -70,10 +72,7 @@ fn bindgen_test_layout_sudo_conv_message() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<sudo_conv_message>())).timeout as *const _
-                as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).timeout) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
@@ -83,10 +82,7 @@ fn bindgen_test_layout_sudo_conv_message() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<sudo_conv_message>())).msg as *const _
-                as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).msg) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -103,6 +99,9 @@ pub struct sudo_conv_reply {
 }
 #[test]
 fn bindgen_test_layout_sudo_conv_reply() {
+    const UNINIT: ::std::mem::MaybeUninit<sudo_conv_reply> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<sudo_conv_reply>(),
         8usize,
@@ -114,10 +113,7 @@ fn bindgen_test_layout_sudo_conv_reply() {
         concat!("Alignment of ", stringify!(sudo_conv_reply))
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<sudo_conv_reply>())).reply as *const _
-                as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).reply) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -143,6 +139,9 @@ pub struct sudo_conv_callback {
 }
 #[test]
 fn bindgen_test_layout_sudo_conv_callback() {
+    const UNINIT: ::std::mem::MaybeUninit<sudo_conv_callback> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<sudo_conv_callback>(),
         32usize,
@@ -154,10 +153,7 @@ fn bindgen_test_layout_sudo_conv_callback() {
         concat!("Alignment of ", stringify!(sudo_conv_callback))
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<sudo_conv_callback>())).version as *const _
-                as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).version) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -167,10 +163,7 @@ fn bindgen_test_layout_sudo_conv_callback() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<sudo_conv_callback>())).closure as *const _
-                as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).closure) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -181,8 +174,7 @@ fn bindgen_test_layout_sudo_conv_callback() {
     );
     assert_eq!(
         unsafe {
-            &(*(::std::ptr::null::<sudo_conv_callback>())).on_suspend
-                as *const _ as usize
+            ::std::ptr::addr_of!((*ptr).on_suspend) as usize - ptr as usize
         },
         16usize,
         concat!(
@@ -194,8 +186,7 @@ fn bindgen_test_layout_sudo_conv_callback() {
     );
     assert_eq!(
         unsafe {
-            &(*(::std::ptr::null::<sudo_conv_callback>())).on_resume as *const _
-                as usize
+            ::std::ptr::addr_of!((*ptr).on_resume) as usize - ptr as usize
         },
         24usize,
         concat!(
@@ -260,6 +251,9 @@ pub struct sudo_hook {
 }
 #[test]
 fn bindgen_test_layout_sudo_hook() {
+    const UNINIT: ::std::mem::MaybeUninit<sudo_hook> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<sudo_hook>(),
         24usize,
@@ -272,8 +266,7 @@ fn bindgen_test_layout_sudo_hook() {
     );
     assert_eq!(
         unsafe {
-            &(*(::std::ptr::null::<sudo_hook>())).hook_version as *const _
-                as usize
+            ::std::ptr::addr_of!((*ptr).hook_version) as usize - ptr as usize
         },
         0usize,
         concat!(
@@ -285,7 +278,7 @@ fn bindgen_test_layout_sudo_hook() {
     );
     assert_eq!(
         unsafe {
-            &(*(::std::ptr::null::<sudo_hook>())).hook_type as *const _ as usize
+            ::std::ptr::addr_of!((*ptr).hook_type) as usize - ptr as usize
         },
         4usize,
         concat!(
@@ -296,9 +289,7 @@ fn bindgen_test_layout_sudo_hook() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<sudo_hook>())).hook_fn as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).hook_fn) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -308,9 +299,7 @@ fn bindgen_test_layout_sudo_hook() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<sudo_hook>())).closure as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).closure) as usize - ptr as usize },
         16usize,
         concat!(
             "Offset of field: ",
@@ -382,6 +371,9 @@ pub struct sudo_plugin_event {
 }
 #[test]
 fn bindgen_test_layout_sudo_plugin_event() {
+    const UNINIT: ::std::mem::MaybeUninit<sudo_plugin_event> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<sudo_plugin_event>(),
         64usize,
@@ -393,10 +385,7 @@ fn bindgen_test_layout_sudo_plugin_event() {
         concat!("Alignment of ", stringify!(sudo_plugin_event))
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<sudo_plugin_event>())).set as *const _
-                as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).set) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -406,10 +395,7 @@ fn bindgen_test_layout_sudo_plugin_event() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<sudo_plugin_event>())).add as *const _
-                as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).add) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -419,10 +405,7 @@ fn bindgen_test_layout_sudo_plugin_event() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<sudo_plugin_event>())).del as *const _
-                as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).del) as usize - ptr as usize },
         16usize,
         concat!(
             "Offset of field: ",
@@ -432,10 +415,7 @@ fn bindgen_test_layout_sudo_plugin_event() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<sudo_plugin_event>())).pending as *const _
-                as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).pending) as usize - ptr as usize },
         24usize,
         concat!(
             "Offset of field: ",
@@ -445,10 +425,7 @@ fn bindgen_test_layout_sudo_plugin_event() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<sudo_plugin_event>())).fd as *const _
-                as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).fd) as usize - ptr as usize },
         32usize,
         concat!(
             "Offset of field: ",
@@ -458,10 +435,7 @@ fn bindgen_test_layout_sudo_plugin_event() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<sudo_plugin_event>())).setbase as *const _
-                as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).setbase) as usize - ptr as usize },
         40usize,
         concat!(
             "Offset of field: ",
@@ -472,8 +446,7 @@ fn bindgen_test_layout_sudo_plugin_event() {
     );
     assert_eq!(
         unsafe {
-            &(*(::std::ptr::null::<sudo_plugin_event>())).loopbreak as *const _
-                as usize
+            ::std::ptr::addr_of!((*ptr).loopbreak) as usize - ptr as usize
         },
         48usize,
         concat!(
@@ -484,10 +457,7 @@ fn bindgen_test_layout_sudo_plugin_event() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<sudo_plugin_event>())).free as *const _
-                as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).free) as usize - ptr as usize },
         56usize,
         concat!(
             "Offset of field: ",
@@ -590,6 +560,9 @@ pub struct policy_plugin {
 }
 #[test]
 fn bindgen_test_layout_policy_plugin() {
+    const UNINIT: ::std::mem::MaybeUninit<policy_plugin> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<policy_plugin>(),
         96usize,
@@ -601,9 +574,7 @@ fn bindgen_test_layout_policy_plugin() {
         concat!("Alignment of ", stringify!(policy_plugin))
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<policy_plugin>())).type_ as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).type_) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -613,10 +584,7 @@ fn bindgen_test_layout_policy_plugin() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<policy_plugin>())).version as *const _
-                as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).version) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
@@ -626,9 +594,7 @@ fn bindgen_test_layout_policy_plugin() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<policy_plugin>())).open as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).open) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -638,9 +604,7 @@ fn bindgen_test_layout_policy_plugin() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<policy_plugin>())).close as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).close) as usize - ptr as usize },
         16usize,
         concat!(
             "Offset of field: ",
@@ -651,8 +615,7 @@ fn bindgen_test_layout_policy_plugin() {
     );
     assert_eq!(
         unsafe {
-            &(*(::std::ptr::null::<policy_plugin>())).show_version as *const _
-                as usize
+            ::std::ptr::addr_of!((*ptr).show_version) as usize - ptr as usize
         },
         24usize,
         concat!(
@@ -664,8 +627,7 @@ fn bindgen_test_layout_policy_plugin() {
     );
     assert_eq!(
         unsafe {
-            &(*(::std::ptr::null::<policy_plugin>())).check_policy as *const _
-                as usize
+            ::std::ptr::addr_of!((*ptr).check_policy) as usize - ptr as usize
         },
         32usize,
         concat!(
@@ -676,9 +638,7 @@ fn bindgen_test_layout_policy_plugin() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<policy_plugin>())).list as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).list) as usize - ptr as usize },
         40usize,
         concat!(
             "Offset of field: ",
@@ -689,8 +649,7 @@ fn bindgen_test_layout_policy_plugin() {
     );
     assert_eq!(
         unsafe {
-            &(*(::std::ptr::null::<policy_plugin>())).validate as *const _
-                as usize
+            ::std::ptr::addr_of!((*ptr).validate) as usize - ptr as usize
         },
         48usize,
         concat!(
@@ -702,8 +661,7 @@ fn bindgen_test_layout_policy_plugin() {
     );
     assert_eq!(
         unsafe {
-            &(*(::std::ptr::null::<policy_plugin>())).invalidate as *const _
-                as usize
+            ::std::ptr::addr_of!((*ptr).invalidate) as usize - ptr as usize
         },
         56usize,
         concat!(
@@ -715,8 +673,7 @@ fn bindgen_test_layout_policy_plugin() {
     );
     assert_eq!(
         unsafe {
-            &(*(::std::ptr::null::<policy_plugin>())).init_session as *const _
-                as usize
+            ::std::ptr::addr_of!((*ptr).init_session) as usize - ptr as usize
         },
         64usize,
         concat!(
@@ -728,8 +685,7 @@ fn bindgen_test_layout_policy_plugin() {
     );
     assert_eq!(
         unsafe {
-            &(*(::std::ptr::null::<policy_plugin>())).register_hooks as *const _
-                as usize
+            ::std::ptr::addr_of!((*ptr).register_hooks) as usize - ptr as usize
         },
         72usize,
         concat!(
@@ -741,8 +697,8 @@ fn bindgen_test_layout_policy_plugin() {
     );
     assert_eq!(
         unsafe {
-            &(*(::std::ptr::null::<policy_plugin>())).deregister_hooks
-                as *const _ as usize
+            ::std::ptr::addr_of!((*ptr).deregister_hooks) as usize
+                - ptr as usize
         },
         80usize,
         concat!(
@@ -754,8 +710,7 @@ fn bindgen_test_layout_policy_plugin() {
     );
     assert_eq!(
         unsafe {
-            &(*(::std::ptr::null::<policy_plugin>())).event_alloc as *const _
-                as usize
+            ::std::ptr::addr_of!((*ptr).event_alloc) as usize - ptr as usize
         },
         88usize,
         concat!(
@@ -870,6 +825,9 @@ pub struct io_plugin {
 }
 #[test]
 fn bindgen_test_layout_io_plugin() {
+    const UNINIT: ::std::mem::MaybeUninit<io_plugin> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<io_plugin>(),
         112usize,
@@ -881,9 +839,7 @@ fn bindgen_test_layout_io_plugin() {
         concat!("Alignment of ", stringify!(io_plugin))
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<io_plugin>())).type_ as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).type_) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -893,9 +849,7 @@ fn bindgen_test_layout_io_plugin() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<io_plugin>())).version as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).version) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
@@ -905,9 +859,7 @@ fn bindgen_test_layout_io_plugin() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<io_plugin>())).open as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).open) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -917,9 +869,7 @@ fn bindgen_test_layout_io_plugin() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<io_plugin>())).close as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).close) as usize - ptr as usize },
         16usize,
         concat!(
             "Offset of field: ",
@@ -930,8 +880,7 @@ fn bindgen_test_layout_io_plugin() {
     );
     assert_eq!(
         unsafe {
-            &(*(::std::ptr::null::<io_plugin>())).show_version as *const _
-                as usize
+            ::std::ptr::addr_of!((*ptr).show_version) as usize - ptr as usize
         },
         24usize,
         concat!(
@@ -943,7 +892,7 @@ fn bindgen_test_layout_io_plugin() {
     );
     assert_eq!(
         unsafe {
-            &(*(::std::ptr::null::<io_plugin>())).log_ttyin as *const _ as usize
+            ::std::ptr::addr_of!((*ptr).log_ttyin) as usize - ptr as usize
         },
         32usize,
         concat!(
@@ -955,8 +904,7 @@ fn bindgen_test_layout_io_plugin() {
     );
     assert_eq!(
         unsafe {
-            &(*(::std::ptr::null::<io_plugin>())).log_ttyout as *const _
-                as usize
+            ::std::ptr::addr_of!((*ptr).log_ttyout) as usize - ptr as usize
         },
         40usize,
         concat!(
@@ -968,7 +916,7 @@ fn bindgen_test_layout_io_plugin() {
     );
     assert_eq!(
         unsafe {
-            &(*(::std::ptr::null::<io_plugin>())).log_stdin as *const _ as usize
+            ::std::ptr::addr_of!((*ptr).log_stdin) as usize - ptr as usize
         },
         48usize,
         concat!(
@@ -980,8 +928,7 @@ fn bindgen_test_layout_io_plugin() {
     );
     assert_eq!(
         unsafe {
-            &(*(::std::ptr::null::<io_plugin>())).log_stdout as *const _
-                as usize
+            ::std::ptr::addr_of!((*ptr).log_stdout) as usize - ptr as usize
         },
         56usize,
         concat!(
@@ -993,8 +940,7 @@ fn bindgen_test_layout_io_plugin() {
     );
     assert_eq!(
         unsafe {
-            &(*(::std::ptr::null::<io_plugin>())).log_stderr as *const _
-                as usize
+            ::std::ptr::addr_of!((*ptr).log_stderr) as usize - ptr as usize
         },
         64usize,
         concat!(
@@ -1006,8 +952,7 @@ fn bindgen_test_layout_io_plugin() {
     );
     assert_eq!(
         unsafe {
-            &(*(::std::ptr::null::<io_plugin>())).register_hooks as *const _
-                as usize
+            ::std::ptr::addr_of!((*ptr).register_hooks) as usize - ptr as usize
         },
         72usize,
         concat!(
@@ -1019,8 +964,8 @@ fn bindgen_test_layout_io_plugin() {
     );
     assert_eq!(
         unsafe {
-            &(*(::std::ptr::null::<io_plugin>())).deregister_hooks as *const _
-                as usize
+            ::std::ptr::addr_of!((*ptr).deregister_hooks) as usize
+                - ptr as usize
         },
         80usize,
         concat!(
@@ -1032,8 +977,7 @@ fn bindgen_test_layout_io_plugin() {
     );
     assert_eq!(
         unsafe {
-            &(*(::std::ptr::null::<io_plugin>())).change_winsize as *const _
-                as usize
+            ::std::ptr::addr_of!((*ptr).change_winsize) as usize - ptr as usize
         },
         88usize,
         concat!(
@@ -1045,8 +989,7 @@ fn bindgen_test_layout_io_plugin() {
     );
     assert_eq!(
         unsafe {
-            &(*(::std::ptr::null::<io_plugin>())).log_suspend as *const _
-                as usize
+            ::std::ptr::addr_of!((*ptr).log_suspend) as usize - ptr as usize
         },
         96usize,
         concat!(
@@ -1058,8 +1001,7 @@ fn bindgen_test_layout_io_plugin() {
     );
     assert_eq!(
         unsafe {
-            &(*(::std::ptr::null::<io_plugin>())).event_alloc as *const _
-                as usize
+            ::std::ptr::addr_of!((*ptr).event_alloc) as usize - ptr as usize
         },
         104usize,
         concat!(
@@ -1153,6 +1095,9 @@ pub struct audit_plugin {
 }
 #[test]
 fn bindgen_test_layout_audit_plugin() {
+    const UNINIT: ::std::mem::MaybeUninit<audit_plugin> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<audit_plugin>(),
         80usize,
@@ -1164,9 +1109,7 @@ fn bindgen_test_layout_audit_plugin() {
         concat!("Alignment of ", stringify!(audit_plugin))
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<audit_plugin>())).type_ as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).type_) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -1176,10 +1119,7 @@ fn bindgen_test_layout_audit_plugin() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<audit_plugin>())).version as *const _
-                as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).version) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
@@ -1189,9 +1129,7 @@ fn bindgen_test_layout_audit_plugin() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<audit_plugin>())).open as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).open) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -1201,9 +1139,7 @@ fn bindgen_test_layout_audit_plugin() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<audit_plugin>())).close as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).close) as usize - ptr as usize },
         16usize,
         concat!(
             "Offset of field: ",
@@ -1213,9 +1149,7 @@ fn bindgen_test_layout_audit_plugin() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<audit_plugin>())).accept as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).accept) as usize - ptr as usize },
         24usize,
         concat!(
             "Offset of field: ",
@@ -1225,9 +1159,7 @@ fn bindgen_test_layout_audit_plugin() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<audit_plugin>())).reject as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).reject) as usize - ptr as usize },
         32usize,
         concat!(
             "Offset of field: ",
@@ -1237,9 +1169,7 @@ fn bindgen_test_layout_audit_plugin() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<audit_plugin>())).error as *const _ as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).error) as usize - ptr as usize },
         40usize,
         concat!(
             "Offset of field: ",
@@ -1250,8 +1180,7 @@ fn bindgen_test_layout_audit_plugin() {
     );
     assert_eq!(
         unsafe {
-            &(*(::std::ptr::null::<audit_plugin>())).show_version as *const _
-                as usize
+            ::std::ptr::addr_of!((*ptr).show_version) as usize - ptr as usize
         },
         48usize,
         concat!(
@@ -1263,8 +1192,7 @@ fn bindgen_test_layout_audit_plugin() {
     );
     assert_eq!(
         unsafe {
-            &(*(::std::ptr::null::<audit_plugin>())).register_hooks as *const _
-                as usize
+            ::std::ptr::addr_of!((*ptr).register_hooks) as usize - ptr as usize
         },
         56usize,
         concat!(
@@ -1276,8 +1204,8 @@ fn bindgen_test_layout_audit_plugin() {
     );
     assert_eq!(
         unsafe {
-            &(*(::std::ptr::null::<audit_plugin>())).deregister_hooks
-                as *const _ as usize
+            ::std::ptr::addr_of!((*ptr).deregister_hooks) as usize
+                - ptr as usize
         },
         64usize,
         concat!(
@@ -1289,8 +1217,7 @@ fn bindgen_test_layout_audit_plugin() {
     );
     assert_eq!(
         unsafe {
-            &(*(::std::ptr::null::<audit_plugin>())).event_alloc as *const _
-                as usize
+            ::std::ptr::addr_of!((*ptr).event_alloc) as usize - ptr as usize
         },
         72usize,
         concat!(
@@ -1337,6 +1264,9 @@ pub struct approval_plugin {
 }
 #[test]
 fn bindgen_test_layout_approval_plugin() {
+    const UNINIT: ::std::mem::MaybeUninit<approval_plugin> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<approval_plugin>(),
         40usize,
@@ -1348,10 +1278,7 @@ fn bindgen_test_layout_approval_plugin() {
         concat!("Alignment of ", stringify!(approval_plugin))
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<approval_plugin>())).type_ as *const _
-                as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).type_) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -1361,10 +1288,7 @@ fn bindgen_test_layout_approval_plugin() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<approval_plugin>())).version as *const _
-                as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).version) as usize - ptr as usize },
         4usize,
         concat!(
             "Offset of field: ",
@@ -1374,10 +1298,7 @@ fn bindgen_test_layout_approval_plugin() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<approval_plugin>())).open as *const _
-                as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).open) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -1387,10 +1308,7 @@ fn bindgen_test_layout_approval_plugin() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<approval_plugin>())).close as *const _
-                as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).close) as usize - ptr as usize },
         16usize,
         concat!(
             "Offset of field: ",
@@ -1400,10 +1318,7 @@ fn bindgen_test_layout_approval_plugin() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<approval_plugin>())).check as *const _
-                as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).check) as usize - ptr as usize },
         24usize,
         concat!(
             "Offset of field: ",
@@ -1414,8 +1329,7 @@ fn bindgen_test_layout_approval_plugin() {
     );
     assert_eq!(
         unsafe {
-            &(*(::std::ptr::null::<approval_plugin>())).show_version as *const _
-                as usize
+            ::std::ptr::addr_of!((*ptr).show_version) as usize - ptr as usize
         },
         32usize,
         concat!(
@@ -1448,6 +1362,9 @@ pub struct sudoers_group_plugin {
 }
 #[test]
 fn bindgen_test_layout_sudoers_group_plugin() {
+    const UNINIT: ::std::mem::MaybeUninit<sudoers_group_plugin> =
+        ::std::mem::MaybeUninit::uninit();
+    let ptr = UNINIT.as_ptr();
     assert_eq!(
         ::std::mem::size_of::<sudoers_group_plugin>(),
         32usize,
@@ -1459,10 +1376,7 @@ fn bindgen_test_layout_sudoers_group_plugin() {
         concat!("Alignment of ", stringify!(sudoers_group_plugin))
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<sudoers_group_plugin>())).version as *const _
-                as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).version) as usize - ptr as usize },
         0usize,
         concat!(
             "Offset of field: ",
@@ -1472,10 +1386,7 @@ fn bindgen_test_layout_sudoers_group_plugin() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<sudoers_group_plugin>())).init as *const _
-                as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).init) as usize - ptr as usize },
         8usize,
         concat!(
             "Offset of field: ",
@@ -1485,10 +1396,7 @@ fn bindgen_test_layout_sudoers_group_plugin() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<sudoers_group_plugin>())).cleanup as *const _
-                as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).cleanup) as usize - ptr as usize },
         16usize,
         concat!(
             "Offset of field: ",
@@ -1498,10 +1406,7 @@ fn bindgen_test_layout_sudoers_group_plugin() {
         )
     );
     assert_eq!(
-        unsafe {
-            &(*(::std::ptr::null::<sudoers_group_plugin>())).query as *const _
-                as usize
-        },
+        unsafe { ::std::ptr::addr_of!((*ptr).query) as usize - ptr as usize },
         24usize,
         concat!(
             "Offset of field: ",