diff options
243 files changed, 4453 insertions, 1672 deletions
diff --git a/src/codegen/mod.rs b/src/codegen/mod.rs index 4fcbaefd..e4ce9526 100644 --- a/src/codegen/mod.rs +++ b/src/codegen/mod.rs @@ -2192,7 +2192,9 @@ impl CodeGenerator for CompInfo { quote! { assert_eq!( unsafe { - &(*(::#prefix::ptr::null::<#canonical_ident>())).#field_name as *const _ as usize + let uninit = ::#prefix::mem::MaybeUninit::<#canonical_ident>::uninit(); + let ptr = uninit.as_ptr(); + ::#prefix::ptr::addr_of!((*ptr).#field_name) as usize - ptr as usize }, #field_offset, concat!("Offset of field: ", stringify!(#canonical_ident), "::", stringify!(#field_name)) diff --git a/tests/expectations/tests/16-byte-alignment.rs b/tests/expectations/tests/16-byte-alignment.rs index 058568f2..c690cc8e 100644 --- a/tests/expectations/tests/16-byte-alignment.rs +++ b/tests/expectations/tests/16-byte-alignment.rs @@ -44,9 +44,11 @@ fn bindgen_test_layout_rte_ipv4_tuple__bindgen_ty_1__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_ipv4_tuple__bindgen_ty_1__bindgen_ty_1>( - ))) - .dport as *const _ as usize + let uninit = ::std::mem::MaybeUninit::< + rte_ipv4_tuple__bindgen_ty_1__bindgen_ty_1, + >::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).dport) as usize - ptr as usize }, 0usize, concat!( @@ -58,9 +60,11 @@ fn bindgen_test_layout_rte_ipv4_tuple__bindgen_ty_1__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_ipv4_tuple__bindgen_ty_1__bindgen_ty_1>( - ))) - .sport as *const _ as usize + let uninit = ::std::mem::MaybeUninit::< + rte_ipv4_tuple__bindgen_ty_1__bindgen_ty_1, + >::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).sport) as usize - ptr as usize }, 2usize, concat!( @@ -85,8 +89,11 @@ fn bindgen_test_layout_rte_ipv4_tuple__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_ipv4_tuple__bindgen_ty_1>())).sctp_tag - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<rte_ipv4_tuple__bindgen_ty_1>::uninit( + ); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).sctp_tag) as usize - ptr as usize }, 0usize, concat!( @@ -120,8 +127,9 @@ fn bindgen_test_layout_rte_ipv4_tuple() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_ipv4_tuple>())).src_addr as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<rte_ipv4_tuple>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).src_addr) as usize - ptr as usize }, 0usize, concat!( @@ -133,8 +141,9 @@ fn bindgen_test_layout_rte_ipv4_tuple() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_ipv4_tuple>())).dst_addr as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<rte_ipv4_tuple>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).dst_addr) as usize - ptr as usize }, 4usize, concat!( @@ -193,9 +202,11 @@ fn bindgen_test_layout_rte_ipv6_tuple__bindgen_ty_1__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_ipv6_tuple__bindgen_ty_1__bindgen_ty_1>( - ))) - .dport as *const _ as usize + let uninit = ::std::mem::MaybeUninit::< + rte_ipv6_tuple__bindgen_ty_1__bindgen_ty_1, + >::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).dport) as usize - ptr as usize }, 0usize, concat!( @@ -207,9 +218,11 @@ fn bindgen_test_layout_rte_ipv6_tuple__bindgen_ty_1__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_ipv6_tuple__bindgen_ty_1__bindgen_ty_1>( - ))) - .sport as *const _ as usize + let uninit = ::std::mem::MaybeUninit::< + rte_ipv6_tuple__bindgen_ty_1__bindgen_ty_1, + >::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).sport) as usize - ptr as usize }, 2usize, concat!( @@ -234,8 +247,11 @@ fn bindgen_test_layout_rte_ipv6_tuple__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_ipv6_tuple__bindgen_ty_1>())).sctp_tag - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<rte_ipv6_tuple__bindgen_ty_1>::uninit( + ); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).sctp_tag) as usize - ptr as usize }, 0usize, concat!( @@ -269,8 +285,9 @@ fn bindgen_test_layout_rte_ipv6_tuple() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_ipv6_tuple>())).src_addr as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<rte_ipv6_tuple>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).src_addr) as usize - ptr as usize }, 0usize, concat!( @@ -282,8 +299,9 @@ fn bindgen_test_layout_rte_ipv6_tuple() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_ipv6_tuple>())).dst_addr as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<rte_ipv6_tuple>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).dst_addr) as usize - ptr as usize }, 16usize, concat!( @@ -324,7 +342,9 @@ fn bindgen_test_layout_rte_thash_tuple() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_thash_tuple>())).v4 as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<rte_thash_tuple>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).v4) as usize - ptr as usize }, 0usize, concat!( @@ -336,7 +356,9 @@ fn bindgen_test_layout_rte_thash_tuple() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_thash_tuple>())).v6 as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<rte_thash_tuple>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).v6) as usize - ptr as usize }, 0usize, concat!( diff --git a/tests/expectations/tests/16-byte-alignment_1_0.rs b/tests/expectations/tests/16-byte-alignment_1_0.rs index 1df6778b..304b6bc1 100644 --- a/tests/expectations/tests/16-byte-alignment_1_0.rs +++ b/tests/expectations/tests/16-byte-alignment_1_0.rs @@ -89,9 +89,11 @@ fn bindgen_test_layout_rte_ipv4_tuple__bindgen_ty_1__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_ipv4_tuple__bindgen_ty_1__bindgen_ty_1>( - ))) - .dport as *const _ as usize + let uninit = ::std::mem::MaybeUninit::< + rte_ipv4_tuple__bindgen_ty_1__bindgen_ty_1, + >::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).dport) as usize - ptr as usize }, 0usize, concat!( @@ -103,9 +105,11 @@ fn bindgen_test_layout_rte_ipv4_tuple__bindgen_ty_1__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_ipv4_tuple__bindgen_ty_1__bindgen_ty_1>( - ))) - .sport as *const _ as usize + let uninit = ::std::mem::MaybeUninit::< + rte_ipv4_tuple__bindgen_ty_1__bindgen_ty_1, + >::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).sport) as usize - ptr as usize }, 2usize, concat!( @@ -135,8 +139,11 @@ fn bindgen_test_layout_rte_ipv4_tuple__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_ipv4_tuple__bindgen_ty_1>())).sctp_tag - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<rte_ipv4_tuple__bindgen_ty_1>::uninit( + ); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).sctp_tag) as usize - ptr as usize }, 0usize, concat!( @@ -166,8 +173,9 @@ fn bindgen_test_layout_rte_ipv4_tuple() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_ipv4_tuple>())).src_addr as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<rte_ipv4_tuple>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).src_addr) as usize - ptr as usize }, 0usize, concat!( @@ -179,8 +187,9 @@ fn bindgen_test_layout_rte_ipv4_tuple() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_ipv4_tuple>())).dst_addr as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<rte_ipv4_tuple>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).dst_addr) as usize - ptr as usize }, 4usize, concat!( @@ -237,9 +246,11 @@ fn bindgen_test_layout_rte_ipv6_tuple__bindgen_ty_1__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_ipv6_tuple__bindgen_ty_1__bindgen_ty_1>( - ))) - .dport as *const _ as usize + let uninit = ::std::mem::MaybeUninit::< + rte_ipv6_tuple__bindgen_ty_1__bindgen_ty_1, + >::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).dport) as usize - ptr as usize }, 0usize, concat!( @@ -251,9 +262,11 @@ fn bindgen_test_layout_rte_ipv6_tuple__bindgen_ty_1__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_ipv6_tuple__bindgen_ty_1__bindgen_ty_1>( - ))) - .sport as *const _ as usize + let uninit = ::std::mem::MaybeUninit::< + rte_ipv6_tuple__bindgen_ty_1__bindgen_ty_1, + >::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).sport) as usize - ptr as usize }, 2usize, concat!( @@ -283,8 +296,11 @@ fn bindgen_test_layout_rte_ipv6_tuple__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_ipv6_tuple__bindgen_ty_1>())).sctp_tag - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<rte_ipv6_tuple__bindgen_ty_1>::uninit( + ); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).sctp_tag) as usize - ptr as usize }, 0usize, concat!( @@ -314,8 +330,9 @@ fn bindgen_test_layout_rte_ipv6_tuple() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_ipv6_tuple>())).src_addr as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<rte_ipv6_tuple>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).src_addr) as usize - ptr as usize }, 0usize, concat!( @@ -327,8 +344,9 @@ fn bindgen_test_layout_rte_ipv6_tuple() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_ipv6_tuple>())).dst_addr as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<rte_ipv6_tuple>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).dst_addr) as usize - ptr as usize }, 16usize, concat!( @@ -360,7 +378,9 @@ fn bindgen_test_layout_rte_thash_tuple() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_thash_tuple>())).v4 as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<rte_thash_tuple>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).v4) as usize - ptr as usize }, 0usize, concat!( @@ -372,7 +392,9 @@ fn bindgen_test_layout_rte_thash_tuple() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_thash_tuple>())).v6 as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<rte_thash_tuple>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).v6) as usize - ptr as usize }, 0usize, concat!( diff --git a/tests/expectations/tests/accessors.rs b/tests/expectations/tests/accessors.rs index 9977baa2..0771eceb 100644 --- a/tests/expectations/tests/accessors.rs +++ b/tests/expectations/tests/accessors.rs @@ -30,8 +30,9 @@ fn bindgen_test_layout_SomeAccessors() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<SomeAccessors>())).mNoAccessor as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<SomeAccessors>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mNoAccessor) as usize - ptr as usize }, 0usize, concat!( @@ -43,8 +44,9 @@ fn bindgen_test_layout_SomeAccessors() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<SomeAccessors>())).mBothAccessors as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<SomeAccessors>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mBothAccessors) as usize - ptr as usize }, 4usize, concat!( @@ -56,8 +58,10 @@ fn bindgen_test_layout_SomeAccessors() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<SomeAccessors>())).mUnsafeAccessors - as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<SomeAccessors>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mUnsafeAccessors) as usize - + ptr as usize }, 8usize, concat!( @@ -69,8 +73,10 @@ fn bindgen_test_layout_SomeAccessors() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<SomeAccessors>())).mImmutableAccessor - as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<SomeAccessors>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mImmutableAccessor) as usize - + ptr as usize }, 12usize, concat!( @@ -126,8 +132,9 @@ fn bindgen_test_layout_AllAccessors() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<AllAccessors>())).mBothAccessors as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<AllAccessors>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mBothAccessors) as usize - ptr as usize }, 0usize, concat!( @@ -139,8 +146,10 @@ fn bindgen_test_layout_AllAccessors() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<AllAccessors>())).mAlsoBothAccessors - as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<AllAccessors>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mAlsoBothAccessors) as usize - + ptr as usize }, 4usize, concat!( @@ -190,8 +199,10 @@ fn bindgen_test_layout_AllUnsafeAccessors() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<AllUnsafeAccessors>())).mBothAccessors - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<AllUnsafeAccessors>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mBothAccessors) as usize - ptr as usize }, 0usize, concat!( @@ -203,8 +214,11 @@ fn bindgen_test_layout_AllUnsafeAccessors() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<AllUnsafeAccessors>())).mAlsoBothAccessors - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<AllUnsafeAccessors>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mAlsoBothAccessors) as usize - + ptr as usize }, 4usize, concat!( @@ -263,8 +277,10 @@ fn bindgen_test_layout_ContradictAccessors() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<ContradictAccessors>())).mBothAccessors - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<ContradictAccessors>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mBothAccessors) as usize - ptr as usize }, 0usize, concat!( @@ -276,8 +292,10 @@ fn bindgen_test_layout_ContradictAccessors() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<ContradictAccessors>())).mNoAccessors - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<ContradictAccessors>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mNoAccessors) as usize - ptr as usize }, 4usize, concat!( @@ -289,8 +307,11 @@ fn bindgen_test_layout_ContradictAccessors() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<ContradictAccessors>())).mUnsafeAccessors - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<ContradictAccessors>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mUnsafeAccessors) as usize - + ptr as usize }, 8usize, concat!( @@ -302,8 +323,11 @@ fn bindgen_test_layout_ContradictAccessors() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<ContradictAccessors>())).mImmutableAccessor - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<ContradictAccessors>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mImmutableAccessor) as usize - + ptr as usize }, 12usize, concat!( @@ -358,7 +382,9 @@ fn bindgen_test_layout_Replaced() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<Replaced>())).mAccessor as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<Replaced>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mAccessor) as usize - ptr as usize }, 0usize, concat!( @@ -399,7 +425,9 @@ fn bindgen_test_layout_Wrapper() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<Wrapper>())).mReplaced as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<Wrapper>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mReplaced) as usize - ptr as usize }, 0usize, concat!( diff --git a/tests/expectations/tests/allowlist-file.rs b/tests/expectations/tests/allowlist-file.rs index 2c2660a6..462f690b 100644 --- a/tests/expectations/tests/allowlist-file.rs +++ b/tests/expectations/tests/allowlist-file.rs @@ -70,8 +70,11 @@ fn bindgen_test_layout_StructWithAllowlistedDefinition() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<StructWithAllowlistedDefinition>())).other - as *const _ as usize + let uninit = ::std::mem::MaybeUninit::< + StructWithAllowlistedDefinition, + >::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).other) as usize - ptr as usize }, 0usize, concat!( @@ -110,8 +113,11 @@ fn bindgen_test_layout_StructWithAllowlistedFwdDecl() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<StructWithAllowlistedFwdDecl>())).b - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<StructWithAllowlistedFwdDecl>::uninit( + ); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).b) as usize - ptr as usize }, 0usize, concat!( @@ -141,7 +147,9 @@ fn bindgen_test_layout_AllowlistMe() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<AllowlistMe>())).foo as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<AllowlistMe>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).foo) as usize - ptr as usize }, 0usize, concat!( diff --git a/tests/expectations/tests/allowlist-namespaces.rs b/tests/expectations/tests/allowlist-namespaces.rs index 4236f63e..c789ec63 100644 --- a/tests/expectations/tests/allowlist-namespaces.rs +++ b/tests/expectations/tests/allowlist-namespaces.rs @@ -53,7 +53,9 @@ pub mod root { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<Test>())).helper as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<Test>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).helper) as usize - ptr as usize }, 0usize, concat!( diff --git a/tests/expectations/tests/allowlisted-item-references-no-hash.rs b/tests/expectations/tests/allowlisted-item-references-no-hash.rs index bc3fde1d..d11fc5be 100644 --- a/tests/expectations/tests/allowlisted-item-references-no-hash.rs +++ b/tests/expectations/tests/allowlisted-item-references-no-hash.rs @@ -42,7 +42,9 @@ fn bindgen_test_layout_AllowlistMe() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<AllowlistMe>())).a as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<AllowlistMe>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).a) as usize - ptr as usize }, 0usize, concat!( diff --git a/tests/expectations/tests/allowlisted-item-references-no-partialeq.rs b/tests/expectations/tests/allowlisted-item-references-no-partialeq.rs index f26f6923..8501c479 100644 --- a/tests/expectations/tests/allowlisted-item-references-no-partialeq.rs +++ b/tests/expectations/tests/allowlisted-item-references-no-partialeq.rs @@ -42,7 +42,9 @@ fn bindgen_test_layout_AllowlistMe() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<AllowlistMe>())).a as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<AllowlistMe>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).a) as usize - ptr as usize }, 0usize, concat!( diff --git a/tests/expectations/tests/allowlisted_item_references_no_copy.rs b/tests/expectations/tests/allowlisted_item_references_no_copy.rs index a5cb17b2..3b8f4e71 100644 --- a/tests/expectations/tests/allowlisted_item_references_no_copy.rs +++ b/tests/expectations/tests/allowlisted_item_references_no_copy.rs @@ -42,7 +42,9 @@ fn bindgen_test_layout_AllowlistMe() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<AllowlistMe>())).a as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<AllowlistMe>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).a) as usize - ptr as usize }, 0usize, concat!( diff --git a/tests/expectations/tests/annotation_hide.rs b/tests/expectations/tests/annotation_hide.rs index 38435d0a..f2bc7be5 100644 --- a/tests/expectations/tests/annotation_hide.rs +++ b/tests/expectations/tests/annotation_hide.rs @@ -44,7 +44,9 @@ fn bindgen_test_layout_NotAnnotated() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<NotAnnotated>())).f as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<NotAnnotated>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).f) as usize - ptr as usize }, 0usize, concat!( diff --git a/tests/expectations/tests/anon-fields-prefix.rs b/tests/expectations/tests/anon-fields-prefix.rs index edd551d1..e5445952 100644 --- a/tests/expectations/tests/anon-fields-prefix.rs +++ b/tests/expectations/tests/anon-fields-prefix.rs @@ -33,8 +33,10 @@ fn bindgen_test_layout_color__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<color__bindgen_ty_1>())).r as *const _ - as usize + let uninit = + ::std::mem::MaybeUninit::<color__bindgen_ty_1>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).r) as usize - ptr as usize }, 0usize, concat!( @@ -46,8 +48,10 @@ fn bindgen_test_layout_color__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<color__bindgen_ty_1>())).g as *const _ - as usize + let uninit = + ::std::mem::MaybeUninit::<color__bindgen_ty_1>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).g) as usize - ptr as usize }, 1usize, concat!( @@ -59,8 +63,10 @@ fn bindgen_test_layout_color__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<color__bindgen_ty_1>())).b as *const _ - as usize + let uninit = + ::std::mem::MaybeUninit::<color__bindgen_ty_1>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).b) as usize - ptr as usize }, 2usize, concat!( @@ -92,8 +98,10 @@ fn bindgen_test_layout_color__bindgen_ty_2() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<color__bindgen_ty_2>())).y as *const _ - as usize + let uninit = + ::std::mem::MaybeUninit::<color__bindgen_ty_2>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).y) as usize - ptr as usize }, 0usize, concat!( @@ -105,8 +113,10 @@ fn bindgen_test_layout_color__bindgen_ty_2() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<color__bindgen_ty_2>())).u as *const _ - as usize + let uninit = + ::std::mem::MaybeUninit::<color__bindgen_ty_2>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).u) as usize - ptr as usize }, 1usize, concat!( @@ -118,8 +128,10 @@ fn bindgen_test_layout_color__bindgen_ty_2() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<color__bindgen_ty_2>())).v as *const _ - as usize + let uninit = + ::std::mem::MaybeUninit::<color__bindgen_ty_2>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).v) as usize - ptr as usize }, 2usize, concat!( @@ -143,7 +155,11 @@ fn bindgen_test_layout_color() { concat!("Alignment of ", stringify!(color)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<color>())).v3 as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<color>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).v3) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(color), "::", stringify!(v3)) ); diff --git a/tests/expectations/tests/anon_enum.rs b/tests/expectations/tests/anon_enum.rs index 8cae6329..a06beb85 100644 --- a/tests/expectations/tests/anon_enum.rs +++ b/tests/expectations/tests/anon_enum.rs @@ -30,12 +30,20 @@ fn bindgen_test_layout_Test() { concat!("Alignment of ", stringify!(Test)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Test>())).foo as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Test>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).foo) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(Test), "::", stringify!(foo)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Test>())).bar as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Test>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).bar) as usize - ptr as usize + }, 4usize, concat!("Offset of field: ", stringify!(Test), "::", stringify!(bar)) ); diff --git a/tests/expectations/tests/anon_struct_in_union.rs b/tests/expectations/tests/anon_struct_in_union.rs index 1a404015..f80f817b 100644 --- a/tests/expectations/tests/anon_struct_in_union.rs +++ b/tests/expectations/tests/anon_struct_in_union.rs @@ -34,8 +34,10 @@ fn bindgen_test_layout_s__bindgen_ty_1_inner() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<s__bindgen_ty_1_inner>())).b as *const _ - as usize + let uninit = + ::std::mem::MaybeUninit::<s__bindgen_ty_1_inner>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).b) as usize - ptr as usize }, 0usize, concat!( @@ -60,8 +62,9 @@ fn bindgen_test_layout_s__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<s__bindgen_ty_1>())).field as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<s__bindgen_ty_1>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).field) as usize - ptr as usize }, 0usize, concat!( @@ -94,7 +97,11 @@ fn bindgen_test_layout_s() { concat!("Alignment of ", stringify!(s)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<s>())).u as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<s>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).u) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(s), "::", stringify!(u)) ); diff --git a/tests/expectations/tests/anon_struct_in_union_1_0.rs b/tests/expectations/tests/anon_struct_in_union_1_0.rs index 021f4145..4631b1dc 100644 --- a/tests/expectations/tests/anon_struct_in_union_1_0.rs +++ b/tests/expectations/tests/anon_struct_in_union_1_0.rs @@ -78,8 +78,10 @@ fn bindgen_test_layout_s__bindgen_ty_1_inner() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<s__bindgen_ty_1_inner>())).b as *const _ - as usize + let uninit = + ::std::mem::MaybeUninit::<s__bindgen_ty_1_inner>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).b) as usize - ptr as usize }, 0usize, concat!( @@ -109,8 +111,9 @@ fn bindgen_test_layout_s__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<s__bindgen_ty_1>())).field as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<s__bindgen_ty_1>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).field) as usize - ptr as usize }, 0usize, concat!( @@ -139,7 +142,11 @@ fn bindgen_test_layout_s() { concat!("Alignment of ", stringify!(s)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<s>())).u as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<s>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).u) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(s), "::", stringify!(u)) ); diff --git a/tests/expectations/tests/array-of-zero-sized-types.rs b/tests/expectations/tests/array-of-zero-sized-types.rs index 0c00cea9..f8d9e985 100644 --- a/tests/expectations/tests/array-of-zero-sized-types.rs +++ b/tests/expectations/tests/array-of-zero-sized-types.rs @@ -45,8 +45,9 @@ fn bindgen_test_layout_HasArrayOfEmpty() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<HasArrayOfEmpty>())).empties as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<HasArrayOfEmpty>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).empties) as usize - ptr as usize }, 0usize, concat!( diff --git a/tests/expectations/tests/bindgen-union-inside-namespace.rs b/tests/expectations/tests/bindgen-union-inside-namespace.rs index 6083313b..558a0982 100644 --- a/tests/expectations/tests/bindgen-union-inside-namespace.rs +++ b/tests/expectations/tests/bindgen-union-inside-namespace.rs @@ -79,7 +79,9 @@ pub mod root { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<Bar>())).foo as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<Bar>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).foo) as usize - ptr as usize }, 0usize, concat!( @@ -91,7 +93,9 @@ pub mod root { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<Bar>())).bar as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<Bar>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).bar) as usize - ptr as usize }, 0usize, concat!( diff --git a/tests/expectations/tests/bitfield-linux-32.rs b/tests/expectations/tests/bitfield-linux-32.rs index 15c35cee..59a8001d 100644 --- a/tests/expectations/tests/bitfield-linux-32.rs +++ b/tests/expectations/tests/bitfield-linux-32.rs @@ -111,7 +111,11 @@ fn bindgen_test_layout_Test() { concat!("Alignment of ", stringify!(Test)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Test>())).foo as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Test>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).foo) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(Test), "::", stringify!(foo)) ); diff --git a/tests/expectations/tests/bitfield_align.rs b/tests/expectations/tests/bitfield_align.rs index 509981a8..708f364f 100644 --- a/tests/expectations/tests/bitfield_align.rs +++ b/tests/expectations/tests/bitfield_align.rs @@ -113,12 +113,20 @@ fn bindgen_test_layout_A() { concat!("Alignment of ", stringify!(A)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<A>())).x as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<A>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).x) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(A), "::", stringify!(x)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<A>())).y as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<A>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).y) as usize - ptr as usize + }, 3usize, concat!("Offset of field: ", stringify!(A), "::", stringify!(y)) ); @@ -398,12 +406,20 @@ fn bindgen_test_layout_C() { concat!("Alignment of ", stringify!(C)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<C>())).x as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<C>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).x) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(C), "::", stringify!(x)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<C>())).baz as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<C>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).baz) as usize - ptr as usize + }, 4usize, concat!("Offset of field: ", stringify!(C), "::", stringify!(baz)) ); @@ -695,7 +711,11 @@ fn bindgen_test_layout_Date3() { concat!("Alignment of ", stringify!(Date3)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Date3>())).byte as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Date3>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).byte) as usize - ptr as usize + }, 3usize, concat!( "Offset of field: ", diff --git a/tests/expectations/tests/blocklist-and-impl-debug.rs b/tests/expectations/tests/blocklist-and-impl-debug.rs index ba39fb14..2cb1fef3 100644 --- a/tests/expectations/tests/blocklist-and-impl-debug.rs +++ b/tests/expectations/tests/blocklist-and-impl-debug.rs @@ -26,8 +26,10 @@ fn bindgen_test_layout_ShouldManuallyImplDebug() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<ShouldManuallyImplDebug>())).a as *const _ - as usize + let uninit = + ::std::mem::MaybeUninit::<ShouldManuallyImplDebug>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).a) as usize - ptr as usize }, 0usize, concat!( diff --git a/tests/expectations/tests/blocklist-file.rs b/tests/expectations/tests/blocklist-file.rs index fe00b5ab..5e41376c 100644 --- a/tests/expectations/tests/blocklist-file.rs +++ b/tests/expectations/tests/blocklist-file.rs @@ -26,7 +26,9 @@ fn bindgen_test_layout_SizedIntegers() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<SizedIntegers>())).x as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<SizedIntegers>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).x) as usize - ptr as usize }, 0usize, concat!( @@ -38,7 +40,9 @@ fn bindgen_test_layout_SizedIntegers() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<SizedIntegers>())).y as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<SizedIntegers>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).y) as usize - ptr as usize }, 2usize, concat!( @@ -50,7 +54,9 @@ fn bindgen_test_layout_SizedIntegers() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<SizedIntegers>())).z as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<SizedIntegers>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).z) as usize - ptr as usize }, 4usize, concat!( @@ -80,8 +86,11 @@ fn bindgen_test_layout_StructWithBlocklistedFwdDecl() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<StructWithBlocklistedFwdDecl>())).b - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<StructWithBlocklistedFwdDecl>::uninit( + ); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).b) as usize - ptr as usize }, 0usize, concat!( diff --git a/tests/expectations/tests/blocks-signature.rs b/tests/expectations/tests/blocks-signature.rs index 22136ddf..df28cf85 100644 --- a/tests/expectations/tests/blocks-signature.rs +++ b/tests/expectations/tests/blocks-signature.rs @@ -49,8 +49,10 @@ fn bindgen_test_layout_contains_block_pointers() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<contains_block_pointers>())).val as *const _ - as usize + let uninit = + ::std::mem::MaybeUninit::<contains_block_pointers>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).val) as usize - ptr as usize }, 0usize, concat!( @@ -62,8 +64,10 @@ fn bindgen_test_layout_contains_block_pointers() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<contains_block_pointers>())).ptr_val - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<contains_block_pointers>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).ptr_val) as usize - ptr as usize }, 8usize, concat!( diff --git a/tests/expectations/tests/blocks.rs b/tests/expectations/tests/blocks.rs index b2ae0b29..f3734bf5 100644 --- a/tests/expectations/tests/blocks.rs +++ b/tests/expectations/tests/blocks.rs @@ -48,8 +48,10 @@ fn bindgen_test_layout_contains_block_pointers() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<contains_block_pointers>())).val as *const _ - as usize + let uninit = + ::std::mem::MaybeUninit::<contains_block_pointers>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).val) as usize - ptr as usize }, 0usize, concat!( @@ -61,8 +63,10 @@ fn bindgen_test_layout_contains_block_pointers() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<contains_block_pointers>())).ptr_val - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<contains_block_pointers>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).ptr_val) as usize - ptr as usize }, 8usize, concat!( diff --git a/tests/expectations/tests/c_naming.rs b/tests/expectations/tests/c_naming.rs index abcccf1f..636929ce 100644 --- a/tests/expectations/tests/c_naming.rs +++ b/tests/expectations/tests/c_naming.rs @@ -23,7 +23,11 @@ fn bindgen_test_layout_struct_a() { concat!("Alignment of ", stringify!(struct_a)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<struct_a>())).a as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<struct_a>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).a) as usize - ptr as usize + }, 0usize, concat!( "Offset of field: ", @@ -53,7 +57,11 @@ fn bindgen_test_layout_union_b() { concat!("Alignment of ", stringify!(union_b)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<union_b>())).a as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<union_b>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).a) as usize - ptr as usize + }, 0usize, concat!( "Offset of field: ", @@ -63,7 +71,11 @@ fn bindgen_test_layout_union_b() { ) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<union_b>())).b as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<union_b>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).b) as usize - ptr as usize + }, 0usize, concat!( "Offset of field: ", diff --git a/tests/expectations/tests/canonical-types.rs b/tests/expectations/tests/canonical-types.rs index 80d7fec3..10808d20 100644 --- a/tests/expectations/tests/canonical-types.rs +++ b/tests/expectations/tests/canonical-types.rs @@ -178,7 +178,9 @@ fn bindgen_test_layout_ClassAInner() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<ClassAInner>())).x as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<ClassAInner>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).x) as usize - ptr as usize }, 0usize, concat!( @@ -217,7 +219,9 @@ fn bindgen_test_layout_ClassCInnerA() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<ClassCInnerA>())).member as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<ClassCInnerA>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).member) as usize - ptr as usize }, 0usize, concat!( @@ -256,7 +260,9 @@ fn bindgen_test_layout_ClassCInnerB() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<ClassCInnerB>())).cache as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<ClassCInnerB>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).cache) as usize - ptr as usize }, 0usize, concat!( diff --git a/tests/expectations/tests/char.rs b/tests/expectations/tests/char.rs index 1e1a1987..35f353e0 100644 --- a/tests/expectations/tests/char.rs +++ b/tests/expectations/tests/char.rs @@ -37,52 +37,92 @@ fn bindgen_test_layout_Test() { concat!("Alignment of ", stringify!(Test)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Test>())).ch as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Test>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).ch) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(Test), "::", stringify!(ch)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Test>())).u as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Test>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).u) as usize - ptr as usize + }, 1usize, concat!("Offset of field: ", stringify!(Test), "::", stringify!(u)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Test>())).d as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Test>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).d) as usize - ptr as usize + }, 2usize, concat!("Offset of field: ", stringify!(Test), "::", stringify!(d)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Test>())).cch as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Test>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).cch) as usize - ptr as usize + }, 3usize, concat!("Offset of field: ", stringify!(Test), "::", stringify!(cch)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Test>())).cu as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Test>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).cu) as usize - ptr as usize + }, 4usize, concat!("Offset of field: ", stringify!(Test), "::", stringify!(cu)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Test>())).cd as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Test>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).cd) as usize - ptr as usize + }, 5usize, concat!("Offset of field: ", stringify!(Test), "::", stringify!(cd)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Test>())).Cch as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Test>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).Cch) as usize - ptr as usize + }, 6usize, concat!("Offset of field: ", stringify!(Test), "::", stringify!(Cch)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Test>())).Cu as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Test>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).Cu) as usize - ptr as usize + }, 7usize, concat!("Offset of field: ", stringify!(Test), "::", stringify!(Cu)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Test>())).Cd as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Test>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).Cd) as usize - ptr as usize + }, 8usize, concat!("Offset of field: ", stringify!(Test), "::", stringify!(Cd)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Test>())).Ccch as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Test>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).Ccch) as usize - ptr as usize + }, 9usize, concat!( "Offset of field: ", @@ -92,12 +132,20 @@ fn bindgen_test_layout_Test() { ) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Test>())).Ccu as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Test>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).Ccu) as usize - ptr as usize + }, 10usize, concat!("Offset of field: ", stringify!(Test), "::", stringify!(Ccu)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Test>())).Ccd as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Test>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).Ccd) as usize - ptr as usize + }, 11usize, concat!("Offset of field: ", stringify!(Test), "::", stringify!(Ccd)) ); diff --git a/tests/expectations/tests/class.rs b/tests/expectations/tests/class.rs index 3d3afb19..74d56859 100644 --- a/tests/expectations/tests/class.rs +++ b/tests/expectations/tests/class.rs @@ -54,12 +54,20 @@ fn bindgen_test_layout_C() { concat!("Alignment of ", stringify!(C)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<C>())).a as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<C>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).a) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(C), "::", stringify!(a)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<C>())).big_array as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<C>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).big_array) as usize - ptr as usize + }, 4usize, concat!( "Offset of field: ", @@ -98,8 +106,10 @@ fn bindgen_test_layout_C_with_zero_length_array() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<C_with_zero_length_array>())).a as *const _ - as usize + let uninit = + ::std::mem::MaybeUninit::<C_with_zero_length_array>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).a) as usize - ptr as usize }, 0usize, concat!( @@ -111,8 +121,10 @@ fn bindgen_test_layout_C_with_zero_length_array() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<C_with_zero_length_array>())).big_array - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<C_with_zero_length_array>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).big_array) as usize - ptr as usize }, 4usize, concat!( @@ -124,8 +136,11 @@ fn bindgen_test_layout_C_with_zero_length_array() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<C_with_zero_length_array>())) - .zero_length_array as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<C_with_zero_length_array>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).zero_length_array) as usize - + ptr as usize }, 37usize, concat!( @@ -165,8 +180,10 @@ fn bindgen_test_layout_C_with_zero_length_array_2() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<C_with_zero_length_array_2>())).a as *const _ - as usize + let uninit = + ::std::mem::MaybeUninit::<C_with_zero_length_array_2>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).a) as usize - ptr as usize }, 0usize, concat!( @@ -178,8 +195,11 @@ fn bindgen_test_layout_C_with_zero_length_array_2() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<C_with_zero_length_array_2>())) - .zero_length_array as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<C_with_zero_length_array_2>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).zero_length_array) as usize - + ptr as usize }, 4usize, concat!( @@ -318,7 +338,11 @@ fn bindgen_test_layout_WithDtor() { concat!("Alignment of ", stringify!(WithDtor)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<WithDtor>())).b as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<WithDtor>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).b) as usize - ptr as usize + }, 0usize, concat!( "Offset of field: ", @@ -374,12 +398,20 @@ fn bindgen_test_layout_Union() { concat!("Alignment of ", stringify!(Union)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Union>())).d as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Union>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).d) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(Union), "::", stringify!(d)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Union>())).i as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Union>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).i) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(Union), "::", stringify!(i)) ); @@ -412,7 +444,9 @@ fn bindgen_test_layout_WithUnion() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<WithUnion>())).data as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<WithUnion>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).data) as usize - ptr as usize }, 0usize, concat!( diff --git a/tests/expectations/tests/class_1_0.rs b/tests/expectations/tests/class_1_0.rs index 3f948bb1..7d1f6777 100644 --- a/tests/expectations/tests/class_1_0.rs +++ b/tests/expectations/tests/class_1_0.rs @@ -97,12 +97,20 @@ fn bindgen_test_layout_C() { concat!("Alignment of ", stringify!(C)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<C>())).a as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<C>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).a) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(C), "::", stringify!(a)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<C>())).big_array as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<C>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).big_array) as usize - ptr as usize + }, 4usize, concat!( "Offset of field: ", @@ -151,8 +159,10 @@ fn bindgen_test_layout_C_with_zero_length_array() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<C_with_zero_length_array>())).a as *const _ - as usize + let uninit = + ::std::mem::MaybeUninit::<C_with_zero_length_array>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).a) as usize - ptr as usize }, 0usize, concat!( @@ -164,8 +174,10 @@ fn bindgen_test_layout_C_with_zero_length_array() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<C_with_zero_length_array>())).big_array - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<C_with_zero_length_array>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).big_array) as usize - ptr as usize }, 4usize, concat!( @@ -177,8 +189,11 @@ fn bindgen_test_layout_C_with_zero_length_array() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<C_with_zero_length_array>())) - .zero_length_array as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<C_with_zero_length_array>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).zero_length_array) as usize - + ptr as usize }, 37usize, concat!( @@ -218,8 +233,10 @@ fn bindgen_test_layout_C_with_zero_length_array_2() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<C_with_zero_length_array_2>())).a as *const _ - as usize + let uninit = + ::std::mem::MaybeUninit::<C_with_zero_length_array_2>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).a) as usize - ptr as usize }, 0usize, concat!( @@ -231,8 +248,11 @@ fn bindgen_test_layout_C_with_zero_length_array_2() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<C_with_zero_length_array_2>())) - .zero_length_array as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<C_with_zero_length_array_2>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).zero_length_array) as usize - + ptr as usize }, 4usize, concat!( @@ -371,7 +391,11 @@ fn bindgen_test_layout_WithDtor() { concat!("Alignment of ", stringify!(WithDtor)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<WithDtor>())).b as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<WithDtor>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).b) as usize - ptr as usize + }, 0usize, concat!( "Offset of field: ", @@ -428,12 +452,20 @@ fn bindgen_test_layout_Union() { concat!("Alignment of ", stringify!(Union)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Union>())).d as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Union>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).d) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(Union), "::", stringify!(d)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Union>())).i as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Union>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).i) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(Union), "::", stringify!(i)) ); @@ -462,7 +494,9 @@ fn bindgen_test_layout_WithUnion() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<WithUnion>())).data as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<WithUnion>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).data) as usize - ptr as usize }, 0usize, concat!( diff --git a/tests/expectations/tests/class_nested.rs b/tests/expectations/tests/class_nested.rs index ecc5c20a..55ea6e1d 100644 --- a/tests/expectations/tests/class_nested.rs +++ b/tests/expectations/tests/class_nested.rs @@ -29,7 +29,9 @@ fn bindgen_test_layout_A_B() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<A_B>())).member_b as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<A_B>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).member_b) as usize - ptr as usize }, 0usize, concat!( @@ -68,7 +70,11 @@ fn bindgen_test_layout_A() { concat!("Alignment of ", stringify!(A)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<A>())).member_a as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<A>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).member_a) as usize - ptr as usize + }, 0usize, concat!( "Offset of field: ", @@ -96,7 +102,11 @@ fn bindgen_test_layout_A_C() { concat!("Alignment of ", stringify!(A_C)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<A_C>())).baz as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<A_C>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).baz) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(A_C), "::", stringify!(baz)) ); @@ -144,7 +154,11 @@ fn bindgen_test_layout_D() { concat!("Alignment of ", stringify!(D)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<D>())).member as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<D>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).member) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(D), "::", stringify!(member)) ); diff --git a/tests/expectations/tests/class_no_members.rs b/tests/expectations/tests/class_no_members.rs index 6c1e4880..5ac7ffde 100644 --- a/tests/expectations/tests/class_no_members.rs +++ b/tests/expectations/tests/class_no_members.rs @@ -60,8 +60,10 @@ fn bindgen_test_layout_whatever_child_with_member() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<whatever_child_with_member>())).m_member - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<whatever_child_with_member>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).m_member) as usize - ptr as usize }, 0usize, concat!( diff --git a/tests/expectations/tests/class_use_as.rs b/tests/expectations/tests/class_use_as.rs index d6a71ac3..f1f08e4d 100644 --- a/tests/expectations/tests/class_use_as.rs +++ b/tests/expectations/tests/class_use_as.rs @@ -25,8 +25,9 @@ fn bindgen_test_layout_whatever() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<whatever>())).replacement as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<whatever>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).replacement) as usize - ptr as usize }, 0usize, concat!( @@ -55,7 +56,11 @@ fn bindgen_test_layout_container() { concat!("Alignment of ", stringify!(container)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<container>())).c as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<container>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).c) as usize - ptr as usize + }, 0usize, concat!( "Offset of field: ", diff --git a/tests/expectations/tests/class_with_dtor.rs b/tests/expectations/tests/class_with_dtor.rs index 0cf2d8d2..e94e8e5f 100644 --- a/tests/expectations/tests/class_with_dtor.rs +++ b/tests/expectations/tests/class_with_dtor.rs @@ -40,8 +40,10 @@ fn bindgen_test_layout_WithoutDtor() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<WithoutDtor>())).shouldBeWithDtor as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<WithoutDtor>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).shouldBeWithDtor) as usize - + ptr as usize }, 0usize, concat!( diff --git a/tests/expectations/tests/class_with_inner_struct.rs b/tests/expectations/tests/class_with_inner_struct.rs index 35ed7659..49ca3048 100644 --- a/tests/expectations/tests/class_with_inner_struct.rs +++ b/tests/expectations/tests/class_with_inner_struct.rs @@ -32,7 +32,9 @@ fn bindgen_test_layout_A_Segment() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<A_Segment>())).begin as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<A_Segment>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).begin) as usize - ptr as usize }, 0usize, concat!( @@ -44,7 +46,9 @@ fn bindgen_test_layout_A_Segment() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<A_Segment>())).end as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<A_Segment>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).end) as usize - ptr as usize }, 4usize, concat!( @@ -74,7 +78,9 @@ fn bindgen_test_layout_A__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<A__bindgen_ty_1>())).f as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<A__bindgen_ty_1>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).f) as usize - ptr as usize }, 0usize, concat!( @@ -113,7 +119,9 @@ fn bindgen_test_layout_A__bindgen_ty_2() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<A__bindgen_ty_2>())).d as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<A__bindgen_ty_2>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).d) as usize - ptr as usize }, 0usize, concat!( @@ -146,13 +154,19 @@ fn bindgen_test_layout_A() { concat!("Alignment of ", stringify!(A)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<A>())).c as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<A>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).c) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(A), "::", stringify!(c)) ); assert_eq!( unsafe { - &(*(::std::ptr::null::<A>())).named_union as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<A>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).named_union) as usize - ptr as usize }, 4usize, concat!( @@ -197,7 +211,9 @@ fn bindgen_test_layout_B_Segment() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<B_Segment>())).begin as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<B_Segment>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).begin) as usize - ptr as usize }, 0usize, concat!( @@ -209,7 +225,9 @@ fn bindgen_test_layout_B_Segment() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<B_Segment>())).end as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<B_Segment>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).end) as usize - ptr as usize }, 4usize, concat!( @@ -233,7 +251,11 @@ fn bindgen_test_layout_B() { concat!("Alignment of ", stringify!(B)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<B>())).d as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<B>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).d) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(B), "::", stringify!(d)) ); @@ -280,8 +302,9 @@ fn bindgen_test_layout_C__bindgen_ty_1__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<C__bindgen_ty_1__bindgen_ty_1>())).mX1 - as *const _ as usize + let uninit = :: std :: mem :: MaybeUninit :: < C__bindgen_ty_1__bindgen_ty_1 > :: uninit () ; + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mX1) as usize - ptr as usize }, 0usize, concat!( @@ -293,8 +316,9 @@ fn bindgen_test_layout_C__bindgen_ty_1__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<C__bindgen_ty_1__bindgen_ty_1>())).mY1 - as *const _ as usize + let uninit = :: std :: mem :: MaybeUninit :: < C__bindgen_ty_1__bindgen_ty_1 > :: uninit () ; + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mY1) as usize - ptr as usize }, 4usize, concat!( @@ -306,8 +330,9 @@ fn bindgen_test_layout_C__bindgen_ty_1__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<C__bindgen_ty_1__bindgen_ty_1>())).mX2 - as *const _ as usize + let uninit = :: std :: mem :: MaybeUninit :: < C__bindgen_ty_1__bindgen_ty_1 > :: uninit () ; + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mX2) as usize - ptr as usize }, 8usize, concat!( @@ -319,8 +344,9 @@ fn bindgen_test_layout_C__bindgen_ty_1__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<C__bindgen_ty_1__bindgen_ty_1>())).mY2 - as *const _ as usize + let uninit = :: std :: mem :: MaybeUninit :: < C__bindgen_ty_1__bindgen_ty_1 > :: uninit () ; + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mY2) as usize - ptr as usize }, 12usize, concat!( @@ -351,8 +377,9 @@ fn bindgen_test_layout_C__bindgen_ty_1__bindgen_ty_2() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<C__bindgen_ty_1__bindgen_ty_2>())) - .mStepSyntax as *const _ as usize + let uninit = :: std :: mem :: MaybeUninit :: < C__bindgen_ty_1__bindgen_ty_2 > :: uninit () ; + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mStepSyntax) as usize - ptr as usize }, 0usize, concat!( @@ -364,8 +391,9 @@ fn bindgen_test_layout_C__bindgen_ty_1__bindgen_ty_2() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<C__bindgen_ty_1__bindgen_ty_2>())).mSteps - as *const _ as usize + let uninit = :: std :: mem :: MaybeUninit :: < C__bindgen_ty_1__bindgen_ty_2 > :: uninit () ; + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mSteps) as usize - ptr as usize }, 4usize, concat!( @@ -399,8 +427,9 @@ fn bindgen_test_layout_C__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<C__bindgen_ty_1>())).mFunc as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<C__bindgen_ty_1>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mFunc) as usize - ptr as usize }, 0usize, concat!( @@ -440,7 +469,9 @@ fn bindgen_test_layout_C_Segment() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<C_Segment>())).begin as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<C_Segment>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).begin) as usize - ptr as usize }, 0usize, concat!( @@ -452,7 +483,9 @@ fn bindgen_test_layout_C_Segment() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<C_Segment>())).end as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<C_Segment>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).end) as usize - ptr as usize }, 4usize, concat!( @@ -476,7 +509,11 @@ fn bindgen_test_layout_C() { concat!("Alignment of ", stringify!(C)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<C>())).d as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<C>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).d) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(C), "::", stringify!(d)) ); 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 52cd590d..3232a8d0 100644 --- a/tests/expectations/tests/class_with_inner_struct_1_0.rs +++ b/tests/expectations/tests/class_with_inner_struct_1_0.rs @@ -75,7 +75,9 @@ fn bindgen_test_layout_A_Segment() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<A_Segment>())).begin as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<A_Segment>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).begin) as usize - ptr as usize }, 0usize, concat!( @@ -87,7 +89,9 @@ fn bindgen_test_layout_A_Segment() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<A_Segment>())).end as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<A_Segment>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).end) as usize - ptr as usize }, 4usize, concat!( @@ -123,7 +127,9 @@ fn bindgen_test_layout_A__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<A__bindgen_ty_1>())).f as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<A__bindgen_ty_1>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).f) as usize - ptr as usize }, 0usize, concat!( @@ -159,7 +165,9 @@ fn bindgen_test_layout_A__bindgen_ty_2() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<A__bindgen_ty_2>())).d as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<A__bindgen_ty_2>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).d) as usize - ptr as usize }, 0usize, concat!( @@ -188,13 +196,19 @@ fn bindgen_test_layout_A() { concat!("Alignment of ", stringify!(A)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<A>())).c as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<A>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).c) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(A), "::", stringify!(c)) ); assert_eq!( unsafe { - &(*(::std::ptr::null::<A>())).named_union as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<A>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).named_union) as usize - ptr as usize }, 4usize, concat!( @@ -235,7 +249,9 @@ fn bindgen_test_layout_B_Segment() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<B_Segment>())).begin as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<B_Segment>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).begin) as usize - ptr as usize }, 0usize, concat!( @@ -247,7 +263,9 @@ fn bindgen_test_layout_B_Segment() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<B_Segment>())).end as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<B_Segment>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).end) as usize - ptr as usize }, 4usize, concat!( @@ -276,7 +294,11 @@ fn bindgen_test_layout_B() { concat!("Alignment of ", stringify!(B)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<B>())).d as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<B>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).d) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(B), "::", stringify!(d)) ); @@ -329,8 +351,9 @@ fn bindgen_test_layout_C__bindgen_ty_1__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<C__bindgen_ty_1__bindgen_ty_1>())).mX1 - as *const _ as usize + let uninit = :: std :: mem :: MaybeUninit :: < C__bindgen_ty_1__bindgen_ty_1 > :: uninit () ; + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mX1) as usize - ptr as usize }, 0usize, concat!( @@ -342,8 +365,9 @@ fn bindgen_test_layout_C__bindgen_ty_1__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<C__bindgen_ty_1__bindgen_ty_1>())).mY1 - as *const _ as usize + let uninit = :: std :: mem :: MaybeUninit :: < C__bindgen_ty_1__bindgen_ty_1 > :: uninit () ; + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mY1) as usize - ptr as usize }, 4usize, concat!( @@ -355,8 +379,9 @@ fn bindgen_test_layout_C__bindgen_ty_1__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<C__bindgen_ty_1__bindgen_ty_1>())).mX2 - as *const _ as usize + let uninit = :: std :: mem :: MaybeUninit :: < C__bindgen_ty_1__bindgen_ty_1 > :: uninit () ; + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mX2) as usize - ptr as usize }, 8usize, concat!( @@ -368,8 +393,9 @@ fn bindgen_test_layout_C__bindgen_ty_1__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<C__bindgen_ty_1__bindgen_ty_1>())).mY2 - as *const _ as usize + let uninit = :: std :: mem :: MaybeUninit :: < C__bindgen_ty_1__bindgen_ty_1 > :: uninit () ; + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mY2) as usize - ptr as usize }, 12usize, concat!( @@ -405,8 +431,9 @@ fn bindgen_test_layout_C__bindgen_ty_1__bindgen_ty_2() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<C__bindgen_ty_1__bindgen_ty_2>())) - .mStepSyntax as *const _ as usize + let uninit = :: std :: mem :: MaybeUninit :: < C__bindgen_ty_1__bindgen_ty_2 > :: uninit () ; + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mStepSyntax) as usize - ptr as usize }, 0usize, concat!( @@ -418,8 +445,9 @@ fn bindgen_test_layout_C__bindgen_ty_1__bindgen_ty_2() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<C__bindgen_ty_1__bindgen_ty_2>())).mSteps - as *const _ as usize + let uninit = :: std :: mem :: MaybeUninit :: < C__bindgen_ty_1__bindgen_ty_2 > :: uninit () ; + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mSteps) as usize - ptr as usize }, 4usize, concat!( @@ -458,8 +486,9 @@ fn bindgen_test_layout_C__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<C__bindgen_ty_1>())).mFunc as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<C__bindgen_ty_1>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mFunc) as usize - ptr as usize }, 0usize, concat!( @@ -495,7 +524,9 @@ fn bindgen_test_layout_C_Segment() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<C_Segment>())).begin as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<C_Segment>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).begin) as usize - ptr as usize }, 0usize, concat!( @@ -507,7 +538,9 @@ fn bindgen_test_layout_C_Segment() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<C_Segment>())).end as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<C_Segment>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).end) as usize - ptr as usize }, 4usize, concat!( @@ -536,7 +569,11 @@ fn bindgen_test_layout_C() { concat!("Alignment of ", stringify!(C)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<C>())).d as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<C>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).d) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(C), "::", stringify!(d)) ); diff --git a/tests/expectations/tests/class_with_typedef.rs b/tests/expectations/tests/class_with_typedef.rs index 31faa49d..7af009e7 100644 --- a/tests/expectations/tests/class_with_typedef.rs +++ b/tests/expectations/tests/class_with_typedef.rs @@ -30,27 +30,47 @@ fn bindgen_test_layout_C() { concat!("Alignment of ", stringify!(C)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<C>())).c as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<C>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).c) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(C), "::", stringify!(c)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<C>())).ptr as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<C>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).ptr) as usize - ptr as usize + }, 8usize, concat!("Offset of field: ", stringify!(C), "::", stringify!(ptr)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<C>())).arr as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<C>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).arr) as usize - ptr as usize + }, 16usize, concat!("Offset of field: ", stringify!(C), "::", stringify!(arr)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<C>())).d as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<C>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).d) as usize - ptr as usize + }, 56usize, concat!("Offset of field: ", stringify!(C), "::", stringify!(d)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<C>())).other_ptr as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<C>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).other_ptr) as usize - ptr as usize + }, 64usize, concat!( "Offset of field: ", @@ -122,7 +142,11 @@ fn bindgen_test_layout_D() { concat!("Alignment of ", stringify!(D)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<D>())).ptr as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<D>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).ptr) as usize - ptr as usize + }, 72usize, concat!("Offset of field: ", stringify!(D), "::", stringify!(ptr)) ); diff --git a/tests/expectations/tests/comment-indent.rs b/tests/expectations/tests/comment-indent.rs index c381b734..e4bdea3d 100644 --- a/tests/expectations/tests/comment-indent.rs +++ b/tests/expectations/tests/comment-indent.rs @@ -82,7 +82,9 @@ pub mod root { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<Baz>())).member as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<Baz>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).member) as usize - ptr as usize }, 0usize, concat!( diff --git a/tests/expectations/tests/complex.rs b/tests/expectations/tests/complex.rs index 4dae0717..77ab2808 100644 --- a/tests/expectations/tests/complex.rs +++ b/tests/expectations/tests/complex.rs @@ -30,7 +30,9 @@ fn bindgen_test_layout_TestDouble() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<TestDouble>())).mMember as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<TestDouble>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mMember) as usize - ptr as usize }, 0usize, concat!( @@ -60,8 +62,9 @@ fn bindgen_test_layout_TestDoublePtr() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<TestDoublePtr>())).mMember as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<TestDoublePtr>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mMember) as usize - ptr as usize }, 0usize, concat!( @@ -100,7 +103,9 @@ fn bindgen_test_layout_TestFloat() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<TestFloat>())).mMember as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<TestFloat>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mMember) as usize - ptr as usize }, 0usize, concat!( @@ -130,8 +135,9 @@ fn bindgen_test_layout_TestFloatPtr() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<TestFloatPtr>())).mMember as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<TestFloatPtr>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mMember) as usize - ptr as usize }, 0usize, concat!( diff --git a/tests/expectations/tests/const-const-mut-ptr.rs b/tests/expectations/tests/const-const-mut-ptr.rs index bc1e7627..9f656102 100644 --- a/tests/expectations/tests/const-const-mut-ptr.rs +++ b/tests/expectations/tests/const-const-mut-ptr.rs @@ -23,7 +23,11 @@ fn bindgen_test_layout_foo() { concat!("Alignment of ", stringify!(foo)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<foo>())).bar as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<foo>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).bar) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(foo), "::", stringify!(bar)) ); diff --git a/tests/expectations/tests/constified-enum-module-overflow.rs b/tests/expectations/tests/constified-enum-module-overflow.rs index 4a799ef8..6c625321 100644 --- a/tests/expectations/tests/constified-enum-module-overflow.rs +++ b/tests/expectations/tests/constified-enum-module-overflow.rs @@ -34,7 +34,11 @@ fn bindgen_test_layout_A() { concat!("Alignment of ", stringify!(A)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<A>())).u as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<A>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).u) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(A), "::", stringify!(u)) ); diff --git a/tests/expectations/tests/constify-all-enums.rs b/tests/expectations/tests/constify-all-enums.rs index 78bb99fa..3627faae 100644 --- a/tests/expectations/tests/constify-all-enums.rs +++ b/tests/expectations/tests/constify-all-enums.rs @@ -28,8 +28,10 @@ fn bindgen_test_layout_bar() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<bar>())).this_should_work as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<bar>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).this_should_work) as usize - + ptr as usize }, 0usize, concat!( diff --git a/tests/expectations/tests/constify-module-enums-basic.rs b/tests/expectations/tests/constify-module-enums-basic.rs index 59e9ba12..0ea84b9d 100644 --- a/tests/expectations/tests/constify-module-enums-basic.rs +++ b/tests/expectations/tests/constify-module-enums-basic.rs @@ -32,8 +32,10 @@ fn bindgen_test_layout_bar() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<bar>())).this_should_work as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<bar>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).this_should_work) as usize - + ptr as usize }, 0usize, concat!( diff --git a/tests/expectations/tests/constify-module-enums-namespace.rs b/tests/expectations/tests/constify-module-enums-namespace.rs index e434291a..637e6e4f 100644 --- a/tests/expectations/tests/constify-module-enums-namespace.rs +++ b/tests/expectations/tests/constify-module-enums-namespace.rs @@ -44,8 +44,10 @@ pub mod root { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<bar>())).this_should_work - as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<bar>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).this_should_work) as usize - + ptr as usize }, 0usize, concat!( diff --git a/tests/expectations/tests/constify-module-enums-shadow-name.rs b/tests/expectations/tests/constify-module-enums-shadow-name.rs index 60401dc0..21ad17a3 100644 --- a/tests/expectations/tests/constify-module-enums-shadow-name.rs +++ b/tests/expectations/tests/constify-module-enums-shadow-name.rs @@ -30,7 +30,11 @@ fn bindgen_test_layout_bar() { concat!("Alignment of ", stringify!(bar)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<bar>())).member as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<bar>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).member) as usize - ptr as usize + }, 0usize, concat!( "Offset of field: ", diff --git a/tests/expectations/tests/constify-module-enums-simple-alias.rs b/tests/expectations/tests/constify-module-enums-simple-alias.rs index 317697dd..4d7ae604 100644 --- a/tests/expectations/tests/constify-module-enums-simple-alias.rs +++ b/tests/expectations/tests/constify-module-enums-simple-alias.rs @@ -39,28 +39,46 @@ fn bindgen_test_layout_Bar() { concat!("Alignment of ", stringify!(Bar)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Bar>())).baz1 as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Bar>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).baz1) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(Bar), "::", stringify!(baz1)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Bar>())).baz2 as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Bar>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).baz2) as usize - ptr as usize + }, 4usize, concat!("Offset of field: ", stringify!(Bar), "::", stringify!(baz2)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Bar>())).baz3 as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Bar>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).baz3) as usize - ptr as usize + }, 8usize, concat!("Offset of field: ", stringify!(Bar), "::", stringify!(baz3)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Bar>())).baz4 as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Bar>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).baz4) as usize - ptr as usize + }, 12usize, concat!("Offset of field: ", stringify!(Bar), "::", stringify!(baz4)) ); assert_eq!( unsafe { - &(*(::std::ptr::null::<Bar>())).baz_ptr1 as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<Bar>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).baz_ptr1) as usize - ptr as usize }, 16usize, concat!( @@ -72,7 +90,9 @@ fn bindgen_test_layout_Bar() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<Bar>())).baz_ptr2 as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<Bar>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).baz_ptr2) as usize - ptr as usize }, 24usize, concat!( @@ -84,7 +104,9 @@ fn bindgen_test_layout_Bar() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<Bar>())).baz_ptr3 as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<Bar>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).baz_ptr3) as usize - ptr as usize }, 32usize, concat!( @@ -96,7 +118,9 @@ fn bindgen_test_layout_Bar() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<Bar>())).baz_ptr4 as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<Bar>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).baz_ptr4) as usize - ptr as usize }, 40usize, concat!( diff --git a/tests/expectations/tests/constify-module-enums-simple-nonamespace.rs b/tests/expectations/tests/constify-module-enums-simple-nonamespace.rs index b6644797..f15ae7ef 100644 --- a/tests/expectations/tests/constify-module-enums-simple-nonamespace.rs +++ b/tests/expectations/tests/constify-module-enums-simple-nonamespace.rs @@ -29,12 +29,20 @@ fn bindgen_test_layout_Bar() { concat!("Alignment of ", stringify!(Bar)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Bar>())).baz1 as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Bar>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).baz1) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(Bar), "::", stringify!(baz1)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Bar>())).baz2 as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Bar>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).baz2) as usize - ptr as usize + }, 8usize, concat!("Offset of field: ", stringify!(Bar), "::", stringify!(baz2)) ); diff --git a/tests/expectations/tests/constify-module-enums-types.rs b/tests/expectations/tests/constify-module-enums-types.rs index ec7e6c0e..9c7490b6 100644 --- a/tests/expectations/tests/constify-module-enums-types.rs +++ b/tests/expectations/tests/constify-module-enums-types.rs @@ -64,7 +64,11 @@ fn bindgen_test_layout_bar() { concat!("Alignment of ", stringify!(bar)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<bar>())).member1 as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<bar>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).member1) as usize - ptr as usize + }, 0usize, concat!( "Offset of field: ", @@ -74,7 +78,11 @@ fn bindgen_test_layout_bar() { ) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<bar>())).member2 as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<bar>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).member2) as usize - ptr as usize + }, 4usize, concat!( "Offset of field: ", @@ -84,7 +92,11 @@ fn bindgen_test_layout_bar() { ) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<bar>())).member3 as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<bar>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).member3) as usize - ptr as usize + }, 8usize, concat!( "Offset of field: ", @@ -94,7 +106,11 @@ fn bindgen_test_layout_bar() { ) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<bar>())).member4 as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<bar>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).member4) as usize - ptr as usize + }, 12usize, concat!( "Offset of field: ", @@ -104,7 +120,11 @@ fn bindgen_test_layout_bar() { ) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<bar>())).member5 as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<bar>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).member5) as usize - ptr as usize + }, 16usize, concat!( "Offset of field: ", @@ -114,7 +134,11 @@ fn bindgen_test_layout_bar() { ) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<bar>())).member6 as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<bar>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).member6) as usize - ptr as usize + }, 24usize, concat!( "Offset of field: ", @@ -124,7 +148,11 @@ fn bindgen_test_layout_bar() { ) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<bar>())).member7 as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<bar>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).member7) as usize - ptr as usize + }, 32usize, concat!( "Offset of field: ", @@ -134,7 +162,11 @@ fn bindgen_test_layout_bar() { ) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<bar>())).member8 as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<bar>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).member8) as usize - ptr as usize + }, 36usize, concat!( "Offset of field: ", @@ -144,7 +176,11 @@ fn bindgen_test_layout_bar() { ) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<bar>())).member9 as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<bar>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).member9) as usize - ptr as usize + }, 40usize, concat!( "Offset of field: ", @@ -155,7 +191,9 @@ fn bindgen_test_layout_bar() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<bar>())).member10 as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<bar>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).member10) as usize - ptr as usize }, 44usize, concat!( @@ -193,7 +231,11 @@ fn bindgen_test_layout_Baz() { concat!("Alignment of ", stringify!(Baz)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Baz>())).member1 as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Baz>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).member1) as usize - ptr as usize + }, 0usize, concat!( "Offset of field: ", @@ -235,7 +277,11 @@ fn bindgen_test_layout_Bar() { concat!("Alignment of ", stringify!(Bar)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Bar>())).baz as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Bar>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).baz) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(Bar), "::", stringify!(baz)) ); diff --git a/tests/expectations/tests/contains-vs-inherits-zero-sized.rs b/tests/expectations/tests/contains-vs-inherits-zero-sized.rs index 2882fa84..45db9099 100644 --- a/tests/expectations/tests/contains-vs-inherits-zero-sized.rs +++ b/tests/expectations/tests/contains-vs-inherits-zero-sized.rs @@ -44,7 +44,11 @@ fn bindgen_test_layout_Inherits() { concat!("Alignment of ", stringify!(Inherits)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Inherits>())).b as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Inherits>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).b) as usize - ptr as usize + }, 0usize, concat!( "Offset of field: ", @@ -76,7 +80,9 @@ fn bindgen_test_layout_Contains() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<Contains>())).empty as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<Contains>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).empty) as usize - ptr as usize }, 0usize, concat!( @@ -87,7 +93,11 @@ fn bindgen_test_layout_Contains() { ) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Contains>())).b as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Contains>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).b) as usize - ptr as usize + }, 1usize, concat!( "Offset of field: ", diff --git a/tests/expectations/tests/convert-floats.rs b/tests/expectations/tests/convert-floats.rs index 66231592..d6e46285 100644 --- a/tests/expectations/tests/convert-floats.rs +++ b/tests/expectations/tests/convert-floats.rs @@ -34,22 +34,38 @@ fn bindgen_test_layout_foo() { concat!("Alignment of ", stringify!(foo)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<foo>())).bar as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<foo>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).bar) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(foo), "::", stringify!(bar)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<foo>())).baz as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<foo>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).baz) as usize - ptr as usize + }, 4usize, concat!("Offset of field: ", stringify!(foo), "::", stringify!(baz)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<foo>())).bazz as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<foo>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).bazz) as usize - ptr as usize + }, 8usize, concat!("Offset of field: ", stringify!(foo), "::", stringify!(bazz)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<foo>())).bazzz as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<foo>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).bazzz) as usize - ptr as usize + }, 16usize, concat!( "Offset of field: ", @@ -60,7 +76,9 @@ fn bindgen_test_layout_foo() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<foo>())).complexFloat as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<foo>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).complexFloat) as usize - ptr as usize }, 24usize, concat!( @@ -72,7 +90,9 @@ fn bindgen_test_layout_foo() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<foo>())).complexDouble as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<foo>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).complexDouble) as usize - ptr as usize }, 32usize, concat!( diff --git a/tests/expectations/tests/ctypes-prefix-path.rs b/tests/expectations/tests/ctypes-prefix-path.rs index 12cedac9..b0c7a0f7 100644 --- a/tests/expectations/tests/ctypes-prefix-path.rs +++ b/tests/expectations/tests/ctypes-prefix-path.rs @@ -32,17 +32,29 @@ fn bindgen_test_layout_foo() { concat!("Alignment of ", stringify!(foo)) ); assert_eq!( - unsafe { &(*(::core::ptr::null::<foo>())).a as *const _ as usize }, + unsafe { + let uninit = ::core::mem::MaybeUninit::<foo>::uninit(); + let ptr = uninit.as_ptr(); + ::core::ptr::addr_of!((*ptr).a) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(foo), "::", stringify!(a)) ); assert_eq!( - unsafe { &(*(::core::ptr::null::<foo>())).b as *const _ as usize }, + unsafe { + let uninit = ::core::mem::MaybeUninit::<foo>::uninit(); + let ptr = uninit.as_ptr(); + ::core::ptr::addr_of!((*ptr).b) as usize - ptr as usize + }, 4usize, concat!("Offset of field: ", stringify!(foo), "::", stringify!(b)) ); assert_eq!( - unsafe { &(*(::core::ptr::null::<foo>())).bar as *const _ as usize }, + unsafe { + let uninit = ::core::mem::MaybeUninit::<foo>::uninit(); + let ptr = uninit.as_ptr(); + ::core::ptr::addr_of!((*ptr).bar) as usize - ptr as usize + }, 8usize, concat!("Offset of field: ", stringify!(foo), "::", stringify!(bar)) ); diff --git a/tests/expectations/tests/derive-bitfield-method-same-name.rs b/tests/expectations/tests/derive-bitfield-method-same-name.rs index 1dc1d6e3..3cde87df 100644 --- a/tests/expectations/tests/derive-bitfield-method-same-name.rs +++ b/tests/expectations/tests/derive-bitfield-method-same-name.rs @@ -115,7 +115,11 @@ fn bindgen_test_layout_Foo() { concat!("Alignment of ", stringify!(Foo)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Foo>())).large as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Foo>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).large) as usize - ptr as usize + }, 0usize, concat!( "Offset of field: ", diff --git a/tests/expectations/tests/derive-clone.rs b/tests/expectations/tests/derive-clone.rs index e589a29e..25d30b21 100644 --- a/tests/expectations/tests/derive-clone.rs +++ b/tests/expectations/tests/derive-clone.rs @@ -25,8 +25,9 @@ fn bindgen_test_layout_ShouldDeriveClone() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<ShouldDeriveClone>())).large as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<ShouldDeriveClone>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).large) as usize - ptr as usize }, 0usize, concat!( diff --git a/tests/expectations/tests/derive-clone_1_0.rs b/tests/expectations/tests/derive-clone_1_0.rs index a437d5c3..f18041ce 100644 --- a/tests/expectations/tests/derive-clone_1_0.rs +++ b/tests/expectations/tests/derive-clone_1_0.rs @@ -26,8 +26,9 @@ fn bindgen_test_layout_ShouldImplClone() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<ShouldImplClone>())).large as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<ShouldImplClone>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).large) as usize - ptr as usize }, 0usize, concat!( diff --git a/tests/expectations/tests/derive-debug-bitfield-core.rs b/tests/expectations/tests/derive-debug-bitfield-core.rs index 33f0f2ff..1eb5297c 100644 --- a/tests/expectations/tests/derive-debug-bitfield-core.rs +++ b/tests/expectations/tests/derive-debug-bitfield-core.rs @@ -114,7 +114,9 @@ fn bindgen_test_layout_C() { ); assert_eq!( unsafe { - &(*(::core::ptr::null::<C>())).large_array as *const _ as usize + let uninit = ::core::mem::MaybeUninit::<C>::uninit(); + let ptr = uninit.as_ptr(); + ::core::ptr::addr_of!((*ptr).large_array) as usize - ptr as usize }, 4usize, concat!( diff --git a/tests/expectations/tests/derive-debug-bitfield.rs b/tests/expectations/tests/derive-debug-bitfield.rs index 00976b59..57e246dc 100644 --- a/tests/expectations/tests/derive-debug-bitfield.rs +++ b/tests/expectations/tests/derive-debug-bitfield.rs @@ -112,7 +112,9 @@ fn bindgen_test_layout_C() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<C>())).large_array as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<C>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).large_array) as usize - ptr as usize }, 4usize, concat!( diff --git a/tests/expectations/tests/derive-debug-function-pointer.rs b/tests/expectations/tests/derive-debug-function-pointer.rs index c031897b..da522aa4 100644 --- a/tests/expectations/tests/derive-debug-function-pointer.rs +++ b/tests/expectations/tests/derive-debug-function-pointer.rs @@ -27,7 +27,9 @@ fn bindgen_test_layout_Nice() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<Nice>())).pointer as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<Nice>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).pointer) as usize - ptr as usize }, 0usize, concat!( @@ -39,7 +41,9 @@ fn bindgen_test_layout_Nice() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<Nice>())).large_array as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<Nice>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).large_array) as usize - ptr as usize }, 8usize, concat!( diff --git a/tests/expectations/tests/derive-debug-mangle-name.rs b/tests/expectations/tests/derive-debug-mangle-name.rs index ed541648..5fb9d381 100644 --- a/tests/expectations/tests/derive-debug-mangle-name.rs +++ b/tests/expectations/tests/derive-debug-mangle-name.rs @@ -32,8 +32,9 @@ fn bindgen_test_layout_perf_event_attr__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<perf_event_attr__bindgen_ty_1>())).b - as *const _ as usize + let uninit = :: std :: mem :: MaybeUninit :: < perf_event_attr__bindgen_ty_1 > :: uninit () ; + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).b) as usize - ptr as usize }, 0usize, concat!( @@ -45,8 +46,9 @@ fn bindgen_test_layout_perf_event_attr__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<perf_event_attr__bindgen_ty_1>())).c - as *const _ as usize + let uninit = :: std :: mem :: MaybeUninit :: < perf_event_attr__bindgen_ty_1 > :: uninit () ; + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).c) as usize - ptr as usize }, 0usize, concat!( @@ -85,8 +87,9 @@ fn bindgen_test_layout_perf_event_attr() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<perf_event_attr>())).type_ as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<perf_event_attr>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).type_) as usize - ptr as usize }, 0usize, concat!( @@ -98,7 +101,9 @@ fn bindgen_test_layout_perf_event_attr() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<perf_event_attr>())).a as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<perf_event_attr>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).a) as usize - ptr as usize }, 4usize, concat!( diff --git a/tests/expectations/tests/derive-debug-opaque-template-instantiation.rs b/tests/expectations/tests/derive-debug-opaque-template-instantiation.rs index ceb70ffe..51071c32 100644 --- a/tests/expectations/tests/derive-debug-opaque-template-instantiation.rs +++ b/tests/expectations/tests/derive-debug-opaque-template-instantiation.rs @@ -23,7 +23,9 @@ fn bindgen_test_layout_Instance() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<Instance>())).val as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<Instance>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).val) as usize - ptr as usize }, 0usize, concat!( diff --git a/tests/expectations/tests/derive-debug-opaque.rs b/tests/expectations/tests/derive-debug-opaque.rs index 411c7a70..6f8a0d91 100644 --- a/tests/expectations/tests/derive-debug-opaque.rs +++ b/tests/expectations/tests/derive-debug-opaque.rs @@ -55,7 +55,9 @@ fn bindgen_test_layout_OpaqueUser() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<OpaqueUser>())).opaque as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<OpaqueUser>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).opaque) as usize - ptr as usize }, 0usize, concat!( diff --git a/tests/expectations/tests/derive-default-and-blocklist.rs b/tests/expectations/tests/derive-default-and-blocklist.rs index 5d53ede2..7e80e336 100644 --- a/tests/expectations/tests/derive-default-and-blocklist.rs +++ b/tests/expectations/tests/derive-default-and-blocklist.rs @@ -27,8 +27,10 @@ fn bindgen_test_layout_ShouldNotDeriveDefault() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<ShouldNotDeriveDefault>())).a as *const _ - as usize + let uninit = + ::std::mem::MaybeUninit::<ShouldNotDeriveDefault>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).a) as usize - ptr as usize }, 0usize, concat!( diff --git a/tests/expectations/tests/derive-fn-ptr.rs b/tests/expectations/tests/derive-fn-ptr.rs index 7c9f4261..d28c5328 100644 --- a/tests/expectations/tests/derive-fn-ptr.rs +++ b/tests/expectations/tests/derive-fn-ptr.rs @@ -44,7 +44,9 @@ fn bindgen_test_layout_Foo() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<Foo>())).callback as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<Foo>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).callback) as usize - ptr as usize }, 0usize, concat!( @@ -90,7 +92,9 @@ fn bindgen_test_layout_Bar() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<Bar>())).callback as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<Bar>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).callback) as usize - ptr as usize }, 0usize, concat!( diff --git a/tests/expectations/tests/derive-hash-and-blocklist.rs b/tests/expectations/tests/derive-hash-and-blocklist.rs index 8e1190ea..15d1a6d7 100644 --- a/tests/expectations/tests/derive-hash-and-blocklist.rs +++ b/tests/expectations/tests/derive-hash-and-blocklist.rs @@ -26,8 +26,10 @@ fn bindgen_test_layout_ShouldNotDeriveHash() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<ShouldNotDeriveHash>())).a as *const _ - as usize + let uninit = + ::std::mem::MaybeUninit::<ShouldNotDeriveHash>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).a) as usize - ptr as usize }, 0usize, concat!( diff --git a/tests/expectations/tests/derive-hash-blocklisting.rs b/tests/expectations/tests/derive-hash-blocklisting.rs index 7cd29c21..28ce3ab8 100644 --- a/tests/expectations/tests/derive-hash-blocklisting.rs +++ b/tests/expectations/tests/derive-hash-blocklisting.rs @@ -32,7 +32,9 @@ fn bindgen_test_layout_AllowlistedOne() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<AllowlistedOne>())).a as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<AllowlistedOne>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).a) as usize - ptr as usize }, 0usize, concat!( @@ -71,7 +73,9 @@ fn bindgen_test_layout_AllowlistedTwo() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<AllowlistedTwo>())).b as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<AllowlistedTwo>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).b) as usize - ptr as usize }, 0usize, concat!( diff --git a/tests/expectations/tests/derive-hash-struct-with-anon-struct-float.rs b/tests/expectations/tests/derive-hash-struct-with-anon-struct-float.rs index 92846f3c..74644f98 100644 --- a/tests/expectations/tests/derive-hash-struct-with-anon-struct-float.rs +++ b/tests/expectations/tests/derive-hash-struct-with-anon-struct-float.rs @@ -31,7 +31,9 @@ fn bindgen_test_layout_foo__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<foo__bindgen_ty_1>())).a as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<foo__bindgen_ty_1>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).a) as usize - ptr as usize }, 0usize, concat!( @@ -43,7 +45,9 @@ fn bindgen_test_layout_foo__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<foo__bindgen_ty_1>())).b as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<foo__bindgen_ty_1>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).b) as usize - ptr as usize }, 4usize, concat!( @@ -67,7 +71,11 @@ fn bindgen_test_layout_foo() { concat!("Alignment of ", stringify!(foo)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<foo>())).bar as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<foo>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).bar) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(foo), "::", stringify!(bar)) ); diff --git a/tests/expectations/tests/derive-hash-struct-with-float-array.rs b/tests/expectations/tests/derive-hash-struct-with-float-array.rs index e2e1bcef..b22cb25e 100644 --- a/tests/expectations/tests/derive-hash-struct-with-float-array.rs +++ b/tests/expectations/tests/derive-hash-struct-with-float-array.rs @@ -24,7 +24,11 @@ fn bindgen_test_layout_foo() { concat!("Alignment of ", stringify!(foo)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<foo>())).bar as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<foo>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).bar) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(foo), "::", stringify!(bar)) ); diff --git a/tests/expectations/tests/derive-hash-struct-with-incomplete-array.rs b/tests/expectations/tests/derive-hash-struct-with-incomplete-array.rs index 85108074..d1f7ae3f 100644 --- a/tests/expectations/tests/derive-hash-struct-with-incomplete-array.rs +++ b/tests/expectations/tests/derive-hash-struct-with-incomplete-array.rs @@ -54,14 +54,20 @@ fn bindgen_test_layout_test() { concat!("Alignment of ", stringify!(test)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<test>())).a as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<test>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).a) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(test), "::", stringify!(a)) ); assert_eq!( unsafe { - &(*(::std::ptr::null::<test>())).zero_length_array as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<test>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).zero_length_array) as usize - + ptr as usize }, 4usize, concat!( diff --git a/tests/expectations/tests/derive-hash-struct-with-pointer.rs b/tests/expectations/tests/derive-hash-struct-with-pointer.rs index e98bbf0f..8931689b 100644 --- a/tests/expectations/tests/derive-hash-struct-with-pointer.rs +++ b/tests/expectations/tests/derive-hash-struct-with-pointer.rs @@ -25,7 +25,9 @@ fn bindgen_test_layout_ConstPtrMutObj() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<ConstPtrMutObj>())).bar as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<ConstPtrMutObj>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).bar) as usize - ptr as usize }, 0usize, concat!( @@ -64,7 +66,9 @@ fn bindgen_test_layout_MutPtrMutObj() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<MutPtrMutObj>())).bar as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<MutPtrMutObj>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).bar) as usize - ptr as usize }, 0usize, concat!( @@ -103,7 +107,9 @@ fn bindgen_test_layout_MutPtrConstObj() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<MutPtrConstObj>())).bar as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<MutPtrConstObj>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).bar) as usize - ptr as usize }, 0usize, concat!( @@ -142,8 +148,9 @@ fn bindgen_test_layout_ConstPtrConstObj() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<ConstPtrConstObj>())).bar as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<ConstPtrConstObj>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).bar) as usize - ptr as usize }, 0usize, concat!( diff --git a/tests/expectations/tests/derive-hash-template-inst-float.rs b/tests/expectations/tests/derive-hash-template-inst-float.rs index f8618152..27f7f72c 100644 --- a/tests/expectations/tests/derive-hash-template-inst-float.rs +++ b/tests/expectations/tests/derive-hash-template-inst-float.rs @@ -40,7 +40,11 @@ fn bindgen_test_layout_IntStr() { concat!("Alignment of ", stringify!(IntStr)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<IntStr>())).a as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<IntStr>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).a) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(IntStr), "::", stringify!(a)) ); @@ -73,7 +77,11 @@ fn bindgen_test_layout_FloatStr() { concat!("Alignment of ", stringify!(FloatStr)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<FloatStr>())).a as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<FloatStr>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).a) as usize - ptr as usize + }, 0usize, concat!( "Offset of field: ", diff --git a/tests/expectations/tests/derive-partialeq-and-blocklist.rs b/tests/expectations/tests/derive-partialeq-and-blocklist.rs index d9dfb446..e3d81277 100644 --- a/tests/expectations/tests/derive-partialeq-and-blocklist.rs +++ b/tests/expectations/tests/derive-partialeq-and-blocklist.rs @@ -27,8 +27,10 @@ fn bindgen_test_layout_ShouldNotDerivePartialEq() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<ShouldNotDerivePartialEq>())).a as *const _ - as usize + let uninit = + ::std::mem::MaybeUninit::<ShouldNotDerivePartialEq>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).a) as usize - ptr as usize }, 0usize, concat!( diff --git a/tests/expectations/tests/derive-partialeq-base.rs b/tests/expectations/tests/derive-partialeq-base.rs index cdf8dff8..ce241447 100644 --- a/tests/expectations/tests/derive-partialeq-base.rs +++ b/tests/expectations/tests/derive-partialeq-base.rs @@ -23,7 +23,11 @@ fn bindgen_test_layout_Base() { concat!("Alignment of ", stringify!(Base)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Base>())).large as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Base>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).large) as usize - ptr as usize + }, 0usize, concat!( "Offset of field: ", diff --git a/tests/expectations/tests/derive-partialeq-bitfield.rs b/tests/expectations/tests/derive-partialeq-bitfield.rs index cffffca5..94b47eba 100644 --- a/tests/expectations/tests/derive-partialeq-bitfield.rs +++ b/tests/expectations/tests/derive-partialeq-bitfield.rs @@ -112,7 +112,9 @@ fn bindgen_test_layout_C() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<C>())).large_array as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<C>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).large_array) as usize - ptr as usize }, 4usize, concat!( diff --git a/tests/expectations/tests/derive-partialeq-core.rs b/tests/expectations/tests/derive-partialeq-core.rs index 8cdfb92c..171c0a45 100644 --- a/tests/expectations/tests/derive-partialeq-core.rs +++ b/tests/expectations/tests/derive-partialeq-core.rs @@ -26,7 +26,9 @@ fn bindgen_test_layout_C() { ); assert_eq!( unsafe { - &(*(::core::ptr::null::<C>())).large_array as *const _ as usize + let uninit = ::core::mem::MaybeUninit::<C>::uninit(); + let ptr = uninit.as_ptr(); + ::core::ptr::addr_of!((*ptr).large_array) as usize - ptr as usize }, 0usize, concat!( diff --git a/tests/expectations/tests/derive-partialeq-pointer.rs b/tests/expectations/tests/derive-partialeq-pointer.rs index 17a5edcb..a2d6246c 100644 --- a/tests/expectations/tests/derive-partialeq-pointer.rs +++ b/tests/expectations/tests/derive-partialeq-pointer.rs @@ -23,7 +23,11 @@ fn bindgen_test_layout_Bar() { concat!("Alignment of ", stringify!(Bar)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Bar>())).b as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Bar>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).b) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(Bar), "::", stringify!(b)) ); @@ -109,7 +113,11 @@ fn bindgen_test_layout_a() { concat!("Alignment of ", stringify!(a)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<a>())).d as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<a>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).d) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(a), "::", stringify!(d)) ); diff --git a/tests/expectations/tests/derive-partialeq-union.rs b/tests/expectations/tests/derive-partialeq-union.rs index b97c0531..c8ff8afa 100644 --- a/tests/expectations/tests/derive-partialeq-union.rs +++ b/tests/expectations/tests/derive-partialeq-union.rs @@ -26,8 +26,10 @@ fn bindgen_test_layout_ShouldNotDerivePartialEq() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<ShouldNotDerivePartialEq>())).a as *const _ - as usize + let uninit = + ::std::mem::MaybeUninit::<ShouldNotDerivePartialEq>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).a) as usize - ptr as usize }, 0usize, concat!( @@ -39,8 +41,10 @@ fn bindgen_test_layout_ShouldNotDerivePartialEq() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<ShouldNotDerivePartialEq>())).b as *const _ - as usize + let uninit = + ::std::mem::MaybeUninit::<ShouldNotDerivePartialEq>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).b) as usize - ptr as usize }, 0usize, concat!( diff --git a/tests/expectations/tests/derive-partialeq-union_1_0.rs b/tests/expectations/tests/derive-partialeq-union_1_0.rs index 2098849f..b45cc221 100644 --- a/tests/expectations/tests/derive-partialeq-union_1_0.rs +++ b/tests/expectations/tests/derive-partialeq-union_1_0.rs @@ -70,8 +70,10 @@ fn bindgen_test_layout_ShouldDerivePartialEq() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<ShouldDerivePartialEq>())).a as *const _ - as usize + let uninit = + ::std::mem::MaybeUninit::<ShouldDerivePartialEq>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).a) as usize - ptr as usize }, 0usize, concat!( @@ -83,8 +85,10 @@ fn bindgen_test_layout_ShouldDerivePartialEq() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<ShouldDerivePartialEq>())).b as *const _ - as usize + let uninit = + ::std::mem::MaybeUninit::<ShouldDerivePartialEq>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).b) as usize - ptr as usize }, 0usize, concat!( diff --git a/tests/expectations/tests/disable-nested-struct-naming.rs b/tests/expectations/tests/disable-nested-struct-naming.rs index a9ad26a5..6085eb7a 100644 --- a/tests/expectations/tests/disable-nested-struct-naming.rs +++ b/tests/expectations/tests/disable-nested-struct-naming.rs @@ -46,7 +46,11 @@ fn bindgen_test_layout_bar4() { concat!("Alignment of ", stringify!(bar4)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<bar4>())).x4 as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<bar4>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).x4) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(bar4), "::", stringify!(x4)) ); @@ -68,8 +72,11 @@ fn bindgen_test_layout_bar1__bindgen_ty_1__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<bar1__bindgen_ty_1__bindgen_ty_1>())).x3 - as *const _ as usize + let uninit = ::std::mem::MaybeUninit::< + bar1__bindgen_ty_1__bindgen_ty_1, + >::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).x3) as usize - ptr as usize }, 0usize, concat!( @@ -81,8 +88,11 @@ fn bindgen_test_layout_bar1__bindgen_ty_1__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<bar1__bindgen_ty_1__bindgen_ty_1>())).b4 - as *const _ as usize + let uninit = ::std::mem::MaybeUninit::< + bar1__bindgen_ty_1__bindgen_ty_1, + >::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).b4) as usize - ptr as usize }, 4usize, concat!( @@ -107,8 +117,10 @@ fn bindgen_test_layout_bar1__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<bar1__bindgen_ty_1>())).x2 as *const _ - as usize + let uninit = + ::std::mem::MaybeUninit::<bar1__bindgen_ty_1>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).x2) as usize - ptr as usize }, 0usize, concat!( @@ -120,8 +132,10 @@ fn bindgen_test_layout_bar1__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<bar1__bindgen_ty_1>())).b3 as *const _ - as usize + let uninit = + ::std::mem::MaybeUninit::<bar1__bindgen_ty_1>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).b3) as usize - ptr as usize }, 4usize, concat!( @@ -145,12 +159,20 @@ fn bindgen_test_layout_bar1() { concat!("Alignment of ", stringify!(bar1)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<bar1>())).x1 as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<bar1>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).x1) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(bar1), "::", stringify!(x1)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<bar1>())).b2 as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<bar1>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).b2) as usize - ptr as usize + }, 4usize, concat!("Offset of field: ", stringify!(bar1), "::", stringify!(b2)) ); @@ -168,7 +190,11 @@ fn bindgen_test_layout_foo() { concat!("Alignment of ", stringify!(foo)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<foo>())).b1 as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<foo>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).b1) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(foo), "::", stringify!(b1)) ); @@ -201,7 +227,11 @@ fn bindgen_test_layout_baz() { concat!("Alignment of ", stringify!(baz)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<baz>())).x as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<baz>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).x) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(baz), "::", stringify!(x)) ); @@ -220,8 +250,11 @@ fn bindgen_test_layout__bindgen_ty_1__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<_bindgen_ty_1__bindgen_ty_1>())).b - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<_bindgen_ty_1__bindgen_ty_1>::uninit( + ); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).b) as usize - ptr as usize }, 0usize, concat!( @@ -246,7 +279,9 @@ fn bindgen_test_layout__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<_bindgen_ty_1>())).anon2 as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<_bindgen_ty_1>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).anon2) as usize - ptr as usize }, 0usize, concat!( diff --git a/tests/expectations/tests/disable-untagged-union.rs b/tests/expectations/tests/disable-untagged-union.rs index 53002733..8031a0c1 100644 --- a/tests/expectations/tests/disable-untagged-union.rs +++ b/tests/expectations/tests/disable-untagged-union.rs @@ -68,12 +68,20 @@ fn bindgen_test_layout_Foo() { concat!("Alignment of ", stringify!(Foo)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Foo>())).bar as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Foo>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).bar) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(Foo), "::", stringify!(bar)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Foo>())).baz as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Foo>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).baz) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(Foo), "::", stringify!(baz)) ); diff --git a/tests/expectations/tests/do-not-derive-copy.rs b/tests/expectations/tests/do-not-derive-copy.rs index 4112d88a..ac194323 100644 --- a/tests/expectations/tests/do-not-derive-copy.rs +++ b/tests/expectations/tests/do-not-derive-copy.rs @@ -27,8 +27,11 @@ fn bindgen_test_layout_WouldBeCopyButWeAreNotDerivingCopy() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<WouldBeCopyButWeAreNotDerivingCopy>())).x - as *const _ as usize + let uninit = ::std::mem::MaybeUninit::< + WouldBeCopyButWeAreNotDerivingCopy, + >::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).x) as usize - ptr as usize }, 0usize, concat!( diff --git a/tests/expectations/tests/doggo-or-null.rs b/tests/expectations/tests/doggo-or-null.rs index fa7a5e89..88093fd1 100644 --- a/tests/expectations/tests/doggo-or-null.rs +++ b/tests/expectations/tests/doggo-or-null.rs @@ -23,7 +23,11 @@ fn bindgen_test_layout_Doggo() { concat!("Alignment of ", stringify!(Doggo)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Doggo>())).x as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Doggo>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).x) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(Doggo), "::", stringify!(x)) ); diff --git a/tests/expectations/tests/duplicated-namespaces-definitions.rs b/tests/expectations/tests/duplicated-namespaces-definitions.rs index 324fe2a0..9be3d27c 100644 --- a/tests/expectations/tests/duplicated-namespaces-definitions.rs +++ b/tests/expectations/tests/duplicated-namespaces-definitions.rs @@ -32,7 +32,9 @@ pub mod root { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<Bar>())).foo as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<Bar>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).foo) as usize - ptr as usize }, 0usize, concat!( @@ -44,7 +46,9 @@ pub mod root { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<Bar>())).baz as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<Bar>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).baz) as usize - ptr as usize }, 4usize, concat!( @@ -78,7 +82,9 @@ pub mod root { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<Foo>())).ptr as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<Foo>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).ptr) as usize - ptr as usize }, 0usize, concat!( diff --git a/tests/expectations/tests/dynamic_loading_with_blocklist.rs b/tests/expectations/tests/dynamic_loading_with_blocklist.rs index b06a6cf8..aedc0ad4 100644 --- a/tests/expectations/tests/dynamic_loading_with_blocklist.rs +++ b/tests/expectations/tests/dynamic_loading_with_blocklist.rs @@ -23,7 +23,11 @@ fn bindgen_test_layout_X() { concat!("Alignment of ", stringify!(X)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<X>()))._x as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<X>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr)._x) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(X), "::", stringify!(_x)) ); diff --git a/tests/expectations/tests/dynamic_loading_with_class.rs b/tests/expectations/tests/dynamic_loading_with_class.rs index 8a66dc3f..d995d9bf 100644 --- a/tests/expectations/tests/dynamic_loading_with_class.rs +++ b/tests/expectations/tests/dynamic_loading_with_class.rs @@ -23,7 +23,11 @@ fn bindgen_test_layout_A() { concat!("Alignment of ", stringify!(A)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<A>()))._x as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<A>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr)._x) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(A), "::", stringify!(_x)) ); diff --git a/tests/expectations/tests/enum-default-bitfield.rs b/tests/expectations/tests/enum-default-bitfield.rs index 1dc27fdc..406b29e0 100644 --- a/tests/expectations/tests/enum-default-bitfield.rs +++ b/tests/expectations/tests/enum-default-bitfield.rs @@ -54,7 +54,11 @@ fn bindgen_test_layout_foo() { concat!("Alignment of ", stringify!(foo)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<foo>())).member as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<foo>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).member) as usize - ptr as usize + }, 0usize, concat!( "Offset of field: ", @@ -184,4 +188,4 @@ impl ::std::ops::BitAndAssign for Debug { #[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 +pub struct Debug(pub ::std::os::raw::c_uint); diff --git a/tests/expectations/tests/enum-default-consts.rs b/tests/expectations/tests/enum-default-consts.rs index d7f5d7c2..dc0889f1 100644 --- a/tests/expectations/tests/enum-default-consts.rs +++ b/tests/expectations/tests/enum-default-consts.rs @@ -26,7 +26,11 @@ fn bindgen_test_layout_foo() { concat!("Alignment of ", stringify!(foo)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<foo>())).member as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<foo>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).member) as usize - ptr as usize + }, 0usize, concat!( "Offset of field: ", diff --git a/tests/expectations/tests/enum-default-module.rs b/tests/expectations/tests/enum-default-module.rs index 156bbcaa..8f2b603c 100644 --- a/tests/expectations/tests/enum-default-module.rs +++ b/tests/expectations/tests/enum-default-module.rs @@ -28,7 +28,11 @@ fn bindgen_test_layout_foo() { concat!("Alignment of ", stringify!(foo)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<foo>())).member as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<foo>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).member) as usize - ptr as usize + }, 0usize, concat!( "Offset of field: ", @@ -68,4 +72,4 @@ pub mod Debug { 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 045330a8..e8d4a0be 100644 --- a/tests/expectations/tests/enum-default-rust.rs +++ b/tests/expectations/tests/enum-default-rust.rs @@ -31,7 +31,11 @@ fn bindgen_test_layout_foo() { concat!("Alignment of ", stringify!(foo)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<foo>())).member as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<foo>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).member) as usize - ptr as usize + }, 0usize, concat!( "Offset of field: ", @@ -74,4 +78,4 @@ pub enum NoDebug { 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 index dbcbd052..7808527c 100644 --- a/tests/expectations/tests/enum-no-debug-rust.rs +++ b/tests/expectations/tests/enum-no-debug-rust.rs @@ -31,7 +31,11 @@ fn bindgen_test_layout_foo() { concat!("Alignment of ", stringify!(foo)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<foo>())).member as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<foo>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).member) as usize - ptr as usize + }, 0usize, concat!( "Offset of field: ", diff --git a/tests/expectations/tests/enum.rs b/tests/expectations/tests/enum.rs index fd76151f..54640385 100644 --- a/tests/expectations/tests/enum.rs +++ b/tests/expectations/tests/enum.rs @@ -26,7 +26,11 @@ fn bindgen_test_layout_foo() { concat!("Alignment of ", stringify!(foo)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<foo>())).member as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<foo>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).member) as usize - ptr as usize + }, 0usize, concat!( "Offset of field: ", diff --git a/tests/expectations/tests/enum_and_vtable_mangling.rs b/tests/expectations/tests/enum_and_vtable_mangling.rs index 5ae76c4c..372921fd 100644 --- a/tests/expectations/tests/enum_and_vtable_mangling.rs +++ b/tests/expectations/tests/enum_and_vtable_mangling.rs @@ -36,7 +36,11 @@ fn bindgen_test_layout_C() { concat!("Alignment of ", stringify!(C)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<C>())).i as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<C>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).i) as usize - ptr as usize + }, 8usize, concat!("Offset of field: ", stringify!(C), "::", stringify!(i)) ); diff --git a/tests/expectations/tests/explicit-padding.rs b/tests/expectations/tests/explicit-padding.rs index 3c429756..2614f83b 100644 --- a/tests/expectations/tests/explicit-padding.rs +++ b/tests/expectations/tests/explicit-padding.rs @@ -28,7 +28,9 @@ fn bindgen_test_layout_pad_me() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<pad_me>())).first as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<pad_me>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).first) as usize - ptr as usize }, 0usize, concat!( @@ -40,7 +42,9 @@ fn bindgen_test_layout_pad_me() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<pad_me>())).second as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<pad_me>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).second) as usize - ptr as usize }, 4usize, concat!( @@ -52,7 +56,9 @@ fn bindgen_test_layout_pad_me() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<pad_me>())).third as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<pad_me>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).third) as usize - ptr as usize }, 8usize, concat!( @@ -84,7 +90,9 @@ fn bindgen_test_layout_dont_pad_me() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<dont_pad_me>())).first as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<dont_pad_me>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).first) as usize - ptr as usize }, 0usize, concat!( @@ -96,7 +104,9 @@ fn bindgen_test_layout_dont_pad_me() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<dont_pad_me>())).second as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<dont_pad_me>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).second) as usize - ptr as usize }, 0usize, concat!( @@ -108,7 +118,9 @@ fn bindgen_test_layout_dont_pad_me() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<dont_pad_me>())).third as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<dont_pad_me>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).third) as usize - ptr as usize }, 0usize, concat!( diff --git a/tests/expectations/tests/extern-const-struct.rs b/tests/expectations/tests/extern-const-struct.rs index fa0018ba..a1bd34f9 100644 --- a/tests/expectations/tests/extern-const-struct.rs +++ b/tests/expectations/tests/extern-const-struct.rs @@ -24,7 +24,9 @@ fn bindgen_test_layout_nsFoo() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<nsFoo>())).details as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<nsFoo>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).details) as usize - ptr as usize }, 0usize, concat!( diff --git a/tests/expectations/tests/forward-declaration-autoptr.rs b/tests/expectations/tests/forward-declaration-autoptr.rs index bf0b6926..022089d0 100644 --- a/tests/expectations/tests/forward-declaration-autoptr.rs +++ b/tests/expectations/tests/forward-declaration-autoptr.rs @@ -44,7 +44,9 @@ fn bindgen_test_layout_Bar() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<Bar>())).m_member as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<Bar>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).m_member) as usize - ptr as usize }, 0usize, concat!( diff --git a/tests/expectations/tests/forward_declared_complex_types.rs b/tests/expectations/tests/forward_declared_complex_types.rs index e185e830..14531d3f 100644 --- a/tests/expectations/tests/forward_declared_complex_types.rs +++ b/tests/expectations/tests/forward_declared_complex_types.rs @@ -46,7 +46,11 @@ fn bindgen_test_layout_Bar() { concat!("Alignment of ", stringify!(Bar)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Bar>())).f as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Bar>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).f) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(Bar), "::", stringify!(f)) ); 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 c6331c69..bf9d27ca 100644 --- a/tests/expectations/tests/forward_declared_complex_types_1_0.rs +++ b/tests/expectations/tests/forward_declared_complex_types_1_0.rs @@ -56,7 +56,11 @@ fn bindgen_test_layout_Bar() { concat!("Alignment of ", stringify!(Bar)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Bar>())).f as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Bar>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).f) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(Bar), "::", stringify!(f)) ); diff --git a/tests/expectations/tests/forward_declared_struct.rs b/tests/expectations/tests/forward_declared_struct.rs index 2ecfc60e..be038ee2 100644 --- a/tests/expectations/tests/forward_declared_struct.rs +++ b/tests/expectations/tests/forward_declared_struct.rs @@ -23,7 +23,11 @@ fn bindgen_test_layout_a() { concat!("Alignment of ", stringify!(a)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<a>())).b as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<a>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).b) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(a), "::", stringify!(b)) ); @@ -46,7 +50,11 @@ fn bindgen_test_layout_c() { concat!("Alignment of ", stringify!(c)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<c>())).d as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<c>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).d) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(c), "::", stringify!(d)) ); diff --git a/tests/expectations/tests/func_ptr_in_struct.rs b/tests/expectations/tests/func_ptr_in_struct.rs index 8f98763f..3f2a4faa 100644 --- a/tests/expectations/tests/func_ptr_in_struct.rs +++ b/tests/expectations/tests/func_ptr_in_struct.rs @@ -33,7 +33,11 @@ fn bindgen_test_layout_Foo() { concat!("Alignment of ", stringify!(Foo)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Foo>())).bar as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Foo>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).bar) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(Foo), "::", stringify!(bar)) ); diff --git a/tests/expectations/tests/gen-destructors-neg.rs b/tests/expectations/tests/gen-destructors-neg.rs index 67b6d701..8f4eeaf6 100644 --- a/tests/expectations/tests/gen-destructors-neg.rs +++ b/tests/expectations/tests/gen-destructors-neg.rs @@ -23,7 +23,11 @@ fn bindgen_test_layout_Foo() { concat!("Alignment of ", stringify!(Foo)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Foo>())).bar as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Foo>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).bar) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(Foo), "::", stringify!(bar)) ); diff --git a/tests/expectations/tests/gen-destructors.rs b/tests/expectations/tests/gen-destructors.rs index 7d96870d..582e4829 100644 --- a/tests/expectations/tests/gen-destructors.rs +++ b/tests/expectations/tests/gen-destructors.rs @@ -23,7 +23,11 @@ fn bindgen_test_layout_Foo() { concat!("Alignment of ", stringify!(Foo)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Foo>())).bar as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Foo>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).bar) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(Foo), "::", stringify!(bar)) ); diff --git a/tests/expectations/tests/i128.rs b/tests/expectations/tests/i128.rs index 1a239694..656a409b 100644 --- a/tests/expectations/tests/i128.rs +++ b/tests/expectations/tests/i128.rs @@ -26,7 +26,9 @@ fn bindgen_test_layout_foo() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<foo>())).my_signed as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<foo>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).my_signed) as usize - ptr as usize }, 0usize, concat!( @@ -38,7 +40,9 @@ fn bindgen_test_layout_foo() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<foo>())).my_unsigned as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<foo>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).my_unsigned) as usize - ptr as usize }, 16usize, concat!( diff --git a/tests/expectations/tests/inline_namespace.rs b/tests/expectations/tests/inline_namespace.rs index 036d2da6..b552ae02 100644 --- a/tests/expectations/tests/inline_namespace.rs +++ b/tests/expectations/tests/inline_namespace.rs @@ -32,7 +32,11 @@ pub mod root { concat!("Alignment of ", stringify!(Bar)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Bar>())).baz as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Bar>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).baz) as usize - ptr as usize + }, 0usize, concat!( "Offset of field: ", diff --git a/tests/expectations/tests/inline_namespace_conservative.rs b/tests/expectations/tests/inline_namespace_conservative.rs index 3d2ce0c4..57c6e214 100644 --- a/tests/expectations/tests/inline_namespace_conservative.rs +++ b/tests/expectations/tests/inline_namespace_conservative.rs @@ -37,7 +37,11 @@ pub mod root { concat!("Alignment of ", stringify!(Bar)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Bar>())).baz as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Bar>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).baz) as usize - ptr as usize + }, 0usize, concat!( "Offset of field: ", diff --git a/tests/expectations/tests/inner_const.rs b/tests/expectations/tests/inner_const.rs index 912ae024..d93bc8b5 100644 --- a/tests/expectations/tests/inner_const.rs +++ b/tests/expectations/tests/inner_const.rs @@ -31,7 +31,11 @@ fn bindgen_test_layout_Foo() { concat!("Alignment of ", stringify!(Foo)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Foo>())).bar as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Foo>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).bar) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(Foo), "::", stringify!(bar)) ); diff --git a/tests/expectations/tests/inner_template_self.rs b/tests/expectations/tests/inner_template_self.rs index 3361a1f9..e6062718 100644 --- a/tests/expectations/tests/inner_template_self.rs +++ b/tests/expectations/tests/inner_template_self.rs @@ -39,8 +39,9 @@ fn bindgen_test_layout_InstantiateIt() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<InstantiateIt>())).m_list as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<InstantiateIt>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).m_list) as usize - ptr as usize }, 0usize, concat!( diff --git a/tests/expectations/tests/issue-1118-using-forward-decl.rs b/tests/expectations/tests/issue-1118-using-forward-decl.rs index 99f0341c..b29a572e 100644 --- a/tests/expectations/tests/issue-1118-using-forward-decl.rs +++ b/tests/expectations/tests/issue-1118-using-forward-decl.rs @@ -25,7 +25,9 @@ fn bindgen_test_layout_nsTArray_base() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<nsTArray_base>())).d as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<nsTArray_base>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).d) as usize - ptr as usize }, 0usize, concat!( @@ -78,7 +80,9 @@ fn bindgen_test_layout_nsIContent() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<nsIContent>())).foo as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<nsIContent>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).foo) as usize - ptr as usize }, 0usize, concat!( diff --git a/tests/expectations/tests/issue-1216-variadic-member.rs b/tests/expectations/tests/issue-1216-variadic-member.rs index 5bca8096..5f0cd818 100644 --- a/tests/expectations/tests/issue-1216-variadic-member.rs +++ b/tests/expectations/tests/issue-1216-variadic-member.rs @@ -33,7 +33,11 @@ fn bindgen_test_layout_Foo() { concat!("Alignment of ", stringify!(Foo)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Foo>())).f as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Foo>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).f) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(Foo), "::", stringify!(f)) ); diff --git a/tests/expectations/tests/issue-1281.rs b/tests/expectations/tests/issue-1281.rs index fe18fb1a..62b57485 100644 --- a/tests/expectations/tests/issue-1281.rs +++ b/tests/expectations/tests/issue-1281.rs @@ -28,7 +28,11 @@ fn bindgen_test_layout_foo() { concat!("Alignment of ", stringify!(foo)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<foo>())).foo as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<foo>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).foo) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(foo), "::", stringify!(foo)) ); @@ -46,7 +50,11 @@ fn bindgen_test_layout_bar() { concat!("Alignment of ", stringify!(bar)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<bar>())).u as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<bar>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).u) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(bar), "::", stringify!(u)) ); @@ -70,7 +78,11 @@ fn bindgen_test_layout_baz() { concat!("Alignment of ", stringify!(baz)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<baz>())).f as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<baz>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).f) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(baz), "::", stringify!(f)) ); diff --git a/tests/expectations/tests/issue-1285.rs b/tests/expectations/tests/issue-1285.rs index 15b8c9e4..e15939bd 100644 --- a/tests/expectations/tests/issue-1285.rs +++ b/tests/expectations/tests/issue-1285.rs @@ -30,7 +30,9 @@ fn bindgen_test_layout_foo__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<foo__bindgen_ty_1>())).a as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<foo__bindgen_ty_1>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).a) as usize - ptr as usize }, 0usize, concat!( @@ -42,7 +44,9 @@ fn bindgen_test_layout_foo__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<foo__bindgen_ty_1>())).b as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<foo__bindgen_ty_1>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).b) as usize - ptr as usize }, 0usize, concat!( @@ -75,7 +79,11 @@ fn bindgen_test_layout_foo() { concat!("Alignment of ", stringify!(foo)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<foo>())).bar as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<foo>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).bar) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(foo), "::", stringify!(bar)) ); diff --git a/tests/expectations/tests/issue-1291.rs b/tests/expectations/tests/issue-1291.rs index 5680c348..355c64f0 100644 --- a/tests/expectations/tests/issue-1291.rs +++ b/tests/expectations/tests/issue-1291.rs @@ -38,7 +38,11 @@ fn bindgen_test_layout_RTCRay() { concat!("Alignment of ", stringify!(RTCRay)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<RTCRay>())).org as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<RTCRay>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).org) as usize - ptr as usize + }, 0usize, concat!( "Offset of field: ", @@ -49,7 +53,9 @@ fn bindgen_test_layout_RTCRay() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<RTCRay>())).align0 as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<RTCRay>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).align0) as usize - ptr as usize }, 12usize, concat!( @@ -60,7 +66,11 @@ fn bindgen_test_layout_RTCRay() { ) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<RTCRay>())).dir as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<RTCRay>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).dir) as usize - ptr as usize + }, 16usize, concat!( "Offset of field: ", @@ -71,7 +81,9 @@ fn bindgen_test_layout_RTCRay() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<RTCRay>())).align1 as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<RTCRay>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).align1) as usize - ptr as usize }, 28usize, concat!( @@ -83,7 +95,9 @@ fn bindgen_test_layout_RTCRay() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<RTCRay>())).tnear as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<RTCRay>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).tnear) as usize - ptr as usize }, 32usize, concat!( @@ -94,7 +108,11 @@ fn bindgen_test_layout_RTCRay() { ) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<RTCRay>())).tfar as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<RTCRay>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).tfar) as usize - ptr as usize + }, 36usize, concat!( "Offset of field: ", @@ -104,7 +122,11 @@ fn bindgen_test_layout_RTCRay() { ) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<RTCRay>())).time as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<RTCRay>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).time) as usize - ptr as usize + }, 40usize, concat!( "Offset of field: ", @@ -114,7 +136,11 @@ fn bindgen_test_layout_RTCRay() { ) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<RTCRay>())).mask as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<RTCRay>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mask) as usize - ptr as usize + }, 44usize, concat!( "Offset of field: ", @@ -124,7 +150,11 @@ fn bindgen_test_layout_RTCRay() { ) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<RTCRay>())).Ng as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<RTCRay>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).Ng) as usize - ptr as usize + }, 48usize, concat!( "Offset of field: ", @@ -135,7 +165,9 @@ fn bindgen_test_layout_RTCRay() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<RTCRay>())).align2 as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<RTCRay>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).align2) as usize - ptr as usize }, 60usize, concat!( @@ -146,18 +178,28 @@ fn bindgen_test_layout_RTCRay() { ) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<RTCRay>())).u as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<RTCRay>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).u) as usize - ptr as usize + }, 64usize, concat!("Offset of field: ", stringify!(RTCRay), "::", stringify!(u)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<RTCRay>())).v as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<RTCRay>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).v) as usize - ptr as usize + }, 68usize, concat!("Offset of field: ", stringify!(RTCRay), "::", stringify!(v)) ); assert_eq!( unsafe { - &(*(::std::ptr::null::<RTCRay>())).geomID as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<RTCRay>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).geomID) as usize - ptr as usize }, 72usize, concat!( @@ -169,7 +211,9 @@ fn bindgen_test_layout_RTCRay() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<RTCRay>())).primID as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<RTCRay>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).primID) as usize - ptr as usize }, 76usize, concat!( @@ -181,7 +225,9 @@ fn bindgen_test_layout_RTCRay() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<RTCRay>())).instID as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<RTCRay>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).instID) as usize - ptr as usize }, 80usize, concat!( diff --git a/tests/expectations/tests/issue-1382-rust-primitive-types.rs b/tests/expectations/tests/issue-1382-rust-primitive-types.rs index 6f5aec4b..3e3e82c9 100644 --- a/tests/expectations/tests/issue-1382-rust-primitive-types.rs +++ b/tests/expectations/tests/issue-1382-rust-primitive-types.rs @@ -44,47 +44,83 @@ fn bindgen_test_layout_Foo() { concat!("Alignment of ", stringify!(Foo)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Foo>())).i8_ as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Foo>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).i8_) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(Foo), "::", stringify!(i8_)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Foo>())).u8_ as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Foo>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).u8_) as usize - ptr as usize + }, 4usize, concat!("Offset of field: ", stringify!(Foo), "::", stringify!(u8_)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Foo>())).i16_ as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Foo>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).i16_) as usize - ptr as usize + }, 8usize, concat!("Offset of field: ", stringify!(Foo), "::", stringify!(i16_)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Foo>())).u16_ as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Foo>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).u16_) as usize - ptr as usize + }, 12usize, concat!("Offset of field: ", stringify!(Foo), "::", stringify!(u16_)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Foo>())).i32_ as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Foo>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).i32_) as usize - ptr as usize + }, 16usize, concat!("Offset of field: ", stringify!(Foo), "::", stringify!(i32_)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Foo>())).u32_ as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Foo>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).u32_) as usize - ptr as usize + }, 20usize, concat!("Offset of field: ", stringify!(Foo), "::", stringify!(u32_)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Foo>())).i64_ as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Foo>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).i64_) as usize - ptr as usize + }, 24usize, concat!("Offset of field: ", stringify!(Foo), "::", stringify!(i64_)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Foo>())).u64_ as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Foo>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).u64_) as usize - ptr as usize + }, 28usize, concat!("Offset of field: ", stringify!(Foo), "::", stringify!(u64_)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Foo>())).i128_ as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Foo>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).i128_) as usize - ptr as usize + }, 32usize, concat!( "Offset of field: ", @@ -94,7 +130,11 @@ fn bindgen_test_layout_Foo() { ) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Foo>())).u128_ as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Foo>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).u128_) as usize - ptr as usize + }, 36usize, concat!( "Offset of field: ", @@ -104,7 +144,11 @@ fn bindgen_test_layout_Foo() { ) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Foo>())).isize_ as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Foo>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).isize_) as usize - ptr as usize + }, 40usize, concat!( "Offset of field: ", @@ -114,7 +158,11 @@ fn bindgen_test_layout_Foo() { ) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Foo>())).usize_ as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Foo>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).usize_) as usize - ptr as usize + }, 44usize, concat!( "Offset of field: ", @@ -124,12 +172,20 @@ fn bindgen_test_layout_Foo() { ) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Foo>())).f32_ as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Foo>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).f32_) as usize - ptr as usize + }, 48usize, concat!("Offset of field: ", stringify!(Foo), "::", stringify!(f32_)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Foo>())).f64_ as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Foo>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).f64_) as usize - ptr as usize + }, 52usize, concat!("Offset of field: ", stringify!(Foo), "::", stringify!(f64_)) ); diff --git a/tests/expectations/tests/issue-1443.rs b/tests/expectations/tests/issue-1443.rs index f422f4c3..b15f5b45 100644 --- a/tests/expectations/tests/issue-1443.rs +++ b/tests/expectations/tests/issue-1443.rs @@ -29,12 +29,20 @@ fn bindgen_test_layout_Bar() { concat!("Alignment of ", stringify!(Bar)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Bar>())).f as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Bar>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).f) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(Bar), "::", stringify!(f)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Bar>())).m as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Bar>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).m) as usize - ptr as usize + }, 8usize, concat!("Offset of field: ", stringify!(Bar), "::", stringify!(m)) ); @@ -67,12 +75,20 @@ fn bindgen_test_layout_Baz() { concat!("Alignment of ", stringify!(Baz)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Baz>())).f as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Baz>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).f) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(Baz), "::", stringify!(f)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Baz>())).m as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Baz>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).m) as usize - ptr as usize + }, 8usize, concat!("Offset of field: ", stringify!(Baz), "::", stringify!(m)) ); @@ -105,12 +121,20 @@ fn bindgen_test_layout_Tar() { concat!("Alignment of ", stringify!(Tar)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Tar>())).f as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Tar>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).f) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(Tar), "::", stringify!(f)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Tar>())).m as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Tar>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).m) as usize - ptr as usize + }, 8usize, concat!("Offset of field: ", stringify!(Tar), "::", stringify!(m)) ); @@ -143,12 +167,20 @@ fn bindgen_test_layout_Taz() { concat!("Alignment of ", stringify!(Taz)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Taz>())).f as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Taz>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).f) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(Taz), "::", stringify!(f)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Taz>())).m as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Taz>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).m) as usize - ptr as usize + }, 8usize, concat!("Offset of field: ", stringify!(Taz), "::", stringify!(m)) ); diff --git a/tests/expectations/tests/issue-1454.rs b/tests/expectations/tests/issue-1454.rs index e88e4697..299e01ba 100644 --- a/tests/expectations/tests/issue-1454.rs +++ b/tests/expectations/tests/issue-1454.rs @@ -28,7 +28,9 @@ fn bindgen_test_layout_local_type() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<local_type>())).inner as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<local_type>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).inner) as usize - ptr as usize }, 0usize, concat!( diff --git a/tests/expectations/tests/issue-1498.rs b/tests/expectations/tests/issue-1498.rs index 4f8a8930..f526a223 100644 --- a/tests/expectations/tests/issue-1498.rs +++ b/tests/expectations/tests/issue-1498.rs @@ -45,8 +45,10 @@ fn bindgen_test_layout_rte_memseg__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_memseg__bindgen_ty_1>())).addr - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<rte_memseg__bindgen_ty_1>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).addr) as usize - ptr as usize }, 0usize, concat!( @@ -58,8 +60,10 @@ fn bindgen_test_layout_rte_memseg__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_memseg__bindgen_ty_1>())).addr_64 - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<rte_memseg__bindgen_ty_1>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).addr_64) as usize - ptr as usize }, 0usize, concat!( @@ -93,8 +97,9 @@ fn bindgen_test_layout_rte_memseg() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_memseg>())).phys_addr as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<rte_memseg>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).phys_addr) as usize - ptr as usize }, 0usize, concat!( @@ -106,7 +111,9 @@ fn bindgen_test_layout_rte_memseg() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_memseg>())).len as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<rte_memseg>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).len) as usize - ptr as usize }, 16usize, concat!( @@ -118,8 +125,9 @@ fn bindgen_test_layout_rte_memseg() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_memseg>())).hugepage_sz as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<rte_memseg>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).hugepage_sz) as usize - ptr as usize }, 24usize, concat!( @@ -131,8 +139,9 @@ fn bindgen_test_layout_rte_memseg() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_memseg>())).socket_id as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<rte_memseg>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).socket_id) as usize - ptr as usize }, 32usize, concat!( @@ -144,7 +153,9 @@ fn bindgen_test_layout_rte_memseg() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_memseg>())).nchannel as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<rte_memseg>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).nchannel) as usize - ptr as usize }, 36usize, concat!( @@ -156,7 +167,9 @@ fn bindgen_test_layout_rte_memseg() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_memseg>())).nrank as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<rte_memseg>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).nrank) as usize - ptr as usize }, 40usize, concat!( diff --git a/tests/expectations/tests/issue-1947.rs b/tests/expectations/tests/issue-1947.rs index 1753ef8d..7303b53e 100644 --- a/tests/expectations/tests/issue-1947.rs +++ b/tests/expectations/tests/issue-1947.rs @@ -119,7 +119,9 @@ fn bindgen_test_layout_V56AMDY() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<V56AMDY>())).MADK as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<V56AMDY>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).MADK) as usize - ptr as usize }, 2usize, concat!( @@ -131,7 +133,9 @@ fn bindgen_test_layout_V56AMDY() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<V56AMDY>())).MABR as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<V56AMDY>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).MABR) as usize - ptr as usize }, 3usize, concat!( @@ -143,7 +147,9 @@ fn bindgen_test_layout_V56AMDY() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<V56AMDY>()))._rB_ as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<V56AMDY>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr)._rB_) as usize - ptr as usize }, 7usize, concat!( diff --git a/tests/expectations/tests/issue-1977-larger-arrays.rs b/tests/expectations/tests/issue-1977-larger-arrays.rs index 54e5b431..d0b478e9 100644 --- a/tests/expectations/tests/issue-1977-larger-arrays.rs +++ b/tests/expectations/tests/issue-1977-larger-arrays.rs @@ -24,7 +24,9 @@ fn bindgen_test_layout_S() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<S>())).large_array as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<S>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).large_array) as usize - ptr as usize }, 0usize, concat!( diff --git a/tests/expectations/tests/issue-1995.rs b/tests/expectations/tests/issue-1995.rs index 58e11eb2..f5abbefc 100644 --- a/tests/expectations/tests/issue-1995.rs +++ b/tests/expectations/tests/issue-1995.rs @@ -30,7 +30,11 @@ fn bindgen_test_layout_Bar() { concat!("Alignment of ", stringify!(Bar)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Bar>())).baz as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Bar>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).baz) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(Bar), "::", stringify!(baz)) ); diff --git a/tests/expectations/tests/issue-2019.rs b/tests/expectations/tests/issue-2019.rs index 383bd57e..7d67f1c3 100644 --- a/tests/expectations/tests/issue-2019.rs +++ b/tests/expectations/tests/issue-2019.rs @@ -23,7 +23,11 @@ fn bindgen_test_layout_A() { concat!("Alignment of ", stringify!(A)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<A>())).a as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<A>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).a) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(A), "::", stringify!(a)) ); @@ -56,7 +60,11 @@ fn bindgen_test_layout_B() { concat!("Alignment of ", stringify!(B)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<B>())).b as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<B>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).b) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(B), "::", stringify!(b)) ); diff --git a/tests/expectations/tests/issue-372.rs b/tests/expectations/tests/issue-372.rs index 0cd9f7ad..ad9b41e6 100644 --- a/tests/expectations/tests/issue-372.rs +++ b/tests/expectations/tests/issue-372.rs @@ -29,17 +29,29 @@ pub mod root { concat!("Alignment of ", stringify!(i)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<i>())).j as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<i>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).j) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(i), "::", stringify!(j)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<i>())).k as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<i>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).k) as usize - ptr as usize + }, 8usize, concat!("Offset of field: ", stringify!(i), "::", stringify!(k)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<i>())).l as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<i>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).l) as usize - ptr as usize + }, 16usize, concat!("Offset of field: ", stringify!(i), "::", stringify!(l)) ); @@ -71,7 +83,11 @@ pub mod root { concat!("Alignment of ", stringify!(d)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<d>())).m as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<d>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).m) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(d), "::", stringify!(m)) ); @@ -118,7 +134,11 @@ pub mod root { concat!("Alignment of ", stringify!(F)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<F>())).w as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<F>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).w) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(F), "::", stringify!(w)) ); diff --git a/tests/expectations/tests/issue-537-repr-packed-n.rs b/tests/expectations/tests/issue-537-repr-packed-n.rs index 13e1482d..a17664c7 100644 --- a/tests/expectations/tests/issue-537-repr-packed-n.rs +++ b/tests/expectations/tests/issue-537-repr-packed-n.rs @@ -27,7 +27,9 @@ fn bindgen_test_layout_AlignedToOne() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<AlignedToOne>())).i as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<AlignedToOne>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).i) as usize - ptr as usize }, 0usize, concat!( @@ -58,7 +60,9 @@ fn bindgen_test_layout_AlignedToTwo() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<AlignedToTwo>())).i as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<AlignedToTwo>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).i) as usize - ptr as usize }, 0usize, concat!( @@ -92,7 +96,9 @@ fn bindgen_test_layout_PackedToOne() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<PackedToOne>())).x as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<PackedToOne>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).x) as usize - ptr as usize }, 0usize, concat!( @@ -104,7 +110,9 @@ fn bindgen_test_layout_PackedToOne() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<PackedToOne>())).y as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<PackedToOne>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).y) as usize - ptr as usize }, 4usize, concat!( @@ -136,7 +144,9 @@ fn bindgen_test_layout_PackedToTwo() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<PackedToTwo>())).x as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<PackedToTwo>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).x) as usize - ptr as usize }, 0usize, concat!( @@ -148,7 +158,9 @@ fn bindgen_test_layout_PackedToTwo() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<PackedToTwo>())).y as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<PackedToTwo>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).y) as usize - ptr as usize }, 4usize, concat!( diff --git a/tests/expectations/tests/issue-537.rs b/tests/expectations/tests/issue-537.rs index e67c0e9c..8675d227 100644 --- a/tests/expectations/tests/issue-537.rs +++ b/tests/expectations/tests/issue-537.rs @@ -26,7 +26,9 @@ fn bindgen_test_layout_AlignedToOne() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<AlignedToOne>())).i as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<AlignedToOne>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).i) as usize - ptr as usize }, 0usize, concat!( @@ -58,7 +60,9 @@ fn bindgen_test_layout_AlignedToTwo() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<AlignedToTwo>())).i as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<AlignedToTwo>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).i) as usize - ptr as usize }, 0usize, concat!( @@ -92,7 +96,9 @@ fn bindgen_test_layout_PackedToOne() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<PackedToOne>())).x as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<PackedToOne>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).x) as usize - ptr as usize }, 0usize, concat!( @@ -104,7 +110,9 @@ fn bindgen_test_layout_PackedToOne() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<PackedToOne>())).y as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<PackedToOne>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).y) as usize - ptr as usize }, 4usize, concat!( @@ -138,7 +146,9 @@ fn bindgen_test_layout_PackedToTwo() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<PackedToTwo>())).x as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<PackedToTwo>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).x) as usize - ptr as usize }, 0usize, concat!( @@ -150,7 +160,9 @@ fn bindgen_test_layout_PackedToTwo() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<PackedToTwo>())).y as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<PackedToTwo>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).y) as usize - ptr as usize }, 4usize, concat!( diff --git a/tests/expectations/tests/issue-573-layout-test-failures.rs b/tests/expectations/tests/issue-573-layout-test-failures.rs index 871849aa..bcffcc50 100644 --- a/tests/expectations/tests/issue-573-layout-test-failures.rs +++ b/tests/expectations/tests/issue-573-layout-test-failures.rs @@ -29,7 +29,9 @@ fn bindgen_test_layout_AutoIdVector() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<AutoIdVector>())).ar as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<AutoIdVector>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).ar) as usize - ptr as usize }, 0usize, concat!( diff --git a/tests/expectations/tests/issue-574-assertion-failure-in-codegen.rs b/tests/expectations/tests/issue-574-assertion-failure-in-codegen.rs index e04ff24c..45fe6056 100644 --- a/tests/expectations/tests/issue-574-assertion-failure-in-codegen.rs +++ b/tests/expectations/tests/issue-574-assertion-failure-in-codegen.rs @@ -29,7 +29,9 @@ fn bindgen_test_layout__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<_bindgen_ty_1>())).ar as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<_bindgen_ty_1>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).ar) as usize - ptr as usize }, 0usize, concat!( 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 01abdcc4..5539ec8b 100644 --- a/tests/expectations/tests/issue-584-stylo-template-analysis-panic.rs +++ b/tests/expectations/tests/issue-584-stylo-template-analysis-panic.rs @@ -62,7 +62,11 @@ fn bindgen_test_layout_g() { concat!("Alignment of ", stringify!(g)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<g>())).h as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<g>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).h) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(g), "::", stringify!(h)) ); diff --git a/tests/expectations/tests/issue-639-typedef-anon-field.rs b/tests/expectations/tests/issue-639-typedef-anon-field.rs index 4147c1d2..2c634c8e 100644 --- a/tests/expectations/tests/issue-639-typedef-anon-field.rs +++ b/tests/expectations/tests/issue-639-typedef-anon-field.rs @@ -28,7 +28,11 @@ fn bindgen_test_layout_Foo_Bar() { concat!("Alignment of ", stringify!(Foo_Bar)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Foo_Bar>())).abc as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Foo_Bar>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).abc) as usize - ptr as usize + }, 0usize, concat!( "Offset of field: ", @@ -51,7 +55,11 @@ fn bindgen_test_layout_Foo() { concat!("Alignment of ", stringify!(Foo)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Foo>())).bar as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Foo>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).bar) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(Foo), "::", stringify!(bar)) ); @@ -79,7 +87,11 @@ fn bindgen_test_layout_Baz_Bar() { concat!("Alignment of ", stringify!(Baz_Bar)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Baz_Bar>())).abc as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Baz_Bar>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).abc) as usize - ptr as usize + }, 0usize, concat!( "Offset of field: ", diff --git a/tests/expectations/tests/issue-643-inner-struct.rs b/tests/expectations/tests/issue-643-inner-struct.rs index 07285007..350ecc7b 100644 --- a/tests/expectations/tests/issue-643-inner-struct.rs +++ b/tests/expectations/tests/issue-643-inner-struct.rs @@ -62,8 +62,9 @@ fn bindgen_test_layout_rte_ring_prod() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_ring_prod>())).watermark as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<rte_ring_prod>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).watermark) as usize - ptr as usize }, 0usize, concat!( @@ -93,8 +94,9 @@ fn bindgen_test_layout_rte_ring_cons() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_ring_cons>())).sc_dequeue as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<rte_ring_cons>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).sc_dequeue) as usize - ptr as usize }, 0usize, concat!( 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 43554869..e686a0af 100644 --- a/tests/expectations/tests/issue-648-derive-debug-with-padding.rs +++ b/tests/expectations/tests/issue-648-derive-debug-with-padding.rs @@ -26,7 +26,11 @@ fn bindgen_test_layout_NoDebug() { concat!("Alignment of ", stringify!(NoDebug)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<NoDebug>())).c as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<NoDebug>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).c) as usize - ptr as usize + }, 0usize, concat!( "Offset of field: ", @@ -75,8 +79,11 @@ fn bindgen_test_layout_ShouldDeriveDebugButDoesNot() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<ShouldDeriveDebugButDoesNot>())).c - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<ShouldDeriveDebugButDoesNot>::uninit( + ); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).c) as usize - ptr as usize }, 0usize, concat!( @@ -88,8 +95,11 @@ fn bindgen_test_layout_ShouldDeriveDebugButDoesNot() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<ShouldDeriveDebugButDoesNot>())).d - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<ShouldDeriveDebugButDoesNot>::uninit( + ); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).d) as usize - ptr as usize }, 32usize, concat!( diff --git a/tests/expectations/tests/issue-674-1.rs b/tests/expectations/tests/issue-674-1.rs index 5ad66947..8420934a 100644 --- a/tests/expectations/tests/issue-674-1.rs +++ b/tests/expectations/tests/issue-674-1.rs @@ -38,8 +38,10 @@ pub mod root { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<CapturingContentInfo>())).a as *const _ - as usize + let uninit = + ::std::mem::MaybeUninit::<CapturingContentInfo>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).a) as usize - ptr as usize }, 0usize, concat!( diff --git a/tests/expectations/tests/issue-674-2.rs b/tests/expectations/tests/issue-674-2.rs index 4ccc4504..293f94b4 100644 --- a/tests/expectations/tests/issue-674-2.rs +++ b/tests/expectations/tests/issue-674-2.rs @@ -37,7 +37,11 @@ pub mod root { concat!("Alignment of ", stringify!(c)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<c>())).b as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<c>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).b) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(c), "::", stringify!(b)) ); @@ -60,7 +64,11 @@ pub mod root { concat!("Alignment of ", stringify!(B)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<B>())).a as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<B>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).a) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(B), "::", stringify!(a)) ); diff --git a/tests/expectations/tests/issue-674-3.rs b/tests/expectations/tests/issue-674-3.rs index 99c96b96..91a7b7e2 100644 --- a/tests/expectations/tests/issue-674-3.rs +++ b/tests/expectations/tests/issue-674-3.rs @@ -33,7 +33,11 @@ pub mod root { concat!("Alignment of ", stringify!(a)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<a>())).b as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<a>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).b) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(a), "::", stringify!(b)) ); @@ -57,7 +61,9 @@ pub mod root { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<nsCSSValue>())).c as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<nsCSSValue>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).c) as usize - ptr as usize }, 0usize, concat!( diff --git a/tests/expectations/tests/issue-801-opaque-sloppiness.rs b/tests/expectations/tests/issue-801-opaque-sloppiness.rs index 6fe3cc68..04f46baf 100644 --- a/tests/expectations/tests/issue-801-opaque-sloppiness.rs +++ b/tests/expectations/tests/issue-801-opaque-sloppiness.rs @@ -51,7 +51,11 @@ fn bindgen_test_layout_C() { concat!("Alignment of ", stringify!(C)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<C>())).b as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<C>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).b) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(C), "::", stringify!(b)) ); diff --git a/tests/expectations/tests/issue-807-opaque-types-methods-being-generated.rs b/tests/expectations/tests/issue-807-opaque-types-methods-being-generated.rs index 7fd9caa3..655096c8 100644 --- a/tests/expectations/tests/issue-807-opaque-types-methods-being-generated.rs +++ b/tests/expectations/tests/issue-807-opaque-types-methods-being-generated.rs @@ -121,8 +121,9 @@ fn bindgen_test_layout_Allowlisted() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<Allowlisted>())).some_member as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<Allowlisted>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).some_member) as usize - ptr as usize }, 0usize, concat!( 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 dc50fe1b..4296f57c 100644 --- a/tests/expectations/tests/issue-944-derive-copy-and-blocklisting.rs +++ b/tests/expectations/tests/issue-944-derive-copy-and-blocklisting.rs @@ -26,7 +26,9 @@ fn bindgen_test_layout_ShouldNotBeCopy() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<ShouldNotBeCopy>())).a as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<ShouldNotBeCopy>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).a) as usize - ptr as usize }, 0usize, concat!( diff --git a/tests/expectations/tests/jsval_layout_opaque.rs b/tests/expectations/tests/jsval_layout_opaque.rs index 5b842791..f8dd3673 100644 --- a/tests/expectations/tests/jsval_layout_opaque.rs +++ b/tests/expectations/tests/jsval_layout_opaque.rs @@ -295,8 +295,11 @@ fn bindgen_test_layout_jsval_layout__bindgen_ty_2__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<jsval_layout__bindgen_ty_2__bindgen_ty_1>())) - .i32_ as *const _ as usize + let uninit = ::std::mem::MaybeUninit::< + jsval_layout__bindgen_ty_2__bindgen_ty_1, + >::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).i32_) as usize - ptr as usize }, 0usize, concat!( @@ -308,8 +311,11 @@ fn bindgen_test_layout_jsval_layout__bindgen_ty_2__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<jsval_layout__bindgen_ty_2__bindgen_ty_1>())) - .u32_ as *const _ as usize + let uninit = ::std::mem::MaybeUninit::< + jsval_layout__bindgen_ty_2__bindgen_ty_1, + >::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).u32_) as usize - ptr as usize }, 0usize, concat!( @@ -321,8 +327,11 @@ fn bindgen_test_layout_jsval_layout__bindgen_ty_2__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<jsval_layout__bindgen_ty_2__bindgen_ty_1>())) - .why as *const _ as usize + let uninit = ::std::mem::MaybeUninit::< + jsval_layout__bindgen_ty_2__bindgen_ty_1, + >::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).why) as usize - ptr as usize }, 0usize, concat!( @@ -356,8 +365,10 @@ fn bindgen_test_layout_jsval_layout__bindgen_ty_2() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<jsval_layout__bindgen_ty_2>())).payload - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<jsval_layout__bindgen_ty_2>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).payload) as usize - ptr as usize }, 0usize, concat!( @@ -391,7 +402,9 @@ fn bindgen_test_layout_jsval_layout() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<jsval_layout>())).asBits as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<jsval_layout>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).asBits) as usize - ptr as usize }, 0usize, concat!( @@ -403,8 +416,9 @@ fn bindgen_test_layout_jsval_layout() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<jsval_layout>())).debugView as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<jsval_layout>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).debugView) as usize - ptr as usize }, 0usize, concat!( @@ -416,7 +430,9 @@ fn bindgen_test_layout_jsval_layout() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<jsval_layout>())).s as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<jsval_layout>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).s) as usize - ptr as usize }, 0usize, concat!( @@ -428,8 +444,9 @@ fn bindgen_test_layout_jsval_layout() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<jsval_layout>())).asDouble as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<jsval_layout>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).asDouble) as usize - ptr as usize }, 0usize, concat!( @@ -441,7 +458,9 @@ fn bindgen_test_layout_jsval_layout() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<jsval_layout>())).asPtr as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<jsval_layout>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).asPtr) as usize - ptr as usize }, 0usize, concat!( @@ -453,7 +472,9 @@ fn bindgen_test_layout_jsval_layout() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<jsval_layout>())).asWord as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<jsval_layout>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).asWord) as usize - ptr as usize }, 0usize, concat!( @@ -465,8 +486,9 @@ fn bindgen_test_layout_jsval_layout() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<jsval_layout>())).asUIntPtr as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<jsval_layout>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).asUIntPtr) as usize - ptr as usize }, 0usize, concat!( @@ -504,7 +526,11 @@ fn bindgen_test_layout_Value() { concat!("Alignment of ", stringify!(Value)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Value>())).data as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Value>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).data) as usize - ptr as usize + }, 0usize, concat!( "Offset of field: ", diff --git a/tests/expectations/tests/jsval_layout_opaque_1_0.rs b/tests/expectations/tests/jsval_layout_opaque_1_0.rs index 260282db..309d54ac 100644 --- a/tests/expectations/tests/jsval_layout_opaque_1_0.rs +++ b/tests/expectations/tests/jsval_layout_opaque_1_0.rs @@ -345,8 +345,11 @@ fn bindgen_test_layout_jsval_layout__bindgen_ty_2__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<jsval_layout__bindgen_ty_2__bindgen_ty_1>())) - .i32_ as *const _ as usize + let uninit = ::std::mem::MaybeUninit::< + jsval_layout__bindgen_ty_2__bindgen_ty_1, + >::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).i32_) as usize - ptr as usize }, 0usize, concat!( @@ -358,8 +361,11 @@ fn bindgen_test_layout_jsval_layout__bindgen_ty_2__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<jsval_layout__bindgen_ty_2__bindgen_ty_1>())) - .u32_ as *const _ as usize + let uninit = ::std::mem::MaybeUninit::< + jsval_layout__bindgen_ty_2__bindgen_ty_1, + >::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).u32_) as usize - ptr as usize }, 0usize, concat!( @@ -371,8 +377,11 @@ fn bindgen_test_layout_jsval_layout__bindgen_ty_2__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<jsval_layout__bindgen_ty_2__bindgen_ty_1>())) - .why as *const _ as usize + let uninit = ::std::mem::MaybeUninit::< + jsval_layout__bindgen_ty_2__bindgen_ty_1, + >::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).why) as usize - ptr as usize }, 0usize, concat!( @@ -402,8 +411,10 @@ fn bindgen_test_layout_jsval_layout__bindgen_ty_2() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<jsval_layout__bindgen_ty_2>())).payload - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<jsval_layout__bindgen_ty_2>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).payload) as usize - ptr as usize }, 0usize, concat!( @@ -433,7 +444,9 @@ fn bindgen_test_layout_jsval_layout() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<jsval_layout>())).asBits as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<jsval_layout>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).asBits) as usize - ptr as usize }, 0usize, concat!( @@ -445,8 +458,9 @@ fn bindgen_test_layout_jsval_layout() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<jsval_layout>())).debugView as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<jsval_layout>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).debugView) as usize - ptr as usize }, 0usize, concat!( @@ -458,7 +472,9 @@ fn bindgen_test_layout_jsval_layout() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<jsval_layout>())).s as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<jsval_layout>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).s) as usize - ptr as usize }, 0usize, concat!( @@ -470,8 +486,9 @@ fn bindgen_test_layout_jsval_layout() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<jsval_layout>())).asDouble as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<jsval_layout>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).asDouble) as usize - ptr as usize }, 0usize, concat!( @@ -483,7 +500,9 @@ fn bindgen_test_layout_jsval_layout() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<jsval_layout>())).asPtr as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<jsval_layout>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).asPtr) as usize - ptr as usize }, 0usize, concat!( @@ -495,7 +514,9 @@ fn bindgen_test_layout_jsval_layout() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<jsval_layout>())).asWord as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<jsval_layout>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).asWord) as usize - ptr as usize }, 0usize, concat!( @@ -507,8 +528,9 @@ fn bindgen_test_layout_jsval_layout() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<jsval_layout>())).asUIntPtr as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<jsval_layout>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).asUIntPtr) as usize - ptr as usize }, 0usize, concat!( @@ -542,7 +564,11 @@ fn bindgen_test_layout_Value() { concat!("Alignment of ", stringify!(Value)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Value>())).data as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Value>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).data) as usize - ptr as usize + }, 0usize, concat!( "Offset of field: ", diff --git a/tests/expectations/tests/layout_align.rs b/tests/expectations/tests/layout_align.rs index cb34df3e..7d2c5a6e 100644 --- a/tests/expectations/tests/layout_align.rs +++ b/tests/expectations/tests/layout_align.rs @@ -181,8 +181,9 @@ fn bindgen_test_layout_rte_eth_link() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_link>())).link_speed as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<rte_eth_link>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).link_speed) as usize - ptr as usize }, 0usize, concat!( diff --git a/tests/expectations/tests/layout_arp.rs b/tests/expectations/tests/layout_arp.rs index d6642d7e..390c87aa 100644 --- a/tests/expectations/tests/layout_arp.rs +++ b/tests/expectations/tests/layout_arp.rs @@ -42,8 +42,9 @@ fn bindgen_test_layout_ether_addr() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<ether_addr>())).addr_bytes as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<ether_addr>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).addr_bytes) as usize - ptr as usize }, 0usize, concat!( @@ -81,7 +82,9 @@ fn bindgen_test_layout_arp_ipv4() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<arp_ipv4>())).arp_sha as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<arp_ipv4>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).arp_sha) as usize - ptr as usize }, 0usize, concat!( @@ -93,7 +96,9 @@ fn bindgen_test_layout_arp_ipv4() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<arp_ipv4>())).arp_sip as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<arp_ipv4>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).arp_sip) as usize - ptr as usize }, 6usize, concat!( @@ -105,7 +110,9 @@ fn bindgen_test_layout_arp_ipv4() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<arp_ipv4>())).arp_tha as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<arp_ipv4>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).arp_tha) as usize - ptr as usize }, 10usize, concat!( @@ -117,7 +124,9 @@ fn bindgen_test_layout_arp_ipv4() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<arp_ipv4>())).arp_tip as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<arp_ipv4>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).arp_tip) as usize - ptr as usize }, 16usize, concat!( @@ -153,7 +162,9 @@ fn bindgen_test_layout_arp_hdr() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<arp_hdr>())).arp_hrd as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<arp_hdr>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).arp_hrd) as usize - ptr as usize }, 0usize, concat!( @@ -165,7 +176,9 @@ fn bindgen_test_layout_arp_hdr() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<arp_hdr>())).arp_pro as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<arp_hdr>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).arp_pro) as usize - ptr as usize }, 2usize, concat!( @@ -177,7 +190,9 @@ fn bindgen_test_layout_arp_hdr() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<arp_hdr>())).arp_hln as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<arp_hdr>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).arp_hln) as usize - ptr as usize }, 4usize, concat!( @@ -189,7 +204,9 @@ fn bindgen_test_layout_arp_hdr() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<arp_hdr>())).arp_pln as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<arp_hdr>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).arp_pln) as usize - ptr as usize }, 5usize, concat!( @@ -201,7 +218,9 @@ fn bindgen_test_layout_arp_hdr() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<arp_hdr>())).arp_op as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<arp_hdr>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).arp_op) as usize - ptr as usize }, 6usize, concat!( @@ -213,7 +232,9 @@ fn bindgen_test_layout_arp_hdr() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<arp_hdr>())).arp_data as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<arp_hdr>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).arp_data) as usize - ptr as usize }, 8usize, concat!( diff --git a/tests/expectations/tests/layout_array.rs b/tests/expectations/tests/layout_array.rs index 3ba1b6d0..0e25258a 100644 --- a/tests/expectations/tests/layout_array.rs +++ b/tests/expectations/tests/layout_array.rs @@ -81,8 +81,9 @@ fn bindgen_test_layout_rte_mempool_ops() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_mempool_ops>())).name as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<rte_mempool_ops>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).name) as usize - ptr as usize }, 0usize, concat!( @@ -94,8 +95,9 @@ fn bindgen_test_layout_rte_mempool_ops() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_mempool_ops>())).alloc as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<rte_mempool_ops>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).alloc) as usize - ptr as usize }, 32usize, concat!( @@ -107,8 +109,9 @@ fn bindgen_test_layout_rte_mempool_ops() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_mempool_ops>())).free as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<rte_mempool_ops>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).free) as usize - ptr as usize }, 40usize, concat!( @@ -120,8 +123,9 @@ fn bindgen_test_layout_rte_mempool_ops() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_mempool_ops>())).enqueue as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<rte_mempool_ops>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).enqueue) as usize - ptr as usize }, 48usize, concat!( @@ -133,8 +137,9 @@ fn bindgen_test_layout_rte_mempool_ops() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_mempool_ops>())).dequeue as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<rte_mempool_ops>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).dequeue) as usize - ptr as usize }, 56usize, concat!( @@ -146,8 +151,9 @@ fn bindgen_test_layout_rte_mempool_ops() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_mempool_ops>())).get_count as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<rte_mempool_ops>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).get_count) as usize - ptr as usize }, 64usize, concat!( @@ -198,8 +204,9 @@ fn bindgen_test_layout_rte_spinlock_t() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_spinlock_t>())).locked as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<rte_spinlock_t>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).locked) as usize - ptr as usize }, 0usize, concat!( @@ -243,8 +250,10 @@ fn bindgen_test_layout_rte_mempool_ops_table() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_mempool_ops_table>())).sl as *const _ - as usize + let uninit = + ::std::mem::MaybeUninit::<rte_mempool_ops_table>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).sl) as usize - ptr as usize }, 0usize, concat!( @@ -256,8 +265,10 @@ fn bindgen_test_layout_rte_mempool_ops_table() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_mempool_ops_table>())).num_ops - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<rte_mempool_ops_table>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).num_ops) as usize - ptr as usize }, 4usize, concat!( @@ -269,8 +280,10 @@ fn bindgen_test_layout_rte_mempool_ops_table() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_mempool_ops_table>())).ops as *const _ - as usize + let uninit = + ::std::mem::MaybeUninit::<rte_mempool_ops_table>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).ops) as usize - ptr as usize }, 64usize, concat!( @@ -319,8 +332,10 @@ fn bindgen_test_layout_malloc_heap__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<malloc_heap__bindgen_ty_1>())).lh_first - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<malloc_heap__bindgen_ty_1>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).lh_first) as usize - ptr as usize }, 0usize, concat!( @@ -354,7 +369,9 @@ fn bindgen_test_layout_malloc_heap() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<malloc_heap>())).lock as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<malloc_heap>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).lock) as usize - ptr as usize }, 0usize, concat!( @@ -366,8 +383,9 @@ fn bindgen_test_layout_malloc_heap() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<malloc_heap>())).free_head as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<malloc_heap>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).free_head) as usize - ptr as usize }, 8usize, concat!( @@ -379,8 +397,9 @@ fn bindgen_test_layout_malloc_heap() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<malloc_heap>())).alloc_count as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<malloc_heap>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).alloc_count) as usize - ptr as usize }, 112usize, concat!( @@ -392,8 +411,9 @@ fn bindgen_test_layout_malloc_heap() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<malloc_heap>())).total_size as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<malloc_heap>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).total_size) as usize - ptr as usize }, 120usize, concat!( diff --git a/tests/expectations/tests/layout_array_too_long.rs b/tests/expectations/tests/layout_array_too_long.rs index c9880ea2..b38523ff 100644 --- a/tests/expectations/tests/layout_array_too_long.rs +++ b/tests/expectations/tests/layout_array_too_long.rs @@ -46,7 +46,11 @@ fn bindgen_test_layout_ip_frag() { concat!("Alignment of ", stringify!(ip_frag)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<ip_frag>())).ofs as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<ip_frag>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).ofs) as usize - ptr as usize + }, 0usize, concat!( "Offset of field: ", @@ -56,7 +60,11 @@ fn bindgen_test_layout_ip_frag() { ) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<ip_frag>())).len as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<ip_frag>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).len) as usize - ptr as usize + }, 2usize, concat!( "Offset of field: ", @@ -66,7 +74,11 @@ fn bindgen_test_layout_ip_frag() { ) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<ip_frag>())).mb as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<ip_frag>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mb) as usize - ptr as usize + }, 8usize, concat!( "Offset of field: ", @@ -110,7 +122,9 @@ fn bindgen_test_layout_ip_frag_key() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<ip_frag_key>())).src_dst as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<ip_frag_key>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).src_dst) as usize - ptr as usize }, 0usize, concat!( @@ -122,7 +136,9 @@ fn bindgen_test_layout_ip_frag_key() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<ip_frag_key>())).id as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<ip_frag_key>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).id) as usize - ptr as usize }, 32usize, concat!( @@ -134,7 +150,9 @@ fn bindgen_test_layout_ip_frag_key() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<ip_frag_key>())).key_len as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<ip_frag_key>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).key_len) as usize - ptr as usize }, 36usize, concat!( @@ -186,8 +204,10 @@ fn bindgen_test_layout_ip_frag_pkt__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<ip_frag_pkt__bindgen_ty_1>())).tqe_next - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<ip_frag_pkt__bindgen_ty_1>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).tqe_next) as usize - ptr as usize }, 0usize, concat!( @@ -199,8 +219,10 @@ fn bindgen_test_layout_ip_frag_pkt__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<ip_frag_pkt__bindgen_ty_1>())).tqe_prev - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<ip_frag_pkt__bindgen_ty_1>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).tqe_prev) as usize - ptr as usize }, 8usize, concat!( @@ -234,7 +256,9 @@ fn bindgen_test_layout_ip_frag_pkt() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<ip_frag_pkt>())).lru as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<ip_frag_pkt>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).lru) as usize - ptr as usize }, 0usize, concat!( @@ -246,7 +270,9 @@ fn bindgen_test_layout_ip_frag_pkt() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<ip_frag_pkt>())).key as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<ip_frag_pkt>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).key) as usize - ptr as usize }, 16usize, concat!( @@ -258,7 +284,9 @@ fn bindgen_test_layout_ip_frag_pkt() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<ip_frag_pkt>())).start as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<ip_frag_pkt>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).start) as usize - ptr as usize }, 56usize, concat!( @@ -270,8 +298,9 @@ fn bindgen_test_layout_ip_frag_pkt() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<ip_frag_pkt>())).total_size as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<ip_frag_pkt>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).total_size) as usize - ptr as usize }, 64usize, concat!( @@ -283,8 +312,9 @@ fn bindgen_test_layout_ip_frag_pkt() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<ip_frag_pkt>())).frag_size as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<ip_frag_pkt>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).frag_size) as usize - ptr as usize }, 68usize, concat!( @@ -296,8 +326,9 @@ fn bindgen_test_layout_ip_frag_pkt() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<ip_frag_pkt>())).last_idx as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<ip_frag_pkt>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).last_idx) as usize - ptr as usize }, 72usize, concat!( @@ -309,7 +340,9 @@ fn bindgen_test_layout_ip_frag_pkt() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<ip_frag_pkt>())).frags as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<ip_frag_pkt>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).frags) as usize - ptr as usize }, 80usize, concat!( diff --git a/tests/expectations/tests/layout_cmdline_token.rs b/tests/expectations/tests/layout_cmdline_token.rs index 47170dd7..37c8928c 100644 --- a/tests/expectations/tests/layout_cmdline_token.rs +++ b/tests/expectations/tests/layout_cmdline_token.rs @@ -27,8 +27,9 @@ fn bindgen_test_layout_cmdline_token_hdr() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<cmdline_token_hdr>())).ops as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<cmdline_token_hdr>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).ops) as usize - ptr as usize }, 0usize, concat!( @@ -40,8 +41,9 @@ fn bindgen_test_layout_cmdline_token_hdr() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<cmdline_token_hdr>())).offset as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<cmdline_token_hdr>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).offset) as usize - ptr as usize }, 8usize, concat!( @@ -131,8 +133,9 @@ fn bindgen_test_layout_cmdline_token_ops() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<cmdline_token_ops>())).parse as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<cmdline_token_ops>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).parse) as usize - ptr as usize }, 0usize, concat!( @@ -144,8 +147,9 @@ fn bindgen_test_layout_cmdline_token_ops() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<cmdline_token_ops>())).complete_get_nb - as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<cmdline_token_ops>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).complete_get_nb) as usize - ptr as usize }, 8usize, concat!( @@ -157,8 +161,10 @@ fn bindgen_test_layout_cmdline_token_ops() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<cmdline_token_ops>())).complete_get_elt - as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<cmdline_token_ops>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).complete_get_elt) as usize - + ptr as usize }, 16usize, concat!( @@ -170,8 +176,9 @@ fn bindgen_test_layout_cmdline_token_ops() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<cmdline_token_ops>())).get_help as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<cmdline_token_ops>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).get_help) as usize - ptr as usize }, 24usize, concat!( @@ -213,8 +220,10 @@ fn bindgen_test_layout_cmdline_token_num_data() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<cmdline_token_num_data>())).type_ as *const _ - as usize + let uninit = + ::std::mem::MaybeUninit::<cmdline_token_num_data>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).type_) as usize - ptr as usize }, 0usize, concat!( @@ -254,8 +263,9 @@ fn bindgen_test_layout_cmdline_token_num() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<cmdline_token_num>())).hdr as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<cmdline_token_num>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).hdr) as usize - ptr as usize }, 0usize, concat!( @@ -267,8 +277,9 @@ fn bindgen_test_layout_cmdline_token_num() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<cmdline_token_num>())).num_data as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<cmdline_token_num>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).num_data) as usize - ptr as usize }, 16usize, concat!( diff --git a/tests/expectations/tests/layout_eth_conf.rs b/tests/expectations/tests/layout_eth_conf.rs index e8806082..9398357f 100644 --- a/tests/expectations/tests/layout_eth_conf.rs +++ b/tests/expectations/tests/layout_eth_conf.rs @@ -172,8 +172,9 @@ fn bindgen_test_layout_rte_eth_rxmode() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_rxmode>())).mq_mode as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<rte_eth_rxmode>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mq_mode) as usize - ptr as usize }, 0usize, concat!( @@ -185,8 +186,9 @@ fn bindgen_test_layout_rte_eth_rxmode() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_rxmode>())).max_rx_pkt_len - as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<rte_eth_rxmode>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).max_rx_pkt_len) as usize - ptr as usize }, 4usize, concat!( @@ -198,8 +200,9 @@ fn bindgen_test_layout_rte_eth_rxmode() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_rxmode>())).split_hdr_size - as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<rte_eth_rxmode>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).split_hdr_size) as usize - ptr as usize }, 8usize, concat!( @@ -437,8 +440,9 @@ fn bindgen_test_layout_rte_eth_txmode() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_txmode>())).mq_mode as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<rte_eth_txmode>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mq_mode) as usize - ptr as usize }, 0usize, concat!( @@ -450,7 +454,9 @@ fn bindgen_test_layout_rte_eth_txmode() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_txmode>())).pvid as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<rte_eth_txmode>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).pvid) as usize - ptr as usize }, 4usize, concat!( @@ -575,8 +581,9 @@ fn bindgen_test_layout_rte_eth_rss_conf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_rss_conf>())).rss_key as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<rte_eth_rss_conf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).rss_key) as usize - ptr as usize }, 0usize, concat!( @@ -588,8 +595,9 @@ fn bindgen_test_layout_rte_eth_rss_conf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_rss_conf>())).rss_key_len as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<rte_eth_rss_conf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).rss_key_len) as usize - ptr as usize }, 8usize, concat!( @@ -601,8 +609,9 @@ fn bindgen_test_layout_rte_eth_rss_conf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_rss_conf>())).rss_hf as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<rte_eth_rss_conf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).rss_hf) as usize - ptr as usize }, 16usize, concat!( @@ -695,8 +704,11 @@ fn bindgen_test_layout_rte_eth_vmdq_dcb_conf__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_vmdq_dcb_conf__bindgen_ty_1>())) - .vlan_id as *const _ as usize + let uninit = ::std::mem::MaybeUninit::< + rte_eth_vmdq_dcb_conf__bindgen_ty_1, + >::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).vlan_id) as usize - ptr as usize }, 0usize, concat!( @@ -708,8 +720,11 @@ fn bindgen_test_layout_rte_eth_vmdq_dcb_conf__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_vmdq_dcb_conf__bindgen_ty_1>())) - .pools as *const _ as usize + let uninit = ::std::mem::MaybeUninit::< + rte_eth_vmdq_dcb_conf__bindgen_ty_1, + >::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).pools) as usize - ptr as usize }, 8usize, concat!( @@ -734,8 +749,10 @@ fn bindgen_test_layout_rte_eth_vmdq_dcb_conf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_vmdq_dcb_conf>())).nb_queue_pools - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<rte_eth_vmdq_dcb_conf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).nb_queue_pools) as usize - ptr as usize }, 0usize, concat!( @@ -747,8 +764,11 @@ fn bindgen_test_layout_rte_eth_vmdq_dcb_conf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_vmdq_dcb_conf>())) - .enable_default_pool as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<rte_eth_vmdq_dcb_conf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).enable_default_pool) as usize - + ptr as usize }, 4usize, concat!( @@ -760,8 +780,10 @@ fn bindgen_test_layout_rte_eth_vmdq_dcb_conf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_vmdq_dcb_conf>())).default_pool - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<rte_eth_vmdq_dcb_conf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).default_pool) as usize - ptr as usize }, 5usize, concat!( @@ -773,8 +795,10 @@ fn bindgen_test_layout_rte_eth_vmdq_dcb_conf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_vmdq_dcb_conf>())).nb_pool_maps - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<rte_eth_vmdq_dcb_conf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).nb_pool_maps) as usize - ptr as usize }, 6usize, concat!( @@ -786,8 +810,10 @@ fn bindgen_test_layout_rte_eth_vmdq_dcb_conf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_vmdq_dcb_conf>())).pool_map - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<rte_eth_vmdq_dcb_conf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).pool_map) as usize - ptr as usize }, 8usize, concat!( @@ -799,8 +825,10 @@ fn bindgen_test_layout_rte_eth_vmdq_dcb_conf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_vmdq_dcb_conf>())).dcb_tc as *const _ - as usize + let uninit = + ::std::mem::MaybeUninit::<rte_eth_vmdq_dcb_conf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).dcb_tc) as usize - ptr as usize }, 1032usize, concat!( @@ -842,8 +870,10 @@ fn bindgen_test_layout_rte_eth_dcb_rx_conf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_dcb_rx_conf>())).nb_tcs as *const _ - as usize + let uninit = + ::std::mem::MaybeUninit::<rte_eth_dcb_rx_conf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).nb_tcs) as usize - ptr as usize }, 0usize, concat!( @@ -855,8 +885,10 @@ fn bindgen_test_layout_rte_eth_dcb_rx_conf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_dcb_rx_conf>())).dcb_tc as *const _ - as usize + let uninit = + ::std::mem::MaybeUninit::<rte_eth_dcb_rx_conf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).dcb_tc) as usize - ptr as usize }, 4usize, concat!( @@ -898,8 +930,10 @@ fn bindgen_test_layout_rte_eth_vmdq_dcb_tx_conf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_vmdq_dcb_tx_conf>())).nb_queue_pools - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<rte_eth_vmdq_dcb_tx_conf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).nb_queue_pools) as usize - ptr as usize }, 0usize, concat!( @@ -911,8 +945,10 @@ fn bindgen_test_layout_rte_eth_vmdq_dcb_tx_conf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_vmdq_dcb_tx_conf>())).dcb_tc - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<rte_eth_vmdq_dcb_tx_conf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).dcb_tc) as usize - ptr as usize }, 4usize, concat!( @@ -954,8 +990,10 @@ fn bindgen_test_layout_rte_eth_dcb_tx_conf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_dcb_tx_conf>())).nb_tcs as *const _ - as usize + let uninit = + ::std::mem::MaybeUninit::<rte_eth_dcb_tx_conf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).nb_tcs) as usize - ptr as usize }, 0usize, concat!( @@ -967,8 +1005,10 @@ fn bindgen_test_layout_rte_eth_dcb_tx_conf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_dcb_tx_conf>())).dcb_tc as *const _ - as usize + let uninit = + ::std::mem::MaybeUninit::<rte_eth_dcb_tx_conf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).dcb_tc) as usize - ptr as usize }, 4usize, concat!( @@ -1008,8 +1048,10 @@ fn bindgen_test_layout_rte_eth_vmdq_tx_conf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_vmdq_tx_conf>())).nb_queue_pools - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<rte_eth_vmdq_tx_conf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).nb_queue_pools) as usize - ptr as usize }, 0usize, concat!( @@ -1072,8 +1114,11 @@ fn bindgen_test_layout_rte_eth_vmdq_rx_conf__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_vmdq_rx_conf__bindgen_ty_1>())) - .vlan_id as *const _ as usize + let uninit = ::std::mem::MaybeUninit::< + rte_eth_vmdq_rx_conf__bindgen_ty_1, + >::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).vlan_id) as usize - ptr as usize }, 0usize, concat!( @@ -1085,8 +1130,11 @@ fn bindgen_test_layout_rte_eth_vmdq_rx_conf__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_vmdq_rx_conf__bindgen_ty_1>())).pools - as *const _ as usize + let uninit = ::std::mem::MaybeUninit::< + rte_eth_vmdq_rx_conf__bindgen_ty_1, + >::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).pools) as usize - ptr as usize }, 8usize, concat!( @@ -1111,8 +1159,10 @@ fn bindgen_test_layout_rte_eth_vmdq_rx_conf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_vmdq_rx_conf>())).nb_queue_pools - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<rte_eth_vmdq_rx_conf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).nb_queue_pools) as usize - ptr as usize }, 0usize, concat!( @@ -1124,8 +1174,11 @@ fn bindgen_test_layout_rte_eth_vmdq_rx_conf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_vmdq_rx_conf>())).enable_default_pool - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<rte_eth_vmdq_rx_conf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).enable_default_pool) as usize - + ptr as usize }, 4usize, concat!( @@ -1137,8 +1190,10 @@ fn bindgen_test_layout_rte_eth_vmdq_rx_conf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_vmdq_rx_conf>())).default_pool - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<rte_eth_vmdq_rx_conf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).default_pool) as usize - ptr as usize }, 5usize, concat!( @@ -1150,8 +1205,11 @@ fn bindgen_test_layout_rte_eth_vmdq_rx_conf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_vmdq_rx_conf>())).enable_loop_back - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<rte_eth_vmdq_rx_conf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).enable_loop_back) as usize - + ptr as usize }, 6usize, concat!( @@ -1163,8 +1221,10 @@ fn bindgen_test_layout_rte_eth_vmdq_rx_conf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_vmdq_rx_conf>())).nb_pool_maps - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<rte_eth_vmdq_rx_conf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).nb_pool_maps) as usize - ptr as usize }, 7usize, concat!( @@ -1176,8 +1236,10 @@ fn bindgen_test_layout_rte_eth_vmdq_rx_conf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_vmdq_rx_conf>())).rx_mode as *const _ - as usize + let uninit = + ::std::mem::MaybeUninit::<rte_eth_vmdq_rx_conf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).rx_mode) as usize - ptr as usize }, 8usize, concat!( @@ -1189,8 +1251,10 @@ fn bindgen_test_layout_rte_eth_vmdq_rx_conf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_vmdq_rx_conf>())).pool_map - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<rte_eth_vmdq_rx_conf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).pool_map) as usize - ptr as usize }, 16usize, concat!( @@ -1277,8 +1341,9 @@ fn bindgen_test_layout_rte_eth_ipv4_flow() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_ipv4_flow>())).src_ip as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<rte_eth_ipv4_flow>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).src_ip) as usize - ptr as usize }, 0usize, concat!( @@ -1290,8 +1355,9 @@ fn bindgen_test_layout_rte_eth_ipv4_flow() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_ipv4_flow>())).dst_ip as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<rte_eth_ipv4_flow>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).dst_ip) as usize - ptr as usize }, 4usize, concat!( @@ -1303,8 +1369,9 @@ fn bindgen_test_layout_rte_eth_ipv4_flow() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_ipv4_flow>())).tos as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<rte_eth_ipv4_flow>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).tos) as usize - ptr as usize }, 8usize, concat!( @@ -1316,8 +1383,9 @@ fn bindgen_test_layout_rte_eth_ipv4_flow() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_ipv4_flow>())).ttl as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<rte_eth_ipv4_flow>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).ttl) as usize - ptr as usize }, 9usize, concat!( @@ -1329,8 +1397,9 @@ fn bindgen_test_layout_rte_eth_ipv4_flow() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_ipv4_flow>())).proto as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<rte_eth_ipv4_flow>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).proto) as usize - ptr as usize }, 10usize, concat!( @@ -1370,8 +1439,9 @@ fn bindgen_test_layout_rte_eth_ipv6_flow() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_ipv6_flow>())).src_ip as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<rte_eth_ipv6_flow>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).src_ip) as usize - ptr as usize }, 0usize, concat!( @@ -1383,8 +1453,9 @@ fn bindgen_test_layout_rte_eth_ipv6_flow() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_ipv6_flow>())).dst_ip as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<rte_eth_ipv6_flow>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).dst_ip) as usize - ptr as usize }, 16usize, concat!( @@ -1396,8 +1467,9 @@ fn bindgen_test_layout_rte_eth_ipv6_flow() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_ipv6_flow>())).tc as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<rte_eth_ipv6_flow>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).tc) as usize - ptr as usize }, 32usize, concat!( @@ -1409,8 +1481,9 @@ fn bindgen_test_layout_rte_eth_ipv6_flow() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_ipv6_flow>())).proto as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<rte_eth_ipv6_flow>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).proto) as usize - ptr as usize }, 33usize, concat!( @@ -1422,8 +1495,9 @@ fn bindgen_test_layout_rte_eth_ipv6_flow() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_ipv6_flow>())).hop_limits as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<rte_eth_ipv6_flow>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).hop_limits) as usize - ptr as usize }, 34usize, concat!( @@ -1472,8 +1546,10 @@ fn bindgen_test_layout_rte_eth_fdir_masks() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_fdir_masks>())).vlan_tci_mask - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<rte_eth_fdir_masks>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).vlan_tci_mask) as usize - ptr as usize }, 0usize, concat!( @@ -1485,8 +1561,10 @@ fn bindgen_test_layout_rte_eth_fdir_masks() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_fdir_masks>())).ipv4_mask as *const _ - as usize + let uninit = + ::std::mem::MaybeUninit::<rte_eth_fdir_masks>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).ipv4_mask) as usize - ptr as usize }, 4usize, concat!( @@ -1498,8 +1576,10 @@ fn bindgen_test_layout_rte_eth_fdir_masks() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_fdir_masks>())).ipv6_mask as *const _ - as usize + let uninit = + ::std::mem::MaybeUninit::<rte_eth_fdir_masks>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).ipv6_mask) as usize - ptr as usize }, 16usize, concat!( @@ -1511,8 +1591,10 @@ fn bindgen_test_layout_rte_eth_fdir_masks() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_fdir_masks>())).src_port_mask - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<rte_eth_fdir_masks>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).src_port_mask) as usize - ptr as usize }, 52usize, concat!( @@ -1524,8 +1606,10 @@ fn bindgen_test_layout_rte_eth_fdir_masks() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_fdir_masks>())).dst_port_mask - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<rte_eth_fdir_masks>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).dst_port_mask) as usize - ptr as usize }, 54usize, concat!( @@ -1537,8 +1621,11 @@ fn bindgen_test_layout_rte_eth_fdir_masks() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_fdir_masks>())).mac_addr_byte_mask - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<rte_eth_fdir_masks>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mac_addr_byte_mask) as usize - + ptr as usize }, 56usize, concat!( @@ -1550,8 +1637,10 @@ fn bindgen_test_layout_rte_eth_fdir_masks() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_fdir_masks>())).tunnel_id_mask - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<rte_eth_fdir_masks>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).tunnel_id_mask) as usize - ptr as usize }, 60usize, concat!( @@ -1563,8 +1652,11 @@ fn bindgen_test_layout_rte_eth_fdir_masks() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_fdir_masks>())).tunnel_type_mask - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<rte_eth_fdir_masks>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).tunnel_type_mask) as usize - + ptr as usize }, 64usize, concat!( @@ -1609,8 +1701,10 @@ fn bindgen_test_layout_rte_eth_flex_payload_cfg() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_flex_payload_cfg>())).type_ - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<rte_eth_flex_payload_cfg>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).type_) as usize - ptr as usize }, 0usize, concat!( @@ -1622,8 +1716,10 @@ fn bindgen_test_layout_rte_eth_flex_payload_cfg() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_flex_payload_cfg>())).src_offset - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<rte_eth_flex_payload_cfg>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).src_offset) as usize - ptr as usize }, 4usize, concat!( @@ -1665,8 +1761,10 @@ fn bindgen_test_layout_rte_eth_fdir_flex_mask() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_fdir_flex_mask>())).flow_type - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<rte_eth_fdir_flex_mask>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).flow_type) as usize - ptr as usize }, 0usize, concat!( @@ -1678,8 +1776,10 @@ fn bindgen_test_layout_rte_eth_fdir_flex_mask() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_fdir_flex_mask>())).mask as *const _ - as usize + let uninit = + ::std::mem::MaybeUninit::<rte_eth_fdir_flex_mask>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mask) as usize - ptr as usize }, 2usize, concat!( @@ -1716,8 +1816,10 @@ fn bindgen_test_layout_rte_eth_fdir_flex_conf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_fdir_flex_conf>())).nb_payloads - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<rte_eth_fdir_flex_conf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).nb_payloads) as usize - ptr as usize }, 0usize, concat!( @@ -1729,8 +1831,10 @@ fn bindgen_test_layout_rte_eth_fdir_flex_conf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_fdir_flex_conf>())).nb_flexmasks - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<rte_eth_fdir_flex_conf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).nb_flexmasks) as usize - ptr as usize }, 2usize, concat!( @@ -1742,8 +1846,10 @@ fn bindgen_test_layout_rte_eth_fdir_flex_conf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_fdir_flex_conf>())).flex_set - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<rte_eth_fdir_flex_conf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).flex_set) as usize - ptr as usize }, 4usize, concat!( @@ -1755,8 +1861,10 @@ fn bindgen_test_layout_rte_eth_fdir_flex_conf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_fdir_flex_conf>())).flex_mask - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<rte_eth_fdir_flex_conf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).flex_mask) as usize - ptr as usize }, 292usize, concat!( @@ -1808,7 +1916,9 @@ fn bindgen_test_layout_rte_fdir_conf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_fdir_conf>())).mode as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<rte_fdir_conf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mode) as usize - ptr as usize }, 0usize, concat!( @@ -1820,8 +1930,9 @@ fn bindgen_test_layout_rte_fdir_conf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_fdir_conf>())).pballoc as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<rte_fdir_conf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).pballoc) as usize - ptr as usize }, 4usize, concat!( @@ -1833,8 +1944,9 @@ fn bindgen_test_layout_rte_fdir_conf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_fdir_conf>())).status as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<rte_fdir_conf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).status) as usize - ptr as usize }, 8usize, concat!( @@ -1846,8 +1958,9 @@ fn bindgen_test_layout_rte_fdir_conf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_fdir_conf>())).drop_queue as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<rte_fdir_conf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).drop_queue) as usize - ptr as usize }, 12usize, concat!( @@ -1859,7 +1972,9 @@ fn bindgen_test_layout_rte_fdir_conf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_fdir_conf>())).mask as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<rte_fdir_conf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mask) as usize - ptr as usize }, 16usize, concat!( @@ -1871,8 +1986,9 @@ fn bindgen_test_layout_rte_fdir_conf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_fdir_conf>())).flex_conf as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<rte_fdir_conf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).flex_conf) as usize - ptr as usize }, 84usize, concat!( @@ -1915,7 +2031,9 @@ fn bindgen_test_layout_rte_intr_conf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_intr_conf>())).lsc as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<rte_intr_conf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).lsc) as usize - ptr as usize }, 0usize, concat!( @@ -1927,7 +2045,9 @@ fn bindgen_test_layout_rte_intr_conf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_intr_conf>())).rxq as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<rte_intr_conf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).rxq) as usize - ptr as usize }, 2usize, concat!( @@ -1997,8 +2117,10 @@ fn bindgen_test_layout_rte_eth_conf__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_conf__bindgen_ty_1>())).rss_conf - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<rte_eth_conf__bindgen_ty_1>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).rss_conf) as usize - ptr as usize }, 0usize, concat!( @@ -2010,8 +2132,10 @@ fn bindgen_test_layout_rte_eth_conf__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_conf__bindgen_ty_1>())).vmdq_dcb_conf - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<rte_eth_conf__bindgen_ty_1>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).vmdq_dcb_conf) as usize - ptr as usize }, 24usize, concat!( @@ -2023,8 +2147,10 @@ fn bindgen_test_layout_rte_eth_conf__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_conf__bindgen_ty_1>())).dcb_rx_conf - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<rte_eth_conf__bindgen_ty_1>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).dcb_rx_conf) as usize - ptr as usize }, 1064usize, concat!( @@ -2036,8 +2162,10 @@ fn bindgen_test_layout_rte_eth_conf__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_conf__bindgen_ty_1>())).vmdq_rx_conf - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<rte_eth_conf__bindgen_ty_1>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).vmdq_rx_conf) as usize - ptr as usize }, 1080usize, concat!( @@ -2078,8 +2206,11 @@ fn bindgen_test_layout_rte_eth_conf__bindgen_ty_2() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_conf__bindgen_ty_2>())) - .vmdq_dcb_tx_conf as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<rte_eth_conf__bindgen_ty_2>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).vmdq_dcb_tx_conf) as usize - + ptr as usize }, 0usize, concat!( @@ -2091,8 +2222,10 @@ fn bindgen_test_layout_rte_eth_conf__bindgen_ty_2() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_conf__bindgen_ty_2>())).dcb_tx_conf - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<rte_eth_conf__bindgen_ty_2>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).dcb_tx_conf) as usize - ptr as usize }, 0usize, concat!( @@ -2104,8 +2237,10 @@ fn bindgen_test_layout_rte_eth_conf__bindgen_ty_2() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_conf__bindgen_ty_2>())).vmdq_tx_conf - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<rte_eth_conf__bindgen_ty_2>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).vmdq_tx_conf) as usize - ptr as usize }, 0usize, concat!( @@ -2139,8 +2274,9 @@ fn bindgen_test_layout_rte_eth_conf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_conf>())).link_speeds as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<rte_eth_conf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).link_speeds) as usize - ptr as usize }, 0usize, concat!( @@ -2152,7 +2288,9 @@ fn bindgen_test_layout_rte_eth_conf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_conf>())).rxmode as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<rte_eth_conf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).rxmode) as usize - ptr as usize }, 4usize, concat!( @@ -2164,7 +2302,9 @@ fn bindgen_test_layout_rte_eth_conf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_conf>())).txmode as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<rte_eth_conf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).txmode) as usize - ptr as usize }, 16usize, concat!( @@ -2176,8 +2316,9 @@ fn bindgen_test_layout_rte_eth_conf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_conf>())).lpbk_mode as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<rte_eth_conf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).lpbk_mode) as usize - ptr as usize }, 24usize, concat!( @@ -2189,8 +2330,9 @@ fn bindgen_test_layout_rte_eth_conf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_conf>())).rx_adv_conf as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<rte_eth_conf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).rx_adv_conf) as usize - ptr as usize }, 32usize, concat!( @@ -2202,8 +2344,9 @@ fn bindgen_test_layout_rte_eth_conf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_conf>())).tx_adv_conf as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<rte_eth_conf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).tx_adv_conf) as usize - ptr as usize }, 2152usize, concat!( @@ -2215,8 +2358,10 @@ fn bindgen_test_layout_rte_eth_conf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_conf>())).dcb_capability_en - as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<rte_eth_conf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).dcb_capability_en) as usize - + ptr as usize }, 2164usize, concat!( @@ -2228,8 +2373,9 @@ fn bindgen_test_layout_rte_eth_conf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_conf>())).fdir_conf as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<rte_eth_conf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).fdir_conf) as usize - ptr as usize }, 2168usize, concat!( @@ -2241,8 +2387,9 @@ fn bindgen_test_layout_rte_eth_conf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_conf>())).intr_conf as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<rte_eth_conf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).intr_conf) as usize - ptr as usize }, 2940usize, concat!( diff --git a/tests/expectations/tests/layout_eth_conf_1_0.rs b/tests/expectations/tests/layout_eth_conf_1_0.rs index fde1c678..d395acdf 100644 --- a/tests/expectations/tests/layout_eth_conf_1_0.rs +++ b/tests/expectations/tests/layout_eth_conf_1_0.rs @@ -215,8 +215,9 @@ fn bindgen_test_layout_rte_eth_rxmode() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_rxmode>())).mq_mode as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<rte_eth_rxmode>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mq_mode) as usize - ptr as usize }, 0usize, concat!( @@ -228,8 +229,9 @@ fn bindgen_test_layout_rte_eth_rxmode() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_rxmode>())).max_rx_pkt_len - as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<rte_eth_rxmode>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).max_rx_pkt_len) as usize - ptr as usize }, 4usize, concat!( @@ -241,8 +243,9 @@ fn bindgen_test_layout_rte_eth_rxmode() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_rxmode>())).split_hdr_size - as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<rte_eth_rxmode>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).split_hdr_size) as usize - ptr as usize }, 8usize, concat!( @@ -485,8 +488,9 @@ fn bindgen_test_layout_rte_eth_txmode() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_txmode>())).mq_mode as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<rte_eth_txmode>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mq_mode) as usize - ptr as usize }, 0usize, concat!( @@ -498,7 +502,9 @@ fn bindgen_test_layout_rte_eth_txmode() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_txmode>())).pvid as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<rte_eth_txmode>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).pvid) as usize - ptr as usize }, 4usize, concat!( @@ -628,8 +634,9 @@ fn bindgen_test_layout_rte_eth_rss_conf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_rss_conf>())).rss_key as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<rte_eth_rss_conf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).rss_key) as usize - ptr as usize }, 0usize, concat!( @@ -641,8 +648,9 @@ fn bindgen_test_layout_rte_eth_rss_conf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_rss_conf>())).rss_key_len as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<rte_eth_rss_conf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).rss_key_len) as usize - ptr as usize }, 8usize, concat!( @@ -654,8 +662,9 @@ fn bindgen_test_layout_rte_eth_rss_conf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_rss_conf>())).rss_hf as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<rte_eth_rss_conf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).rss_hf) as usize - ptr as usize }, 16usize, concat!( @@ -753,8 +762,11 @@ fn bindgen_test_layout_rte_eth_vmdq_dcb_conf__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_vmdq_dcb_conf__bindgen_ty_1>())) - .vlan_id as *const _ as usize + let uninit = ::std::mem::MaybeUninit::< + rte_eth_vmdq_dcb_conf__bindgen_ty_1, + >::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).vlan_id) as usize - ptr as usize }, 0usize, concat!( @@ -766,8 +778,11 @@ fn bindgen_test_layout_rte_eth_vmdq_dcb_conf__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_vmdq_dcb_conf__bindgen_ty_1>())) - .pools as *const _ as usize + let uninit = ::std::mem::MaybeUninit::< + rte_eth_vmdq_dcb_conf__bindgen_ty_1, + >::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).pools) as usize - ptr as usize }, 8usize, concat!( @@ -797,8 +812,10 @@ fn bindgen_test_layout_rte_eth_vmdq_dcb_conf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_vmdq_dcb_conf>())).nb_queue_pools - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<rte_eth_vmdq_dcb_conf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).nb_queue_pools) as usize - ptr as usize }, 0usize, concat!( @@ -810,8 +827,11 @@ fn bindgen_test_layout_rte_eth_vmdq_dcb_conf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_vmdq_dcb_conf>())) - .enable_default_pool as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<rte_eth_vmdq_dcb_conf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).enable_default_pool) as usize - + ptr as usize }, 4usize, concat!( @@ -823,8 +843,10 @@ fn bindgen_test_layout_rte_eth_vmdq_dcb_conf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_vmdq_dcb_conf>())).default_pool - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<rte_eth_vmdq_dcb_conf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).default_pool) as usize - ptr as usize }, 5usize, concat!( @@ -836,8 +858,10 @@ fn bindgen_test_layout_rte_eth_vmdq_dcb_conf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_vmdq_dcb_conf>())).nb_pool_maps - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<rte_eth_vmdq_dcb_conf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).nb_pool_maps) as usize - ptr as usize }, 6usize, concat!( @@ -849,8 +873,10 @@ fn bindgen_test_layout_rte_eth_vmdq_dcb_conf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_vmdq_dcb_conf>())).pool_map - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<rte_eth_vmdq_dcb_conf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).pool_map) as usize - ptr as usize }, 8usize, concat!( @@ -862,8 +888,10 @@ fn bindgen_test_layout_rte_eth_vmdq_dcb_conf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_vmdq_dcb_conf>())).dcb_tc as *const _ - as usize + let uninit = + ::std::mem::MaybeUninit::<rte_eth_vmdq_dcb_conf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).dcb_tc) as usize - ptr as usize }, 1032usize, concat!( @@ -910,8 +938,10 @@ fn bindgen_test_layout_rte_eth_dcb_rx_conf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_dcb_rx_conf>())).nb_tcs as *const _ - as usize + let uninit = + ::std::mem::MaybeUninit::<rte_eth_dcb_rx_conf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).nb_tcs) as usize - ptr as usize }, 0usize, concat!( @@ -923,8 +953,10 @@ fn bindgen_test_layout_rte_eth_dcb_rx_conf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_dcb_rx_conf>())).dcb_tc as *const _ - as usize + let uninit = + ::std::mem::MaybeUninit::<rte_eth_dcb_rx_conf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).dcb_tc) as usize - ptr as usize }, 4usize, concat!( @@ -971,8 +1003,10 @@ fn bindgen_test_layout_rte_eth_vmdq_dcb_tx_conf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_vmdq_dcb_tx_conf>())).nb_queue_pools - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<rte_eth_vmdq_dcb_tx_conf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).nb_queue_pools) as usize - ptr as usize }, 0usize, concat!( @@ -984,8 +1018,10 @@ fn bindgen_test_layout_rte_eth_vmdq_dcb_tx_conf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_vmdq_dcb_tx_conf>())).dcb_tc - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<rte_eth_vmdq_dcb_tx_conf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).dcb_tc) as usize - ptr as usize }, 4usize, concat!( @@ -1032,8 +1068,10 @@ fn bindgen_test_layout_rte_eth_dcb_tx_conf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_dcb_tx_conf>())).nb_tcs as *const _ - as usize + let uninit = + ::std::mem::MaybeUninit::<rte_eth_dcb_tx_conf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).nb_tcs) as usize - ptr as usize }, 0usize, concat!( @@ -1045,8 +1083,10 @@ fn bindgen_test_layout_rte_eth_dcb_tx_conf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_dcb_tx_conf>())).dcb_tc as *const _ - as usize + let uninit = + ::std::mem::MaybeUninit::<rte_eth_dcb_tx_conf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).dcb_tc) as usize - ptr as usize }, 4usize, concat!( @@ -1091,8 +1131,10 @@ fn bindgen_test_layout_rte_eth_vmdq_tx_conf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_vmdq_tx_conf>())).nb_queue_pools - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<rte_eth_vmdq_tx_conf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).nb_queue_pools) as usize - ptr as usize }, 0usize, concat!( @@ -1160,8 +1202,11 @@ fn bindgen_test_layout_rte_eth_vmdq_rx_conf__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_vmdq_rx_conf__bindgen_ty_1>())) - .vlan_id as *const _ as usize + let uninit = ::std::mem::MaybeUninit::< + rte_eth_vmdq_rx_conf__bindgen_ty_1, + >::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).vlan_id) as usize - ptr as usize }, 0usize, concat!( @@ -1173,8 +1218,11 @@ fn bindgen_test_layout_rte_eth_vmdq_rx_conf__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_vmdq_rx_conf__bindgen_ty_1>())).pools - as *const _ as usize + let uninit = ::std::mem::MaybeUninit::< + rte_eth_vmdq_rx_conf__bindgen_ty_1, + >::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).pools) as usize - ptr as usize }, 8usize, concat!( @@ -1204,8 +1252,10 @@ fn bindgen_test_layout_rte_eth_vmdq_rx_conf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_vmdq_rx_conf>())).nb_queue_pools - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<rte_eth_vmdq_rx_conf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).nb_queue_pools) as usize - ptr as usize }, 0usize, concat!( @@ -1217,8 +1267,11 @@ fn bindgen_test_layout_rte_eth_vmdq_rx_conf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_vmdq_rx_conf>())).enable_default_pool - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<rte_eth_vmdq_rx_conf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).enable_default_pool) as usize - + ptr as usize }, 4usize, concat!( @@ -1230,8 +1283,10 @@ fn bindgen_test_layout_rte_eth_vmdq_rx_conf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_vmdq_rx_conf>())).default_pool - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<rte_eth_vmdq_rx_conf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).default_pool) as usize - ptr as usize }, 5usize, concat!( @@ -1243,8 +1298,11 @@ fn bindgen_test_layout_rte_eth_vmdq_rx_conf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_vmdq_rx_conf>())).enable_loop_back - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<rte_eth_vmdq_rx_conf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).enable_loop_back) as usize - + ptr as usize }, 6usize, concat!( @@ -1256,8 +1314,10 @@ fn bindgen_test_layout_rte_eth_vmdq_rx_conf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_vmdq_rx_conf>())).nb_pool_maps - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<rte_eth_vmdq_rx_conf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).nb_pool_maps) as usize - ptr as usize }, 7usize, concat!( @@ -1269,8 +1329,10 @@ fn bindgen_test_layout_rte_eth_vmdq_rx_conf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_vmdq_rx_conf>())).rx_mode as *const _ - as usize + let uninit = + ::std::mem::MaybeUninit::<rte_eth_vmdq_rx_conf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).rx_mode) as usize - ptr as usize }, 8usize, concat!( @@ -1282,8 +1344,10 @@ fn bindgen_test_layout_rte_eth_vmdq_rx_conf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_vmdq_rx_conf>())).pool_map - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<rte_eth_vmdq_rx_conf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).pool_map) as usize - ptr as usize }, 16usize, concat!( @@ -1375,8 +1439,9 @@ fn bindgen_test_layout_rte_eth_ipv4_flow() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_ipv4_flow>())).src_ip as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<rte_eth_ipv4_flow>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).src_ip) as usize - ptr as usize }, 0usize, concat!( @@ -1388,8 +1453,9 @@ fn bindgen_test_layout_rte_eth_ipv4_flow() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_ipv4_flow>())).dst_ip as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<rte_eth_ipv4_flow>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).dst_ip) as usize - ptr as usize }, 4usize, concat!( @@ -1401,8 +1467,9 @@ fn bindgen_test_layout_rte_eth_ipv4_flow() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_ipv4_flow>())).tos as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<rte_eth_ipv4_flow>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).tos) as usize - ptr as usize }, 8usize, concat!( @@ -1414,8 +1481,9 @@ fn bindgen_test_layout_rte_eth_ipv4_flow() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_ipv4_flow>())).ttl as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<rte_eth_ipv4_flow>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).ttl) as usize - ptr as usize }, 9usize, concat!( @@ -1427,8 +1495,9 @@ fn bindgen_test_layout_rte_eth_ipv4_flow() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_ipv4_flow>())).proto as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<rte_eth_ipv4_flow>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).proto) as usize - ptr as usize }, 10usize, concat!( @@ -1473,8 +1542,9 @@ fn bindgen_test_layout_rte_eth_ipv6_flow() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_ipv6_flow>())).src_ip as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<rte_eth_ipv6_flow>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).src_ip) as usize - ptr as usize }, 0usize, concat!( @@ -1486,8 +1556,9 @@ fn bindgen_test_layout_rte_eth_ipv6_flow() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_ipv6_flow>())).dst_ip as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<rte_eth_ipv6_flow>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).dst_ip) as usize - ptr as usize }, 16usize, concat!( @@ -1499,8 +1570,9 @@ fn bindgen_test_layout_rte_eth_ipv6_flow() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_ipv6_flow>())).tc as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<rte_eth_ipv6_flow>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).tc) as usize - ptr as usize }, 32usize, concat!( @@ -1512,8 +1584,9 @@ fn bindgen_test_layout_rte_eth_ipv6_flow() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_ipv6_flow>())).proto as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<rte_eth_ipv6_flow>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).proto) as usize - ptr as usize }, 33usize, concat!( @@ -1525,8 +1598,9 @@ fn bindgen_test_layout_rte_eth_ipv6_flow() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_ipv6_flow>())).hop_limits as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<rte_eth_ipv6_flow>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).hop_limits) as usize - ptr as usize }, 34usize, concat!( @@ -1580,8 +1654,10 @@ fn bindgen_test_layout_rte_eth_fdir_masks() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_fdir_masks>())).vlan_tci_mask - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<rte_eth_fdir_masks>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).vlan_tci_mask) as usize - ptr as usize }, 0usize, concat!( @@ -1593,8 +1669,10 @@ fn bindgen_test_layout_rte_eth_fdir_masks() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_fdir_masks>())).ipv4_mask as *const _ - as usize + let uninit = + ::std::mem::MaybeUninit::<rte_eth_fdir_masks>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).ipv4_mask) as usize - ptr as usize }, 4usize, concat!( @@ -1606,8 +1684,10 @@ fn bindgen_test_layout_rte_eth_fdir_masks() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_fdir_masks>())).ipv6_mask as *const _ - as usize + let uninit = + ::std::mem::MaybeUninit::<rte_eth_fdir_masks>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).ipv6_mask) as usize - ptr as usize }, 16usize, concat!( @@ -1619,8 +1699,10 @@ fn bindgen_test_layout_rte_eth_fdir_masks() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_fdir_masks>())).src_port_mask - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<rte_eth_fdir_masks>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).src_port_mask) as usize - ptr as usize }, 52usize, concat!( @@ -1632,8 +1714,10 @@ fn bindgen_test_layout_rte_eth_fdir_masks() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_fdir_masks>())).dst_port_mask - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<rte_eth_fdir_masks>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).dst_port_mask) as usize - ptr as usize }, 54usize, concat!( @@ -1645,8 +1729,11 @@ fn bindgen_test_layout_rte_eth_fdir_masks() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_fdir_masks>())).mac_addr_byte_mask - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<rte_eth_fdir_masks>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mac_addr_byte_mask) as usize - + ptr as usize }, 56usize, concat!( @@ -1658,8 +1745,10 @@ fn bindgen_test_layout_rte_eth_fdir_masks() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_fdir_masks>())).tunnel_id_mask - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<rte_eth_fdir_masks>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).tunnel_id_mask) as usize - ptr as usize }, 60usize, concat!( @@ -1671,8 +1760,11 @@ fn bindgen_test_layout_rte_eth_fdir_masks() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_fdir_masks>())).tunnel_type_mask - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<rte_eth_fdir_masks>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).tunnel_type_mask) as usize - + ptr as usize }, 64usize, concat!( @@ -1722,8 +1814,10 @@ fn bindgen_test_layout_rte_eth_flex_payload_cfg() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_flex_payload_cfg>())).type_ - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<rte_eth_flex_payload_cfg>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).type_) as usize - ptr as usize }, 0usize, concat!( @@ -1735,8 +1829,10 @@ fn bindgen_test_layout_rte_eth_flex_payload_cfg() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_flex_payload_cfg>())).src_offset - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<rte_eth_flex_payload_cfg>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).src_offset) as usize - ptr as usize }, 4usize, concat!( @@ -1783,8 +1879,10 @@ fn bindgen_test_layout_rte_eth_fdir_flex_mask() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_fdir_flex_mask>())).flow_type - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<rte_eth_fdir_flex_mask>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).flow_type) as usize - ptr as usize }, 0usize, concat!( @@ -1796,8 +1894,10 @@ fn bindgen_test_layout_rte_eth_fdir_flex_mask() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_fdir_flex_mask>())).mask as *const _ - as usize + let uninit = + ::std::mem::MaybeUninit::<rte_eth_fdir_flex_mask>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mask) as usize - ptr as usize }, 2usize, concat!( @@ -1839,8 +1939,10 @@ fn bindgen_test_layout_rte_eth_fdir_flex_conf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_fdir_flex_conf>())).nb_payloads - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<rte_eth_fdir_flex_conf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).nb_payloads) as usize - ptr as usize }, 0usize, concat!( @@ -1852,8 +1954,10 @@ fn bindgen_test_layout_rte_eth_fdir_flex_conf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_fdir_flex_conf>())).nb_flexmasks - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<rte_eth_fdir_flex_conf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).nb_flexmasks) as usize - ptr as usize }, 2usize, concat!( @@ -1865,8 +1969,10 @@ fn bindgen_test_layout_rte_eth_fdir_flex_conf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_fdir_flex_conf>())).flex_set - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<rte_eth_fdir_flex_conf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).flex_set) as usize - ptr as usize }, 4usize, concat!( @@ -1878,8 +1984,10 @@ fn bindgen_test_layout_rte_eth_fdir_flex_conf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_fdir_flex_conf>())).flex_mask - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<rte_eth_fdir_flex_conf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).flex_mask) as usize - ptr as usize }, 292usize, concat!( @@ -1936,7 +2044,9 @@ fn bindgen_test_layout_rte_fdir_conf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_fdir_conf>())).mode as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<rte_fdir_conf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mode) as usize - ptr as usize }, 0usize, concat!( @@ -1948,8 +2058,9 @@ fn bindgen_test_layout_rte_fdir_conf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_fdir_conf>())).pballoc as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<rte_fdir_conf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).pballoc) as usize - ptr as usize }, 4usize, concat!( @@ -1961,8 +2072,9 @@ fn bindgen_test_layout_rte_fdir_conf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_fdir_conf>())).status as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<rte_fdir_conf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).status) as usize - ptr as usize }, 8usize, concat!( @@ -1974,8 +2086,9 @@ fn bindgen_test_layout_rte_fdir_conf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_fdir_conf>())).drop_queue as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<rte_fdir_conf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).drop_queue) as usize - ptr as usize }, 12usize, concat!( @@ -1987,7 +2100,9 @@ fn bindgen_test_layout_rte_fdir_conf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_fdir_conf>())).mask as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<rte_fdir_conf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mask) as usize - ptr as usize }, 16usize, concat!( @@ -1999,8 +2114,9 @@ fn bindgen_test_layout_rte_fdir_conf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_fdir_conf>())).flex_conf as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<rte_fdir_conf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).flex_conf) as usize - ptr as usize }, 84usize, concat!( @@ -2048,7 +2164,9 @@ fn bindgen_test_layout_rte_intr_conf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_intr_conf>())).lsc as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<rte_intr_conf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).lsc) as usize - ptr as usize }, 0usize, concat!( @@ -2060,7 +2178,9 @@ fn bindgen_test_layout_rte_intr_conf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_intr_conf>())).rxq as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<rte_intr_conf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).rxq) as usize - ptr as usize }, 2usize, concat!( @@ -2135,8 +2255,10 @@ fn bindgen_test_layout_rte_eth_conf__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_conf__bindgen_ty_1>())).rss_conf - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<rte_eth_conf__bindgen_ty_1>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).rss_conf) as usize - ptr as usize }, 0usize, concat!( @@ -2148,8 +2270,10 @@ fn bindgen_test_layout_rte_eth_conf__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_conf__bindgen_ty_1>())).vmdq_dcb_conf - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<rte_eth_conf__bindgen_ty_1>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).vmdq_dcb_conf) as usize - ptr as usize }, 24usize, concat!( @@ -2161,8 +2285,10 @@ fn bindgen_test_layout_rte_eth_conf__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_conf__bindgen_ty_1>())).dcb_rx_conf - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<rte_eth_conf__bindgen_ty_1>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).dcb_rx_conf) as usize - ptr as usize }, 1064usize, concat!( @@ -2174,8 +2300,10 @@ fn bindgen_test_layout_rte_eth_conf__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_conf__bindgen_ty_1>())).vmdq_rx_conf - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<rte_eth_conf__bindgen_ty_1>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).vmdq_rx_conf) as usize - ptr as usize }, 1080usize, concat!( @@ -2222,8 +2350,11 @@ fn bindgen_test_layout_rte_eth_conf__bindgen_ty_2() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_conf__bindgen_ty_2>())) - .vmdq_dcb_tx_conf as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<rte_eth_conf__bindgen_ty_2>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).vmdq_dcb_tx_conf) as usize - + ptr as usize }, 0usize, concat!( @@ -2235,8 +2366,10 @@ fn bindgen_test_layout_rte_eth_conf__bindgen_ty_2() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_conf__bindgen_ty_2>())).dcb_tx_conf - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<rte_eth_conf__bindgen_ty_2>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).dcb_tx_conf) as usize - ptr as usize }, 0usize, concat!( @@ -2248,8 +2381,10 @@ fn bindgen_test_layout_rte_eth_conf__bindgen_ty_2() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_conf__bindgen_ty_2>())).vmdq_tx_conf - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<rte_eth_conf__bindgen_ty_2>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).vmdq_tx_conf) as usize - ptr as usize }, 0usize, concat!( @@ -2279,8 +2414,9 @@ fn bindgen_test_layout_rte_eth_conf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_conf>())).link_speeds as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<rte_eth_conf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).link_speeds) as usize - ptr as usize }, 0usize, concat!( @@ -2292,7 +2428,9 @@ fn bindgen_test_layout_rte_eth_conf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_conf>())).rxmode as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<rte_eth_conf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).rxmode) as usize - ptr as usize }, 4usize, concat!( @@ -2304,7 +2442,9 @@ fn bindgen_test_layout_rte_eth_conf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_conf>())).txmode as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<rte_eth_conf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).txmode) as usize - ptr as usize }, 16usize, concat!( @@ -2316,8 +2456,9 @@ fn bindgen_test_layout_rte_eth_conf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_conf>())).lpbk_mode as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<rte_eth_conf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).lpbk_mode) as usize - ptr as usize }, 24usize, concat!( @@ -2329,8 +2470,9 @@ fn bindgen_test_layout_rte_eth_conf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_conf>())).rx_adv_conf as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<rte_eth_conf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).rx_adv_conf) as usize - ptr as usize }, 32usize, concat!( @@ -2342,8 +2484,9 @@ fn bindgen_test_layout_rte_eth_conf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_conf>())).tx_adv_conf as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<rte_eth_conf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).tx_adv_conf) as usize - ptr as usize }, 2152usize, concat!( @@ -2355,8 +2498,10 @@ fn bindgen_test_layout_rte_eth_conf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_conf>())).dcb_capability_en - as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<rte_eth_conf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).dcb_capability_en) as usize - + ptr as usize }, 2164usize, concat!( @@ -2368,8 +2513,9 @@ fn bindgen_test_layout_rte_eth_conf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_conf>())).fdir_conf as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<rte_eth_conf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).fdir_conf) as usize - ptr as usize }, 2168usize, concat!( @@ -2381,8 +2527,9 @@ fn bindgen_test_layout_rte_eth_conf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_conf>())).intr_conf as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<rte_eth_conf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).intr_conf) as usize - ptr as usize }, 2940usize, concat!( diff --git a/tests/expectations/tests/layout_kni_mbuf.rs b/tests/expectations/tests/layout_kni_mbuf.rs index e73344c7..f277d86d 100644 --- a/tests/expectations/tests/layout_kni_mbuf.rs +++ b/tests/expectations/tests/layout_kni_mbuf.rs @@ -46,8 +46,9 @@ fn bindgen_test_layout_rte_kni_mbuf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_kni_mbuf>())).buf_addr as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<rte_kni_mbuf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).buf_addr) as usize - ptr as usize }, 0usize, concat!( @@ -59,8 +60,9 @@ fn bindgen_test_layout_rte_kni_mbuf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_kni_mbuf>())).buf_physaddr as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<rte_kni_mbuf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).buf_physaddr) as usize - ptr as usize }, 8usize, concat!( @@ -72,7 +74,9 @@ fn bindgen_test_layout_rte_kni_mbuf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_kni_mbuf>())).pad0 as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<rte_kni_mbuf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).pad0) as usize - ptr as usize }, 16usize, concat!( @@ -84,8 +88,9 @@ fn bindgen_test_layout_rte_kni_mbuf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_kni_mbuf>())).data_off as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<rte_kni_mbuf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).data_off) as usize - ptr as usize }, 18usize, concat!( @@ -97,7 +102,9 @@ fn bindgen_test_layout_rte_kni_mbuf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_kni_mbuf>())).pad1 as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<rte_kni_mbuf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).pad1) as usize - ptr as usize }, 20usize, concat!( @@ -109,8 +116,9 @@ fn bindgen_test_layout_rte_kni_mbuf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_kni_mbuf>())).nb_segs as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<rte_kni_mbuf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).nb_segs) as usize - ptr as usize }, 22usize, concat!( @@ -122,7 +130,9 @@ fn bindgen_test_layout_rte_kni_mbuf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_kni_mbuf>())).pad4 as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<rte_kni_mbuf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).pad4) as usize - ptr as usize }, 23usize, concat!( @@ -134,8 +144,9 @@ fn bindgen_test_layout_rte_kni_mbuf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_kni_mbuf>())).ol_flags as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<rte_kni_mbuf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).ol_flags) as usize - ptr as usize }, 24usize, concat!( @@ -147,7 +158,9 @@ fn bindgen_test_layout_rte_kni_mbuf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_kni_mbuf>())).pad2 as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<rte_kni_mbuf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).pad2) as usize - ptr as usize }, 32usize, concat!( @@ -159,8 +172,9 @@ fn bindgen_test_layout_rte_kni_mbuf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_kni_mbuf>())).pkt_len as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<rte_kni_mbuf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).pkt_len) as usize - ptr as usize }, 36usize, concat!( @@ -172,8 +186,9 @@ fn bindgen_test_layout_rte_kni_mbuf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_kni_mbuf>())).data_len as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<rte_kni_mbuf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).data_len) as usize - ptr as usize }, 40usize, concat!( @@ -185,7 +200,9 @@ fn bindgen_test_layout_rte_kni_mbuf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_kni_mbuf>())).pad3 as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<rte_kni_mbuf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).pad3) as usize - ptr as usize }, 64usize, concat!( @@ -197,7 +214,9 @@ fn bindgen_test_layout_rte_kni_mbuf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_kni_mbuf>())).pool as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<rte_kni_mbuf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).pool) as usize - ptr as usize }, 72usize, concat!( @@ -209,7 +228,9 @@ fn bindgen_test_layout_rte_kni_mbuf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_kni_mbuf>())).next as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<rte_kni_mbuf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).next) as usize - ptr as usize }, 80usize, concat!( diff --git a/tests/expectations/tests/layout_large_align_field.rs b/tests/expectations/tests/layout_large_align_field.rs index 4208e725..44614089 100644 --- a/tests/expectations/tests/layout_large_align_field.rs +++ b/tests/expectations/tests/layout_large_align_field.rs @@ -76,7 +76,11 @@ fn bindgen_test_layout_ip_frag() { concat!("Alignment of ", stringify!(ip_frag)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<ip_frag>())).ofs as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<ip_frag>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).ofs) as usize - ptr as usize + }, 0usize, concat!( "Offset of field: ", @@ -86,7 +90,11 @@ fn bindgen_test_layout_ip_frag() { ) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<ip_frag>())).len as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<ip_frag>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).len) as usize - ptr as usize + }, 2usize, concat!( "Offset of field: ", @@ -96,7 +104,11 @@ fn bindgen_test_layout_ip_frag() { ) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<ip_frag>())).mb as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<ip_frag>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mb) as usize - ptr as usize + }, 8usize, concat!( "Offset of field: ", @@ -140,7 +152,9 @@ fn bindgen_test_layout_ip_frag_key() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<ip_frag_key>())).src_dst as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<ip_frag_key>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).src_dst) as usize - ptr as usize }, 0usize, concat!( @@ -152,7 +166,9 @@ fn bindgen_test_layout_ip_frag_key() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<ip_frag_key>())).id as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<ip_frag_key>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).id) as usize - ptr as usize }, 32usize, concat!( @@ -164,7 +180,9 @@ fn bindgen_test_layout_ip_frag_key() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<ip_frag_key>())).key_len as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<ip_frag_key>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).key_len) as usize - ptr as usize }, 36usize, concat!( @@ -216,8 +234,10 @@ fn bindgen_test_layout_ip_frag_pkt__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<ip_frag_pkt__bindgen_ty_1>())).tqe_next - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<ip_frag_pkt__bindgen_ty_1>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).tqe_next) as usize - ptr as usize }, 0usize, concat!( @@ -229,8 +249,10 @@ fn bindgen_test_layout_ip_frag_pkt__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<ip_frag_pkt__bindgen_ty_1>())).tqe_prev - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<ip_frag_pkt__bindgen_ty_1>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).tqe_prev) as usize - ptr as usize }, 8usize, concat!( @@ -264,7 +286,9 @@ fn bindgen_test_layout_ip_frag_pkt() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<ip_frag_pkt>())).lru as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<ip_frag_pkt>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).lru) as usize - ptr as usize }, 0usize, concat!( @@ -276,7 +300,9 @@ fn bindgen_test_layout_ip_frag_pkt() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<ip_frag_pkt>())).key as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<ip_frag_pkt>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).key) as usize - ptr as usize }, 16usize, concat!( @@ -288,7 +314,9 @@ fn bindgen_test_layout_ip_frag_pkt() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<ip_frag_pkt>())).start as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<ip_frag_pkt>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).start) as usize - ptr as usize }, 56usize, concat!( @@ -300,8 +328,9 @@ fn bindgen_test_layout_ip_frag_pkt() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<ip_frag_pkt>())).total_size as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<ip_frag_pkt>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).total_size) as usize - ptr as usize }, 64usize, concat!( @@ -313,8 +342,9 @@ fn bindgen_test_layout_ip_frag_pkt() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<ip_frag_pkt>())).frag_size as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<ip_frag_pkt>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).frag_size) as usize - ptr as usize }, 68usize, concat!( @@ -326,8 +356,9 @@ fn bindgen_test_layout_ip_frag_pkt() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<ip_frag_pkt>())).last_idx as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<ip_frag_pkt>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).last_idx) as usize - ptr as usize }, 72usize, concat!( @@ -339,7 +370,9 @@ fn bindgen_test_layout_ip_frag_pkt() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<ip_frag_pkt>())).frags as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<ip_frag_pkt>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).frags) as usize - ptr as usize }, 80usize, concat!( @@ -379,8 +412,9 @@ fn bindgen_test_layout_ip_pkt_list() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<ip_pkt_list>())).tqh_first as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<ip_pkt_list>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).tqh_first) as usize - ptr as usize }, 0usize, concat!( @@ -392,8 +426,9 @@ fn bindgen_test_layout_ip_pkt_list() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<ip_pkt_list>())).tqh_last as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<ip_pkt_list>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).tqh_last) as usize - ptr as usize }, 8usize, concat!( @@ -445,8 +480,9 @@ fn bindgen_test_layout_ip_frag_tbl_stat() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<ip_frag_tbl_stat>())).find_num as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<ip_frag_tbl_stat>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).find_num) as usize - ptr as usize }, 0usize, concat!( @@ -458,8 +494,9 @@ fn bindgen_test_layout_ip_frag_tbl_stat() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<ip_frag_tbl_stat>())).add_num as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<ip_frag_tbl_stat>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).add_num) as usize - ptr as usize }, 8usize, concat!( @@ -471,8 +508,9 @@ fn bindgen_test_layout_ip_frag_tbl_stat() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<ip_frag_tbl_stat>())).del_num as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<ip_frag_tbl_stat>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).del_num) as usize - ptr as usize }, 16usize, concat!( @@ -484,8 +522,9 @@ fn bindgen_test_layout_ip_frag_tbl_stat() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<ip_frag_tbl_stat>())).reuse_num as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<ip_frag_tbl_stat>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).reuse_num) as usize - ptr as usize }, 24usize, concat!( @@ -497,8 +536,9 @@ fn bindgen_test_layout_ip_frag_tbl_stat() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<ip_frag_tbl_stat>())).fail_total as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<ip_frag_tbl_stat>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).fail_total) as usize - ptr as usize }, 32usize, concat!( @@ -510,8 +550,9 @@ fn bindgen_test_layout_ip_frag_tbl_stat() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<ip_frag_tbl_stat>())).fail_nospace - as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<ip_frag_tbl_stat>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).fail_nospace) as usize - ptr as usize }, 40usize, concat!( @@ -573,8 +614,9 @@ fn bindgen_test_layout_rte_ip_frag_tbl() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_ip_frag_tbl>())).max_cycles as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<rte_ip_frag_tbl>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).max_cycles) as usize - ptr as usize }, 0usize, concat!( @@ -586,8 +628,9 @@ fn bindgen_test_layout_rte_ip_frag_tbl() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_ip_frag_tbl>())).entry_mask as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<rte_ip_frag_tbl>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).entry_mask) as usize - ptr as usize }, 8usize, concat!( @@ -599,8 +642,9 @@ fn bindgen_test_layout_rte_ip_frag_tbl() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_ip_frag_tbl>())).max_entries as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<rte_ip_frag_tbl>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).max_entries) as usize - ptr as usize }, 12usize, concat!( @@ -612,8 +656,9 @@ fn bindgen_test_layout_rte_ip_frag_tbl() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_ip_frag_tbl>())).use_entries as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<rte_ip_frag_tbl>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).use_entries) as usize - ptr as usize }, 16usize, concat!( @@ -625,8 +670,9 @@ fn bindgen_test_layout_rte_ip_frag_tbl() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_ip_frag_tbl>())).bucket_entries - as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<rte_ip_frag_tbl>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).bucket_entries) as usize - ptr as usize }, 20usize, concat!( @@ -638,8 +684,9 @@ fn bindgen_test_layout_rte_ip_frag_tbl() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_ip_frag_tbl>())).nb_entries as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<rte_ip_frag_tbl>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).nb_entries) as usize - ptr as usize }, 24usize, concat!( @@ -651,8 +698,9 @@ fn bindgen_test_layout_rte_ip_frag_tbl() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_ip_frag_tbl>())).nb_buckets as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<rte_ip_frag_tbl>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).nb_buckets) as usize - ptr as usize }, 28usize, concat!( @@ -664,8 +712,9 @@ fn bindgen_test_layout_rte_ip_frag_tbl() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_ip_frag_tbl>())).last as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<rte_ip_frag_tbl>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).last) as usize - ptr as usize }, 32usize, concat!( @@ -677,7 +726,9 @@ fn bindgen_test_layout_rte_ip_frag_tbl() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_ip_frag_tbl>())).lru as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<rte_ip_frag_tbl>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).lru) as usize - ptr as usize }, 40usize, concat!( @@ -689,8 +740,9 @@ fn bindgen_test_layout_rte_ip_frag_tbl() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_ip_frag_tbl>())).stat as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<rte_ip_frag_tbl>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).stat) as usize - ptr as usize }, 64usize, concat!( @@ -702,7 +754,9 @@ fn bindgen_test_layout_rte_ip_frag_tbl() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_ip_frag_tbl>())).pkt as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<rte_ip_frag_tbl>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).pkt) as usize - ptr as usize }, 128usize, concat!( diff --git a/tests/expectations/tests/layout_mbuf.rs b/tests/expectations/tests/layout_mbuf.rs index aefce3d6..cf7a0e26 100644 --- a/tests/expectations/tests/layout_mbuf.rs +++ b/tests/expectations/tests/layout_mbuf.rs @@ -118,7 +118,9 @@ fn bindgen_test_layout_rte_atomic16_t() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_atomic16_t>())).cnt as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<rte_atomic16_t>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).cnt) as usize - ptr as usize }, 0usize, concat!( @@ -204,8 +206,10 @@ fn bindgen_test_layout_rte_mbuf__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_mbuf__bindgen_ty_1>())).refcnt_atomic - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<rte_mbuf__bindgen_ty_1>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).refcnt_atomic) as usize - ptr as usize }, 0usize, concat!( @@ -217,8 +221,10 @@ fn bindgen_test_layout_rte_mbuf__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_mbuf__bindgen_ty_1>())).refcnt - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<rte_mbuf__bindgen_ty_1>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).refcnt) as usize - ptr as usize }, 0usize, concat!( @@ -423,8 +429,10 @@ fn bindgen_test_layout_rte_mbuf__bindgen_ty_2() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_mbuf__bindgen_ty_2>())).packet_type - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<rte_mbuf__bindgen_ty_2>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).packet_type) as usize - ptr as usize }, 0usize, concat!( @@ -480,8 +488,8 @@ fn bindgen_test_layout_rte_mbuf__bindgen_ty_3__bindgen_ty_1__bindgen_ty_1__bindg ) { assert_eq ! (:: std :: mem :: size_of :: < rte_mbuf__bindgen_ty_3__bindgen_ty_1__bindgen_ty_1__bindgen_ty_1 > () , 4usize , concat ! ("Size of: " , stringify ! (rte_mbuf__bindgen_ty_3__bindgen_ty_1__bindgen_ty_1__bindgen_ty_1))); assert_eq ! (:: std :: mem :: align_of :: < rte_mbuf__bindgen_ty_3__bindgen_ty_1__bindgen_ty_1__bindgen_ty_1 > () , 2usize , concat ! ("Alignment of " , stringify ! (rte_mbuf__bindgen_ty_3__bindgen_ty_1__bindgen_ty_1__bindgen_ty_1))); - assert_eq ! (unsafe { & (* (:: std :: ptr :: null :: < rte_mbuf__bindgen_ty_3__bindgen_ty_1__bindgen_ty_1__bindgen_ty_1 > ())) . hash as * const _ as usize } , 0usize , concat ! ("Offset of field: " , stringify ! (rte_mbuf__bindgen_ty_3__bindgen_ty_1__bindgen_ty_1__bindgen_ty_1) , "::" , stringify ! (hash))); - assert_eq ! (unsafe { & (* (:: std :: ptr :: null :: < rte_mbuf__bindgen_ty_3__bindgen_ty_1__bindgen_ty_1__bindgen_ty_1 > ())) . id as * const _ as usize } , 2usize , concat ! ("Offset of field: " , stringify ! (rte_mbuf__bindgen_ty_3__bindgen_ty_1__bindgen_ty_1__bindgen_ty_1) , "::" , stringify ! (id))); + assert_eq ! (unsafe { let uninit = :: std :: mem :: MaybeUninit :: < rte_mbuf__bindgen_ty_3__bindgen_ty_1__bindgen_ty_1__bindgen_ty_1 > :: uninit () ; let ptr = uninit . as_ptr () ; :: std :: ptr :: addr_of ! ((* ptr) . hash) as usize - ptr as usize } , 0usize , concat ! ("Offset of field: " , stringify ! (rte_mbuf__bindgen_ty_3__bindgen_ty_1__bindgen_ty_1__bindgen_ty_1) , "::" , stringify ! (hash))); + assert_eq ! (unsafe { let uninit = :: std :: mem :: MaybeUninit :: < rte_mbuf__bindgen_ty_3__bindgen_ty_1__bindgen_ty_1__bindgen_ty_1 > :: uninit () ; let ptr = uninit . as_ptr () ; :: std :: ptr :: addr_of ! ((* ptr) . id) as usize - ptr as usize } , 2usize , concat ! ("Offset of field: " , stringify ! (rte_mbuf__bindgen_ty_3__bindgen_ty_1__bindgen_ty_1__bindgen_ty_1) , "::" , stringify ! (id))); } #[test] fn bindgen_test_layout_rte_mbuf__bindgen_ty_3__bindgen_ty_1__bindgen_ty_1() { @@ -506,10 +514,11 @@ fn bindgen_test_layout_rte_mbuf__bindgen_ty_3__bindgen_ty_1__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::< + let uninit = ::std::mem::MaybeUninit::< rte_mbuf__bindgen_ty_3__bindgen_ty_1__bindgen_ty_1, - >())) - .lo as *const _ as usize + >::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).lo) as usize - ptr as usize }, 0usize, concat!( @@ -549,8 +558,11 @@ fn bindgen_test_layout_rte_mbuf__bindgen_ty_3__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_mbuf__bindgen_ty_3__bindgen_ty_1>())).hi - as *const _ as usize + let uninit = ::std::mem::MaybeUninit::< + rte_mbuf__bindgen_ty_3__bindgen_ty_1, + >::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).hi) as usize - ptr as usize }, 4usize, concat!( @@ -596,8 +608,11 @@ fn bindgen_test_layout_rte_mbuf__bindgen_ty_3__bindgen_ty_2() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_mbuf__bindgen_ty_3__bindgen_ty_2>())).lo - as *const _ as usize + let uninit = ::std::mem::MaybeUninit::< + rte_mbuf__bindgen_ty_3__bindgen_ty_2, + >::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).lo) as usize - ptr as usize }, 0usize, concat!( @@ -609,8 +624,11 @@ fn bindgen_test_layout_rte_mbuf__bindgen_ty_3__bindgen_ty_2() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_mbuf__bindgen_ty_3__bindgen_ty_2>())).hi - as *const _ as usize + let uninit = ::std::mem::MaybeUninit::< + rte_mbuf__bindgen_ty_3__bindgen_ty_2, + >::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).hi) as usize - ptr as usize }, 4usize, concat!( @@ -635,8 +653,10 @@ fn bindgen_test_layout_rte_mbuf__bindgen_ty_3() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_mbuf__bindgen_ty_3>())).rss as *const _ - as usize + let uninit = + ::std::mem::MaybeUninit::<rte_mbuf__bindgen_ty_3>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).rss) as usize - ptr as usize }, 0usize, concat!( @@ -648,8 +668,10 @@ fn bindgen_test_layout_rte_mbuf__bindgen_ty_3() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_mbuf__bindgen_ty_3>())).fdir as *const _ - as usize + let uninit = + ::std::mem::MaybeUninit::<rte_mbuf__bindgen_ty_3>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).fdir) as usize - ptr as usize }, 0usize, concat!( @@ -661,8 +683,10 @@ fn bindgen_test_layout_rte_mbuf__bindgen_ty_3() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_mbuf__bindgen_ty_3>())).sched as *const _ - as usize + let uninit = + ::std::mem::MaybeUninit::<rte_mbuf__bindgen_ty_3>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).sched) as usize - ptr as usize }, 0usize, concat!( @@ -674,8 +698,10 @@ fn bindgen_test_layout_rte_mbuf__bindgen_ty_3() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_mbuf__bindgen_ty_3>())).usr as *const _ - as usize + let uninit = + ::std::mem::MaybeUninit::<rte_mbuf__bindgen_ty_3>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).usr) as usize - ptr as usize }, 0usize, concat!( @@ -717,8 +743,10 @@ fn bindgen_test_layout_rte_mbuf__bindgen_ty_4() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_mbuf__bindgen_ty_4>())).userdata - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<rte_mbuf__bindgen_ty_4>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).userdata) as usize - ptr as usize }, 0usize, concat!( @@ -730,8 +758,10 @@ fn bindgen_test_layout_rte_mbuf__bindgen_ty_4() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_mbuf__bindgen_ty_4>())).udata64 - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<rte_mbuf__bindgen_ty_4>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).udata64) as usize - ptr as usize }, 0usize, concat!( @@ -917,8 +947,10 @@ fn bindgen_test_layout_rte_mbuf__bindgen_ty_5() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_mbuf__bindgen_ty_5>())).tx_offload - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<rte_mbuf__bindgen_ty_5>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).tx_offload) as usize - ptr as usize }, 0usize, concat!( @@ -952,7 +984,9 @@ fn bindgen_test_layout_rte_mbuf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_mbuf>())).cacheline0 as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<rte_mbuf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).cacheline0) as usize - ptr as usize }, 0usize, concat!( @@ -964,7 +998,9 @@ fn bindgen_test_layout_rte_mbuf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_mbuf>())).buf_addr as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<rte_mbuf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).buf_addr) as usize - ptr as usize }, 0usize, concat!( @@ -976,8 +1012,9 @@ fn bindgen_test_layout_rte_mbuf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_mbuf>())).buf_physaddr as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<rte_mbuf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).buf_physaddr) as usize - ptr as usize }, 8usize, concat!( @@ -989,7 +1026,9 @@ fn bindgen_test_layout_rte_mbuf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_mbuf>())).buf_len as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<rte_mbuf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).buf_len) as usize - ptr as usize }, 16usize, concat!( @@ -1001,7 +1040,9 @@ fn bindgen_test_layout_rte_mbuf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_mbuf>())).rearm_data as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<rte_mbuf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).rearm_data) as usize - ptr as usize }, 18usize, concat!( @@ -1013,7 +1054,9 @@ fn bindgen_test_layout_rte_mbuf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_mbuf>())).data_off as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<rte_mbuf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).data_off) as usize - ptr as usize }, 18usize, concat!( @@ -1025,7 +1068,9 @@ fn bindgen_test_layout_rte_mbuf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_mbuf>())).nb_segs as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<rte_mbuf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).nb_segs) as usize - ptr as usize }, 22usize, concat!( @@ -1037,7 +1082,9 @@ fn bindgen_test_layout_rte_mbuf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_mbuf>())).port as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<rte_mbuf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).port) as usize - ptr as usize }, 23usize, concat!( @@ -1049,7 +1096,9 @@ fn bindgen_test_layout_rte_mbuf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_mbuf>())).ol_flags as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<rte_mbuf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).ol_flags) as usize - ptr as usize }, 24usize, concat!( @@ -1061,8 +1110,10 @@ fn bindgen_test_layout_rte_mbuf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_mbuf>())).rx_descriptor_fields1 - as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<rte_mbuf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).rx_descriptor_fields1) as usize - + ptr as usize }, 32usize, concat!( @@ -1074,7 +1125,9 @@ fn bindgen_test_layout_rte_mbuf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_mbuf>())).pkt_len as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<rte_mbuf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).pkt_len) as usize - ptr as usize }, 36usize, concat!( @@ -1086,7 +1139,9 @@ fn bindgen_test_layout_rte_mbuf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_mbuf>())).data_len as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<rte_mbuf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).data_len) as usize - ptr as usize }, 40usize, concat!( @@ -1098,7 +1153,9 @@ fn bindgen_test_layout_rte_mbuf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_mbuf>())).vlan_tci as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<rte_mbuf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).vlan_tci) as usize - ptr as usize }, 42usize, concat!( @@ -1110,7 +1167,9 @@ fn bindgen_test_layout_rte_mbuf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_mbuf>())).hash as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<rte_mbuf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).hash) as usize - ptr as usize }, 44usize, concat!( @@ -1122,7 +1181,9 @@ fn bindgen_test_layout_rte_mbuf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_mbuf>())).seqn as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<rte_mbuf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).seqn) as usize - ptr as usize }, 52usize, concat!( @@ -1134,8 +1195,9 @@ fn bindgen_test_layout_rte_mbuf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_mbuf>())).vlan_tci_outer as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<rte_mbuf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).vlan_tci_outer) as usize - ptr as usize }, 56usize, concat!( @@ -1147,7 +1209,9 @@ fn bindgen_test_layout_rte_mbuf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_mbuf>())).cacheline1 as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<rte_mbuf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).cacheline1) as usize - ptr as usize }, 64usize, concat!( @@ -1159,7 +1223,9 @@ fn bindgen_test_layout_rte_mbuf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_mbuf>())).pool as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<rte_mbuf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).pool) as usize - ptr as usize }, 72usize, concat!( @@ -1171,7 +1237,9 @@ fn bindgen_test_layout_rte_mbuf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_mbuf>())).next as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<rte_mbuf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).next) as usize - ptr as usize }, 80usize, concat!( @@ -1183,7 +1251,9 @@ fn bindgen_test_layout_rte_mbuf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_mbuf>())).priv_size as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<rte_mbuf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).priv_size) as usize - ptr as usize }, 96usize, concat!( @@ -1195,7 +1265,9 @@ fn bindgen_test_layout_rte_mbuf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_mbuf>())).timesync as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<rte_mbuf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).timesync) as usize - ptr as usize }, 98usize, concat!( diff --git a/tests/expectations/tests/layout_mbuf_1_0.rs b/tests/expectations/tests/layout_mbuf_1_0.rs index ce4c66c2..0dbcf8e9 100644 --- a/tests/expectations/tests/layout_mbuf_1_0.rs +++ b/tests/expectations/tests/layout_mbuf_1_0.rs @@ -161,7 +161,9 @@ fn bindgen_test_layout_rte_atomic16_t() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_atomic16_t>())).cnt as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<rte_atomic16_t>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).cnt) as usize - ptr as usize }, 0usize, concat!( @@ -253,8 +255,10 @@ fn bindgen_test_layout_rte_mbuf__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_mbuf__bindgen_ty_1>())).refcnt_atomic - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<rte_mbuf__bindgen_ty_1>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).refcnt_atomic) as usize - ptr as usize }, 0usize, concat!( @@ -266,8 +270,10 @@ fn bindgen_test_layout_rte_mbuf__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_mbuf__bindgen_ty_1>())).refcnt - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<rte_mbuf__bindgen_ty_1>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).refcnt) as usize - ptr as usize }, 0usize, concat!( @@ -475,8 +481,10 @@ fn bindgen_test_layout_rte_mbuf__bindgen_ty_2() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_mbuf__bindgen_ty_2>())).packet_type - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<rte_mbuf__bindgen_ty_2>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).packet_type) as usize - ptr as usize }, 0usize, concat!( @@ -531,8 +539,8 @@ fn bindgen_test_layout_rte_mbuf__bindgen_ty_3__bindgen_ty_1__bindgen_ty_1__bindg ) { assert_eq ! (:: std :: mem :: size_of :: < rte_mbuf__bindgen_ty_3__bindgen_ty_1__bindgen_ty_1__bindgen_ty_1 > () , 4usize , concat ! ("Size of: " , stringify ! (rte_mbuf__bindgen_ty_3__bindgen_ty_1__bindgen_ty_1__bindgen_ty_1))); assert_eq ! (:: std :: mem :: align_of :: < rte_mbuf__bindgen_ty_3__bindgen_ty_1__bindgen_ty_1__bindgen_ty_1 > () , 2usize , concat ! ("Alignment of " , stringify ! (rte_mbuf__bindgen_ty_3__bindgen_ty_1__bindgen_ty_1__bindgen_ty_1))); - assert_eq ! (unsafe { & (* (:: std :: ptr :: null :: < rte_mbuf__bindgen_ty_3__bindgen_ty_1__bindgen_ty_1__bindgen_ty_1 > ())) . hash as * const _ as usize } , 0usize , concat ! ("Offset of field: " , stringify ! (rte_mbuf__bindgen_ty_3__bindgen_ty_1__bindgen_ty_1__bindgen_ty_1) , "::" , stringify ! (hash))); - assert_eq ! (unsafe { & (* (:: std :: ptr :: null :: < rte_mbuf__bindgen_ty_3__bindgen_ty_1__bindgen_ty_1__bindgen_ty_1 > ())) . id as * const _ as usize } , 2usize , concat ! ("Offset of field: " , stringify ! (rte_mbuf__bindgen_ty_3__bindgen_ty_1__bindgen_ty_1__bindgen_ty_1) , "::" , stringify ! (id))); + assert_eq ! (unsafe { let uninit = :: std :: mem :: MaybeUninit :: < rte_mbuf__bindgen_ty_3__bindgen_ty_1__bindgen_ty_1__bindgen_ty_1 > :: uninit () ; let ptr = uninit . as_ptr () ; :: std :: ptr :: addr_of ! ((* ptr) . hash) as usize - ptr as usize } , 0usize , concat ! ("Offset of field: " , stringify ! (rte_mbuf__bindgen_ty_3__bindgen_ty_1__bindgen_ty_1__bindgen_ty_1) , "::" , stringify ! (hash))); + assert_eq ! (unsafe { let uninit = :: std :: mem :: MaybeUninit :: < rte_mbuf__bindgen_ty_3__bindgen_ty_1__bindgen_ty_1__bindgen_ty_1 > :: uninit () ; let ptr = uninit . as_ptr () ; :: std :: ptr :: addr_of ! ((* ptr) . id) as usize - ptr as usize } , 2usize , concat ! ("Offset of field: " , stringify ! (rte_mbuf__bindgen_ty_3__bindgen_ty_1__bindgen_ty_1__bindgen_ty_1) , "::" , stringify ! (id))); } impl Clone for rte_mbuf__bindgen_ty_3__bindgen_ty_1__bindgen_ty_1__bindgen_ty_1 @@ -564,10 +572,11 @@ fn bindgen_test_layout_rte_mbuf__bindgen_ty_3__bindgen_ty_1__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::< + let uninit = ::std::mem::MaybeUninit::< rte_mbuf__bindgen_ty_3__bindgen_ty_1__bindgen_ty_1, - >())) - .lo as *const _ as usize + >::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).lo) as usize - ptr as usize }, 0usize, concat!( @@ -603,8 +612,11 @@ fn bindgen_test_layout_rte_mbuf__bindgen_ty_3__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_mbuf__bindgen_ty_3__bindgen_ty_1>())).hi - as *const _ as usize + let uninit = ::std::mem::MaybeUninit::< + rte_mbuf__bindgen_ty_3__bindgen_ty_1, + >::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).hi) as usize - ptr as usize }, 4usize, concat!( @@ -646,8 +658,11 @@ fn bindgen_test_layout_rte_mbuf__bindgen_ty_3__bindgen_ty_2() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_mbuf__bindgen_ty_3__bindgen_ty_2>())).lo - as *const _ as usize + let uninit = ::std::mem::MaybeUninit::< + rte_mbuf__bindgen_ty_3__bindgen_ty_2, + >::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).lo) as usize - ptr as usize }, 0usize, concat!( @@ -659,8 +674,11 @@ fn bindgen_test_layout_rte_mbuf__bindgen_ty_3__bindgen_ty_2() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_mbuf__bindgen_ty_3__bindgen_ty_2>())).hi - as *const _ as usize + let uninit = ::std::mem::MaybeUninit::< + rte_mbuf__bindgen_ty_3__bindgen_ty_2, + >::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).hi) as usize - ptr as usize }, 4usize, concat!( @@ -690,8 +708,10 @@ fn bindgen_test_layout_rte_mbuf__bindgen_ty_3() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_mbuf__bindgen_ty_3>())).rss as *const _ - as usize + let uninit = + ::std::mem::MaybeUninit::<rte_mbuf__bindgen_ty_3>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).rss) as usize - ptr as usize }, 0usize, concat!( @@ -703,8 +723,10 @@ fn bindgen_test_layout_rte_mbuf__bindgen_ty_3() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_mbuf__bindgen_ty_3>())).fdir as *const _ - as usize + let uninit = + ::std::mem::MaybeUninit::<rte_mbuf__bindgen_ty_3>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).fdir) as usize - ptr as usize }, 0usize, concat!( @@ -716,8 +738,10 @@ fn bindgen_test_layout_rte_mbuf__bindgen_ty_3() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_mbuf__bindgen_ty_3>())).sched as *const _ - as usize + let uninit = + ::std::mem::MaybeUninit::<rte_mbuf__bindgen_ty_3>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).sched) as usize - ptr as usize }, 0usize, concat!( @@ -729,8 +753,10 @@ fn bindgen_test_layout_rte_mbuf__bindgen_ty_3() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_mbuf__bindgen_ty_3>())).usr as *const _ - as usize + let uninit = + ::std::mem::MaybeUninit::<rte_mbuf__bindgen_ty_3>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).usr) as usize - ptr as usize }, 0usize, concat!( @@ -769,8 +795,10 @@ fn bindgen_test_layout_rte_mbuf__bindgen_ty_4() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_mbuf__bindgen_ty_4>())).userdata - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<rte_mbuf__bindgen_ty_4>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).userdata) as usize - ptr as usize }, 0usize, concat!( @@ -782,8 +810,10 @@ fn bindgen_test_layout_rte_mbuf__bindgen_ty_4() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_mbuf__bindgen_ty_4>())).udata64 - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<rte_mbuf__bindgen_ty_4>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).udata64) as usize - ptr as usize }, 0usize, concat!( @@ -972,8 +1002,10 @@ fn bindgen_test_layout_rte_mbuf__bindgen_ty_5() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_mbuf__bindgen_ty_5>())).tx_offload - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<rte_mbuf__bindgen_ty_5>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).tx_offload) as usize - ptr as usize }, 0usize, concat!( @@ -998,7 +1030,9 @@ fn bindgen_test_layout_rte_mbuf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_mbuf>())).cacheline0 as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<rte_mbuf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).cacheline0) as usize - ptr as usize }, 0usize, concat!( @@ -1010,7 +1044,9 @@ fn bindgen_test_layout_rte_mbuf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_mbuf>())).buf_addr as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<rte_mbuf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).buf_addr) as usize - ptr as usize }, 0usize, concat!( @@ -1022,8 +1058,9 @@ fn bindgen_test_layout_rte_mbuf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_mbuf>())).buf_physaddr as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<rte_mbuf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).buf_physaddr) as usize - ptr as usize }, 8usize, concat!( @@ -1035,7 +1072,9 @@ fn bindgen_test_layout_rte_mbuf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_mbuf>())).buf_len as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<rte_mbuf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).buf_len) as usize - ptr as usize }, 16usize, concat!( @@ -1047,7 +1086,9 @@ fn bindgen_test_layout_rte_mbuf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_mbuf>())).rearm_data as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<rte_mbuf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).rearm_data) as usize - ptr as usize }, 18usize, concat!( @@ -1059,7 +1100,9 @@ fn bindgen_test_layout_rte_mbuf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_mbuf>())).data_off as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<rte_mbuf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).data_off) as usize - ptr as usize }, 18usize, concat!( @@ -1071,7 +1114,9 @@ fn bindgen_test_layout_rte_mbuf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_mbuf>())).nb_segs as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<rte_mbuf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).nb_segs) as usize - ptr as usize }, 22usize, concat!( @@ -1083,7 +1128,9 @@ fn bindgen_test_layout_rte_mbuf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_mbuf>())).port as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<rte_mbuf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).port) as usize - ptr as usize }, 23usize, concat!( @@ -1095,7 +1142,9 @@ fn bindgen_test_layout_rte_mbuf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_mbuf>())).ol_flags as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<rte_mbuf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).ol_flags) as usize - ptr as usize }, 24usize, concat!( @@ -1107,8 +1156,10 @@ fn bindgen_test_layout_rte_mbuf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_mbuf>())).rx_descriptor_fields1 - as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<rte_mbuf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).rx_descriptor_fields1) as usize - + ptr as usize }, 32usize, concat!( @@ -1120,7 +1171,9 @@ fn bindgen_test_layout_rte_mbuf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_mbuf>())).pkt_len as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<rte_mbuf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).pkt_len) as usize - ptr as usize }, 36usize, concat!( @@ -1132,7 +1185,9 @@ fn bindgen_test_layout_rte_mbuf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_mbuf>())).data_len as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<rte_mbuf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).data_len) as usize - ptr as usize }, 40usize, concat!( @@ -1144,7 +1199,9 @@ fn bindgen_test_layout_rte_mbuf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_mbuf>())).vlan_tci as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<rte_mbuf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).vlan_tci) as usize - ptr as usize }, 42usize, concat!( @@ -1156,7 +1213,9 @@ fn bindgen_test_layout_rte_mbuf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_mbuf>())).hash as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<rte_mbuf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).hash) as usize - ptr as usize }, 44usize, concat!( @@ -1168,7 +1227,9 @@ fn bindgen_test_layout_rte_mbuf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_mbuf>())).seqn as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<rte_mbuf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).seqn) as usize - ptr as usize }, 52usize, concat!( @@ -1180,8 +1241,9 @@ fn bindgen_test_layout_rte_mbuf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_mbuf>())).vlan_tci_outer as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<rte_mbuf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).vlan_tci_outer) as usize - ptr as usize }, 56usize, concat!( @@ -1193,7 +1255,9 @@ fn bindgen_test_layout_rte_mbuf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_mbuf>())).cacheline1 as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<rte_mbuf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).cacheline1) as usize - ptr as usize }, 64usize, concat!( @@ -1205,7 +1269,9 @@ fn bindgen_test_layout_rte_mbuf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_mbuf>())).pool as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<rte_mbuf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).pool) as usize - ptr as usize }, 72usize, concat!( @@ -1217,7 +1283,9 @@ fn bindgen_test_layout_rte_mbuf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_mbuf>())).next as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<rte_mbuf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).next) as usize - ptr as usize }, 80usize, concat!( @@ -1229,7 +1297,9 @@ fn bindgen_test_layout_rte_mbuf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_mbuf>())).priv_size as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<rte_mbuf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).priv_size) as usize - ptr as usize }, 96usize, concat!( @@ -1241,7 +1311,9 @@ fn bindgen_test_layout_rte_mbuf() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_mbuf>())).timesync as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<rte_mbuf>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).timesync) as usize - ptr as usize }, 98usize, concat!( diff --git a/tests/expectations/tests/libclang-5/call-conv-field.rs b/tests/expectations/tests/libclang-5/call-conv-field.rs index f134bd8a..c8060c9d 100644 --- a/tests/expectations/tests/libclang-5/call-conv-field.rs +++ b/tests/expectations/tests/libclang-5/call-conv-field.rs @@ -30,8 +30,10 @@ fn bindgen_test_layout_JNINativeInterface_() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<JNINativeInterface_>())).GetVersion - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<JNINativeInterface_>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).GetVersion) as usize - ptr as usize }, 0usize, concat!( @@ -43,8 +45,10 @@ fn bindgen_test_layout_JNINativeInterface_() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<JNINativeInterface_>())).__hack as *const _ - as usize + let uninit = + ::std::mem::MaybeUninit::<JNINativeInterface_>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).__hack) as usize - ptr as usize }, 8usize, concat!( 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 f874e9d2..16bd02e4 100644 --- a/tests/expectations/tests/libclang-5/type_alias_template_specialized.rs +++ b/tests/expectations/tests/libclang-5/type_alias_template_specialized.rs @@ -23,7 +23,11 @@ fn bindgen_test_layout_Rooted() { concat!("Alignment of ", stringify!(Rooted)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Rooted>())).ptr as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Rooted>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).ptr) as usize - ptr as usize + }, 0usize, concat!( "Offset of field: ", diff --git a/tests/expectations/tests/libclang-9/call-conv-field.rs b/tests/expectations/tests/libclang-9/call-conv-field.rs index f134bd8a..c8060c9d 100644 --- a/tests/expectations/tests/libclang-9/call-conv-field.rs +++ b/tests/expectations/tests/libclang-9/call-conv-field.rs @@ -30,8 +30,10 @@ fn bindgen_test_layout_JNINativeInterface_() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<JNINativeInterface_>())).GetVersion - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<JNINativeInterface_>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).GetVersion) as usize - ptr as usize }, 0usize, concat!( @@ -43,8 +45,10 @@ fn bindgen_test_layout_JNINativeInterface_() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<JNINativeInterface_>())).__hack as *const _ - as usize + let uninit = + ::std::mem::MaybeUninit::<JNINativeInterface_>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).__hack) as usize - ptr as usize }, 8usize, concat!( diff --git a/tests/expectations/tests/libclang-9/class.rs b/tests/expectations/tests/libclang-9/class.rs index e4527de0..117cc815 100644 --- a/tests/expectations/tests/libclang-9/class.rs +++ b/tests/expectations/tests/libclang-9/class.rs @@ -54,12 +54,20 @@ fn bindgen_test_layout_C() { concat!("Alignment of ", stringify!(C)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<C>())).a as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<C>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).a) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(C), "::", stringify!(a)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<C>())).big_array as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<C>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).big_array) as usize - ptr as usize + }, 4usize, concat!( "Offset of field: ", @@ -98,8 +106,10 @@ fn bindgen_test_layout_C_with_zero_length_array() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<C_with_zero_length_array>())).a as *const _ - as usize + let uninit = + ::std::mem::MaybeUninit::<C_with_zero_length_array>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).a) as usize - ptr as usize }, 0usize, concat!( @@ -111,8 +121,10 @@ fn bindgen_test_layout_C_with_zero_length_array() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<C_with_zero_length_array>())).big_array - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<C_with_zero_length_array>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).big_array) as usize - ptr as usize }, 4usize, concat!( @@ -124,8 +136,11 @@ fn bindgen_test_layout_C_with_zero_length_array() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<C_with_zero_length_array>())) - .zero_length_array as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<C_with_zero_length_array>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).zero_length_array) as usize - + ptr as usize }, 37usize, concat!( @@ -165,8 +180,10 @@ fn bindgen_test_layout_C_with_zero_length_array_2() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<C_with_zero_length_array_2>())).a as *const _ - as usize + let uninit = + ::std::mem::MaybeUninit::<C_with_zero_length_array_2>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).a) as usize - ptr as usize }, 0usize, concat!( @@ -178,8 +195,11 @@ fn bindgen_test_layout_C_with_zero_length_array_2() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<C_with_zero_length_array_2>())) - .zero_length_array as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<C_with_zero_length_array_2>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).zero_length_array) as usize - + ptr as usize }, 4usize, concat!( @@ -210,8 +230,10 @@ fn bindgen_test_layout_C_with_incomplete_array() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<C_with_incomplete_array>())).a as *const _ - as usize + let uninit = + ::std::mem::MaybeUninit::<C_with_incomplete_array>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).a) as usize - ptr as usize }, 0usize, concat!( @@ -223,8 +245,10 @@ fn bindgen_test_layout_C_with_incomplete_array() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<C_with_incomplete_array>())).big_array - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<C_with_incomplete_array>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).big_array) as usize - ptr as usize }, 4usize, concat!( @@ -236,8 +260,11 @@ fn bindgen_test_layout_C_with_incomplete_array() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<C_with_incomplete_array>())).incomplete_array - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<C_with_incomplete_array>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).incomplete_array) as usize - + ptr as usize }, 37usize, concat!( @@ -277,8 +304,10 @@ fn bindgen_test_layout_C_with_incomplete_array_2() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<C_with_incomplete_array_2>())).a as *const _ - as usize + let uninit = + ::std::mem::MaybeUninit::<C_with_incomplete_array_2>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).a) as usize - ptr as usize }, 0usize, concat!( @@ -290,8 +319,11 @@ fn bindgen_test_layout_C_with_incomplete_array_2() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<C_with_incomplete_array_2>())) - .incomplete_array as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<C_with_incomplete_array_2>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).incomplete_array) as usize - + ptr as usize }, 4usize, concat!( @@ -329,10 +361,11 @@ fn bindgen_test_layout_C_with_zero_length_array_and_incomplete_array() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::< + let uninit = ::std::mem::MaybeUninit::< C_with_zero_length_array_and_incomplete_array, - >())) - .a as *const _ as usize + >::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).a) as usize - ptr as usize }, 0usize, concat!( @@ -344,10 +377,11 @@ fn bindgen_test_layout_C_with_zero_length_array_and_incomplete_array() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::< + let uninit = ::std::mem::MaybeUninit::< C_with_zero_length_array_and_incomplete_array, - >())) - .big_array as *const _ as usize + >::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).big_array) as usize - ptr as usize }, 4usize, concat!( @@ -359,10 +393,12 @@ fn bindgen_test_layout_C_with_zero_length_array_and_incomplete_array() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::< + let uninit = ::std::mem::MaybeUninit::< C_with_zero_length_array_and_incomplete_array, - >())) - .zero_length_array as *const _ as usize + >::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).zero_length_array) as usize - + ptr as usize }, 37usize, concat!( @@ -374,10 +410,12 @@ fn bindgen_test_layout_C_with_zero_length_array_and_incomplete_array() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::< + let uninit = ::std::mem::MaybeUninit::< C_with_zero_length_array_and_incomplete_array, - >())) - .incomplete_array as *const _ as usize + >::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).incomplete_array) as usize - + ptr as usize }, 37usize, concat!( @@ -426,10 +464,11 @@ fn bindgen_test_layout_C_with_zero_length_array_and_incomplete_array_2() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::< + let uninit = ::std::mem::MaybeUninit::< C_with_zero_length_array_and_incomplete_array_2, - >())) - .a as *const _ as usize + >::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).a) as usize - ptr as usize }, 0usize, concat!( @@ -441,10 +480,12 @@ fn bindgen_test_layout_C_with_zero_length_array_and_incomplete_array_2() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::< + let uninit = ::std::mem::MaybeUninit::< C_with_zero_length_array_and_incomplete_array_2, - >())) - .zero_length_array as *const _ as usize + >::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).zero_length_array) as usize - + ptr as usize }, 4usize, concat!( @@ -456,10 +497,12 @@ fn bindgen_test_layout_C_with_zero_length_array_and_incomplete_array_2() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::< + let uninit = ::std::mem::MaybeUninit::< C_with_zero_length_array_and_incomplete_array_2, - >())) - .incomplete_array as *const _ as usize + >::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).incomplete_array) as usize - + ptr as usize }, 4usize, concat!( @@ -488,7 +531,11 @@ fn bindgen_test_layout_WithDtor() { concat!("Alignment of ", stringify!(WithDtor)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<WithDtor>())).b as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<WithDtor>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).b) as usize - ptr as usize + }, 0usize, concat!( "Offset of field: ", @@ -517,8 +564,10 @@ fn bindgen_test_layout_IncompleteArrayNonCopiable() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<IncompleteArrayNonCopiable>())).whatever - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<IncompleteArrayNonCopiable>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).whatever) as usize - ptr as usize }, 0usize, concat!( @@ -530,8 +579,11 @@ fn bindgen_test_layout_IncompleteArrayNonCopiable() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<IncompleteArrayNonCopiable>())) - .incomplete_array as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<IncompleteArrayNonCopiable>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).incomplete_array) as usize - + ptr as usize }, 8usize, concat!( @@ -570,12 +622,20 @@ fn bindgen_test_layout_Union() { concat!("Alignment of ", stringify!(Union)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Union>())).d as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Union>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).d) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(Union), "::", stringify!(d)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Union>())).i as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Union>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).i) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(Union), "::", stringify!(i)) ); @@ -608,7 +668,9 @@ fn bindgen_test_layout_WithUnion() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<WithUnion>())).data as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<WithUnion>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).data) as usize - ptr as usize }, 0usize, concat!( diff --git a/tests/expectations/tests/libclang-9/class_1_0.rs b/tests/expectations/tests/libclang-9/class_1_0.rs index 4263bd14..0a707d22 100644 --- a/tests/expectations/tests/libclang-9/class_1_0.rs +++ b/tests/expectations/tests/libclang-9/class_1_0.rs @@ -97,12 +97,20 @@ fn bindgen_test_layout_C() { concat!("Alignment of ", stringify!(C)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<C>())).a as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<C>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).a) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(C), "::", stringify!(a)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<C>())).big_array as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<C>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).big_array) as usize - ptr as usize + }, 4usize, concat!( "Offset of field: ", @@ -151,8 +159,10 @@ fn bindgen_test_layout_C_with_zero_length_array() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<C_with_zero_length_array>())).a as *const _ - as usize + let uninit = + ::std::mem::MaybeUninit::<C_with_zero_length_array>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).a) as usize - ptr as usize }, 0usize, concat!( @@ -164,8 +174,10 @@ fn bindgen_test_layout_C_with_zero_length_array() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<C_with_zero_length_array>())).big_array - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<C_with_zero_length_array>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).big_array) as usize - ptr as usize }, 4usize, concat!( @@ -177,8 +189,11 @@ fn bindgen_test_layout_C_with_zero_length_array() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<C_with_zero_length_array>())) - .zero_length_array as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<C_with_zero_length_array>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).zero_length_array) as usize - + ptr as usize }, 37usize, concat!( @@ -218,8 +233,10 @@ fn bindgen_test_layout_C_with_zero_length_array_2() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<C_with_zero_length_array_2>())).a as *const _ - as usize + let uninit = + ::std::mem::MaybeUninit::<C_with_zero_length_array_2>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).a) as usize - ptr as usize }, 0usize, concat!( @@ -231,8 +248,11 @@ fn bindgen_test_layout_C_with_zero_length_array_2() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<C_with_zero_length_array_2>())) - .zero_length_array as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<C_with_zero_length_array_2>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).zero_length_array) as usize - + ptr as usize }, 4usize, concat!( @@ -263,8 +283,10 @@ fn bindgen_test_layout_C_with_incomplete_array() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<C_with_incomplete_array>())).a as *const _ - as usize + let uninit = + ::std::mem::MaybeUninit::<C_with_incomplete_array>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).a) as usize - ptr as usize }, 0usize, concat!( @@ -276,8 +298,10 @@ fn bindgen_test_layout_C_with_incomplete_array() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<C_with_incomplete_array>())).big_array - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<C_with_incomplete_array>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).big_array) as usize - ptr as usize }, 4usize, concat!( @@ -289,8 +313,11 @@ fn bindgen_test_layout_C_with_incomplete_array() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<C_with_incomplete_array>())).incomplete_array - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<C_with_incomplete_array>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).incomplete_array) as usize - + ptr as usize }, 37usize, concat!( @@ -330,8 +357,10 @@ fn bindgen_test_layout_C_with_incomplete_array_2() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<C_with_incomplete_array_2>())).a as *const _ - as usize + let uninit = + ::std::mem::MaybeUninit::<C_with_incomplete_array_2>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).a) as usize - ptr as usize }, 0usize, concat!( @@ -343,8 +372,11 @@ fn bindgen_test_layout_C_with_incomplete_array_2() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<C_with_incomplete_array_2>())) - .incomplete_array as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<C_with_incomplete_array_2>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).incomplete_array) as usize - + ptr as usize }, 4usize, concat!( @@ -382,10 +414,11 @@ fn bindgen_test_layout_C_with_zero_length_array_and_incomplete_array() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::< + let uninit = ::std::mem::MaybeUninit::< C_with_zero_length_array_and_incomplete_array, - >())) - .a as *const _ as usize + >::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).a) as usize - ptr as usize }, 0usize, concat!( @@ -397,10 +430,11 @@ fn bindgen_test_layout_C_with_zero_length_array_and_incomplete_array() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::< + let uninit = ::std::mem::MaybeUninit::< C_with_zero_length_array_and_incomplete_array, - >())) - .big_array as *const _ as usize + >::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).big_array) as usize - ptr as usize }, 4usize, concat!( @@ -412,10 +446,12 @@ fn bindgen_test_layout_C_with_zero_length_array_and_incomplete_array() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::< + let uninit = ::std::mem::MaybeUninit::< C_with_zero_length_array_and_incomplete_array, - >())) - .zero_length_array as *const _ as usize + >::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).zero_length_array) as usize - + ptr as usize }, 37usize, concat!( @@ -427,10 +463,12 @@ fn bindgen_test_layout_C_with_zero_length_array_and_incomplete_array() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::< + let uninit = ::std::mem::MaybeUninit::< C_with_zero_length_array_and_incomplete_array, - >())) - .incomplete_array as *const _ as usize + >::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).incomplete_array) as usize - + ptr as usize }, 37usize, concat!( @@ -479,10 +517,11 @@ fn bindgen_test_layout_C_with_zero_length_array_and_incomplete_array_2() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::< + let uninit = ::std::mem::MaybeUninit::< C_with_zero_length_array_and_incomplete_array_2, - >())) - .a as *const _ as usize + >::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).a) as usize - ptr as usize }, 0usize, concat!( @@ -494,10 +533,12 @@ fn bindgen_test_layout_C_with_zero_length_array_and_incomplete_array_2() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::< + let uninit = ::std::mem::MaybeUninit::< C_with_zero_length_array_and_incomplete_array_2, - >())) - .zero_length_array as *const _ as usize + >::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).zero_length_array) as usize - + ptr as usize }, 4usize, concat!( @@ -509,10 +550,12 @@ fn bindgen_test_layout_C_with_zero_length_array_and_incomplete_array_2() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::< + let uninit = ::std::mem::MaybeUninit::< C_with_zero_length_array_and_incomplete_array_2, - >())) - .incomplete_array as *const _ as usize + >::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).incomplete_array) as usize - + ptr as usize }, 4usize, concat!( @@ -541,7 +584,11 @@ fn bindgen_test_layout_WithDtor() { concat!("Alignment of ", stringify!(WithDtor)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<WithDtor>())).b as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<WithDtor>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).b) as usize - ptr as usize + }, 0usize, concat!( "Offset of field: ", @@ -570,8 +617,10 @@ fn bindgen_test_layout_IncompleteArrayNonCopiable() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<IncompleteArrayNonCopiable>())).whatever - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<IncompleteArrayNonCopiable>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).whatever) as usize - ptr as usize }, 0usize, concat!( @@ -583,8 +632,11 @@ fn bindgen_test_layout_IncompleteArrayNonCopiable() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<IncompleteArrayNonCopiable>())) - .incomplete_array as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<IncompleteArrayNonCopiable>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).incomplete_array) as usize - + ptr as usize }, 8usize, concat!( @@ -624,12 +676,20 @@ fn bindgen_test_layout_Union() { concat!("Alignment of ", stringify!(Union)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Union>())).d as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Union>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).d) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(Union), "::", stringify!(d)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Union>())).i as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Union>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).i) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(Union), "::", stringify!(i)) ); @@ -658,7 +718,9 @@ fn bindgen_test_layout_WithUnion() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<WithUnion>())).data as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<WithUnion>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).data) as usize - ptr as usize }, 0usize, concat!( diff --git a/tests/expectations/tests/libclang-9/derive-hash-struct-with-incomplete-array.rs b/tests/expectations/tests/libclang-9/derive-hash-struct-with-incomplete-array.rs index 32607b37..42de2d77 100644 --- a/tests/expectations/tests/libclang-9/derive-hash-struct-with-incomplete-array.rs +++ b/tests/expectations/tests/libclang-9/derive-hash-struct-with-incomplete-array.rs @@ -54,14 +54,20 @@ fn bindgen_test_layout_test() { concat!("Alignment of ", stringify!(test)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<test>())).a as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<test>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).a) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(test), "::", stringify!(a)) ); assert_eq!( unsafe { - &(*(::std::ptr::null::<test>())).zero_length_array as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<test>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).zero_length_array) as usize - + ptr as usize }, 4usize, concat!( @@ -91,14 +97,20 @@ fn bindgen_test_layout_test2() { concat!("Alignment of ", stringify!(test2)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<test2>())).a as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<test2>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).a) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(test2), "::", stringify!(a)) ); assert_eq!( unsafe { - &(*(::std::ptr::null::<test2>())).incomplete_array as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<test2>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).incomplete_array) as usize - + ptr as usize }, 4usize, concat!( @@ -129,14 +141,20 @@ fn bindgen_test_layout_test3() { concat!("Alignment of ", stringify!(test3)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<test3>())).a as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<test3>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).a) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(test3), "::", stringify!(a)) ); assert_eq!( unsafe { - &(*(::std::ptr::null::<test3>())).zero_length_array as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<test3>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).zero_length_array) as usize - + ptr as usize }, 4usize, concat!( @@ -148,8 +166,10 @@ fn bindgen_test_layout_test3() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<test3>())).incomplete_array as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<test3>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).incomplete_array) as usize - + ptr as usize }, 4usize, concat!( diff --git a/tests/expectations/tests/libclang-9/incomplete-array-padding.rs b/tests/expectations/tests/libclang-9/incomplete-array-padding.rs index 382195db..ba1f9ce0 100644 --- a/tests/expectations/tests/libclang-9/incomplete-array-padding.rs +++ b/tests/expectations/tests/libclang-9/incomplete-array-padding.rs @@ -141,7 +141,11 @@ fn bindgen_test_layout_foo() { concat!("Alignment of ", stringify!(foo)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<foo>())).b as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<foo>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).b) as usize - ptr as usize + }, 8usize, concat!("Offset of field: ", stringify!(foo), "::", stringify!(b)) ); 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 49664cdd..91c37711 100644 --- a/tests/expectations/tests/libclang-9/issue-643-inner-struct.rs +++ b/tests/expectations/tests/libclang-9/issue-643-inner-struct.rs @@ -62,8 +62,9 @@ fn bindgen_test_layout_rte_ring_prod() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_ring_prod>())).watermark as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<rte_ring_prod>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).watermark) as usize - ptr as usize }, 0usize, concat!( @@ -93,8 +94,9 @@ fn bindgen_test_layout_rte_ring_cons() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_ring_cons>())).sc_dequeue as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<rte_ring_cons>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).sc_dequeue) as usize - ptr as usize }, 0usize, concat!( @@ -119,7 +121,9 @@ fn bindgen_test_layout_rte_ring() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_ring>())).memzone as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<rte_ring>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).memzone) as usize - ptr as usize }, 0usize, concat!( @@ -131,7 +135,9 @@ fn bindgen_test_layout_rte_ring() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_ring>())).prod as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<rte_ring>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).prod) as usize - ptr as usize }, 8usize, concat!( @@ -143,7 +149,9 @@ fn bindgen_test_layout_rte_ring() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_ring>())).cons as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<rte_ring>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).cons) as usize - ptr as usize }, 12usize, concat!( @@ -155,7 +163,9 @@ fn bindgen_test_layout_rte_ring() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_ring>())).ring as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<rte_ring>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).ring) as usize - ptr as usize }, 16usize, concat!( diff --git a/tests/expectations/tests/libclang-9/layout_align.rs b/tests/expectations/tests/libclang-9/layout_align.rs index 4ad54175..fa5179ae 100644 --- a/tests/expectations/tests/libclang-9/layout_align.rs +++ b/tests/expectations/tests/libclang-9/layout_align.rs @@ -149,7 +149,9 @@ fn bindgen_test_layout_rte_kni_fifo() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_kni_fifo>())).write as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<rte_kni_fifo>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).write) as usize - ptr as usize }, 0usize, concat!( @@ -161,7 +163,9 @@ fn bindgen_test_layout_rte_kni_fifo() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_kni_fifo>())).read as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<rte_kni_fifo>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).read) as usize - ptr as usize }, 4usize, concat!( @@ -173,7 +177,9 @@ fn bindgen_test_layout_rte_kni_fifo() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_kni_fifo>())).len as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<rte_kni_fifo>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).len) as usize - ptr as usize }, 8usize, concat!( @@ -185,8 +191,9 @@ fn bindgen_test_layout_rte_kni_fifo() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_kni_fifo>())).elem_size as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<rte_kni_fifo>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).elem_size) as usize - ptr as usize }, 12usize, concat!( @@ -198,7 +205,9 @@ fn bindgen_test_layout_rte_kni_fifo() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_kni_fifo>())).buffer as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<rte_kni_fifo>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).buffer) as usize - ptr as usize }, 16usize, concat!( @@ -242,8 +251,9 @@ fn bindgen_test_layout_rte_eth_link() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<rte_eth_link>())).link_speed as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<rte_eth_link>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).link_speed) as usize - ptr as usize }, 0usize, concat!( 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 f874e9d2..16bd02e4 100644 --- a/tests/expectations/tests/libclang-9/type_alias_template_specialized.rs +++ b/tests/expectations/tests/libclang-9/type_alias_template_specialized.rs @@ -23,7 +23,11 @@ fn bindgen_test_layout_Rooted() { concat!("Alignment of ", stringify!(Rooted)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Rooted>())).ptr as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Rooted>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).ptr) as usize - ptr as usize + }, 0usize, concat!( "Offset of field: ", diff --git a/tests/expectations/tests/libclang-9/zero-sized-array.rs b/tests/expectations/tests/libclang-9/zero-sized-array.rs index 6514b930..1c2f242f 100644 --- a/tests/expectations/tests/libclang-9/zero-sized-array.rs +++ b/tests/expectations/tests/libclang-9/zero-sized-array.rs @@ -55,7 +55,9 @@ fn bindgen_test_layout_ZeroSizedArray() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<ZeroSizedArray>())).arr as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<ZeroSizedArray>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).arr) as usize - ptr as usize }, 0usize, concat!( @@ -86,8 +88,10 @@ fn bindgen_test_layout_ContainsZeroSizedArray() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<ContainsZeroSizedArray>())).zsa as *const _ - as usize + let uninit = + ::std::mem::MaybeUninit::<ContainsZeroSizedArray>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).zsa) as usize - ptr as usize }, 0usize, concat!( @@ -138,8 +142,10 @@ fn bindgen_test_layout_DynamicallySizedArray() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<DynamicallySizedArray>())).arr as *const _ - as usize + let uninit = + ::std::mem::MaybeUninit::<DynamicallySizedArray>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).arr) as usize - ptr as usize }, 0usize, concat!( @@ -170,8 +176,9 @@ fn bindgen_test_layout_ContainsDynamicallySizedArray() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<ContainsDynamicallySizedArray>())).dsa - as *const _ as usize + let uninit = :: std :: mem :: MaybeUninit :: < ContainsDynamicallySizedArray > :: uninit () ; + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).dsa) as usize - ptr as usize }, 0usize, concat!( diff --git a/tests/expectations/tests/long_double.rs b/tests/expectations/tests/long_double.rs index dbd4248e..f0843825 100644 --- a/tests/expectations/tests/long_double.rs +++ b/tests/expectations/tests/long_double.rs @@ -24,7 +24,11 @@ fn bindgen_test_layout_foo() { concat!("Alignment of ", stringify!(foo)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<foo>())).bar as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<foo>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).bar) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(foo), "::", stringify!(bar)) ); diff --git a/tests/expectations/tests/msvc-no-usr.rs b/tests/expectations/tests/msvc-no-usr.rs index ea5a90b8..b0ad37ca 100644 --- a/tests/expectations/tests/msvc-no-usr.rs +++ b/tests/expectations/tests/msvc-no-usr.rs @@ -24,7 +24,11 @@ fn bindgen_test_layout_A() { concat!("Alignment of ", stringify!(A)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<A>())).foo as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<A>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).foo) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(A), "::", stringify!(foo)) ); diff --git a/tests/expectations/tests/mutable.rs b/tests/expectations/tests/mutable.rs index 9f5865fc..4f5d97ab 100644 --- a/tests/expectations/tests/mutable.rs +++ b/tests/expectations/tests/mutable.rs @@ -24,7 +24,11 @@ fn bindgen_test_layout_C() { concat!("Alignment of ", stringify!(C)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<C>())).m_member as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<C>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).m_member) as usize - ptr as usize + }, 0usize, concat!( "Offset of field: ", @@ -34,7 +38,11 @@ fn bindgen_test_layout_C() { ) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<C>())).m_other as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<C>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).m_other) as usize - ptr as usize + }, 4usize, concat!( "Offset of field: ", @@ -63,8 +71,9 @@ fn bindgen_test_layout_NonCopiable() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<NonCopiable>())).m_member as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<NonCopiable>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).m_member) as usize - ptr as usize }, 0usize, concat!( @@ -100,8 +109,11 @@ fn bindgen_test_layout_NonCopiableWithNonCopiableMutableMember() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<NonCopiableWithNonCopiableMutableMember>())) - .m_member as *const _ as usize + let uninit = ::std::mem::MaybeUninit::< + NonCopiableWithNonCopiableMutableMember, + >::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).m_member) as usize - ptr as usize }, 0usize, concat!( diff --git a/tests/expectations/tests/namespace.rs b/tests/expectations/tests/namespace.rs index 576fc933..33e2118f 100644 --- a/tests/expectations/tests/namespace.rs +++ b/tests/expectations/tests/namespace.rs @@ -44,7 +44,11 @@ pub mod root { concat!("Alignment of ", stringify!(A)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<A>())).b as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<A>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).b) as usize - ptr as usize + }, 0usize, concat!( "Offset of field: ", diff --git a/tests/expectations/tests/nested.rs b/tests/expectations/tests/nested.rs index 92cd6605..558ccd6c 100644 --- a/tests/expectations/tests/nested.rs +++ b/tests/expectations/tests/nested.rs @@ -23,7 +23,11 @@ fn bindgen_test_layout_Calc() { concat!("Alignment of ", stringify!(Calc)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Calc>())).w as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Calc>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).w) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(Calc), "::", stringify!(w)) ); @@ -71,7 +75,9 @@ fn bindgen_test_layout_Test_Size() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<Test_Size>())).mWidth as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<Test_Size>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mWidth) as usize - ptr as usize }, 0usize, concat!( @@ -83,7 +89,9 @@ fn bindgen_test_layout_Test_Size() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<Test_Size>())).mHeight as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<Test_Size>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mHeight) as usize - ptr as usize }, 4usize, concat!( diff --git a/tests/expectations/tests/nested_within_namespace.rs b/tests/expectations/tests/nested_within_namespace.rs index 86b9b8c6..8bb8559f 100644 --- a/tests/expectations/tests/nested_within_namespace.rs +++ b/tests/expectations/tests/nested_within_namespace.rs @@ -36,7 +36,9 @@ pub mod root { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<Bar_Baz>())).foo as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<Bar_Baz>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).foo) as usize - ptr as usize }, 0usize, concat!( @@ -61,7 +63,9 @@ pub mod root { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<Bar>())).foo as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<Bar>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).foo) as usize - ptr as usize }, 0usize, concat!( @@ -91,7 +95,9 @@ pub mod root { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<Baz>())).baz as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<Baz>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).baz) as usize - ptr as usize }, 0usize, concat!( diff --git a/tests/expectations/tests/no-comments.rs b/tests/expectations/tests/no-comments.rs index 7a9d0d82..5c1cdc43 100644 --- a/tests/expectations/tests/no-comments.rs +++ b/tests/expectations/tests/no-comments.rs @@ -23,7 +23,11 @@ fn bindgen_test_layout_Foo() { concat!("Alignment of ", stringify!(Foo)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Foo>())).s as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Foo>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).s) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(Foo), "::", stringify!(s)) ); diff --git a/tests/expectations/tests/no-derive-debug.rs b/tests/expectations/tests/no-derive-debug.rs index a62eaa5d..ffa372c2 100644 --- a/tests/expectations/tests/no-derive-debug.rs +++ b/tests/expectations/tests/no-derive-debug.rs @@ -32,12 +32,20 @@ fn bindgen_test_layout_bar() { concat!("Alignment of ", stringify!(bar)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<bar>())).foo as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<bar>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).foo) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(bar), "::", stringify!(foo)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<bar>())).baz as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<bar>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).baz) as usize - ptr as usize + }, 4usize, concat!("Offset of field: ", stringify!(bar), "::", stringify!(baz)) ); diff --git a/tests/expectations/tests/no-derive-default.rs b/tests/expectations/tests/no-derive-default.rs index eda13aad..82d630f5 100644 --- a/tests/expectations/tests/no-derive-default.rs +++ b/tests/expectations/tests/no-derive-default.rs @@ -32,12 +32,20 @@ fn bindgen_test_layout_bar() { concat!("Alignment of ", stringify!(bar)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<bar>())).foo as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<bar>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).foo) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(bar), "::", stringify!(foo)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<bar>())).baz as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<bar>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).baz) as usize - ptr as usize + }, 4usize, concat!("Offset of field: ", stringify!(bar), "::", stringify!(baz)) ); diff --git a/tests/expectations/tests/no-hash-allowlisted.rs b/tests/expectations/tests/no-hash-allowlisted.rs index 1cd7f672..f060b729 100644 --- a/tests/expectations/tests/no-hash-allowlisted.rs +++ b/tests/expectations/tests/no-hash-allowlisted.rs @@ -23,7 +23,11 @@ fn bindgen_test_layout_NoHash() { concat!("Alignment of ", stringify!(NoHash)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<NoHash>())).i as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<NoHash>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).i) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(NoHash), "::", stringify!(i)) ); diff --git a/tests/expectations/tests/no-partialeq-allowlisted.rs b/tests/expectations/tests/no-partialeq-allowlisted.rs index cd3ed3b9..758b4670 100644 --- a/tests/expectations/tests/no-partialeq-allowlisted.rs +++ b/tests/expectations/tests/no-partialeq-allowlisted.rs @@ -24,7 +24,9 @@ fn bindgen_test_layout_NoPartialEq() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<NoPartialEq>())).i as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<NoPartialEq>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).i) as usize - ptr as usize }, 0usize, concat!( diff --git a/tests/expectations/tests/no-recursive-allowlisting.rs b/tests/expectations/tests/no-recursive-allowlisting.rs index 0aa0b5e3..32907d6e 100644 --- a/tests/expectations/tests/no-recursive-allowlisting.rs +++ b/tests/expectations/tests/no-recursive-allowlisting.rs @@ -25,7 +25,11 @@ fn bindgen_test_layout_Foo() { concat!("Alignment of ", stringify!(Foo)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Foo>())).baz as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Foo>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).baz) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(Foo), "::", stringify!(baz)) ); diff --git a/tests/expectations/tests/no-std.rs b/tests/expectations/tests/no-std.rs index f63ac451..8fa4a4e5 100644 --- a/tests/expectations/tests/no-std.rs +++ b/tests/expectations/tests/no-std.rs @@ -30,17 +30,29 @@ fn bindgen_test_layout_foo() { concat!("Alignment of ", stringify!(foo)) ); assert_eq!( - unsafe { &(*(::core::ptr::null::<foo>())).a as *const _ as usize }, + unsafe { + let uninit = ::core::mem::MaybeUninit::<foo>::uninit(); + let ptr = uninit.as_ptr(); + ::core::ptr::addr_of!((*ptr).a) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(foo), "::", stringify!(a)) ); assert_eq!( - unsafe { &(*(::core::ptr::null::<foo>())).b as *const _ as usize }, + unsafe { + let uninit = ::core::mem::MaybeUninit::<foo>::uninit(); + let ptr = uninit.as_ptr(); + ::core::ptr::addr_of!((*ptr).b) as usize - ptr as usize + }, 4usize, concat!("Offset of field: ", stringify!(foo), "::", stringify!(b)) ); assert_eq!( - unsafe { &(*(::core::ptr::null::<foo>())).bar as *const _ as usize }, + unsafe { + let uninit = ::core::mem::MaybeUninit::<foo>::uninit(); + let ptr = uninit.as_ptr(); + ::core::ptr::addr_of!((*ptr).bar) as usize - ptr as usize + }, 8usize, concat!("Offset of field: ", stringify!(foo), "::", stringify!(bar)) ); diff --git a/tests/expectations/tests/no_copy_allowlisted.rs b/tests/expectations/tests/no_copy_allowlisted.rs index fa53bb66..db895e48 100644 --- a/tests/expectations/tests/no_copy_allowlisted.rs +++ b/tests/expectations/tests/no_copy_allowlisted.rs @@ -23,7 +23,11 @@ fn bindgen_test_layout_NoCopy() { concat!("Alignment of ", stringify!(NoCopy)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<NoCopy>())).i as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<NoCopy>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).i) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(NoCopy), "::", stringify!(i)) ); diff --git a/tests/expectations/tests/no_debug_allowlisted.rs b/tests/expectations/tests/no_debug_allowlisted.rs index e240d645..6722fc99 100644 --- a/tests/expectations/tests/no_debug_allowlisted.rs +++ b/tests/expectations/tests/no_debug_allowlisted.rs @@ -23,7 +23,11 @@ fn bindgen_test_layout_NoDebug() { concat!("Alignment of ", stringify!(NoDebug)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<NoDebug>())).i as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<NoDebug>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).i) as usize - ptr as usize + }, 0usize, concat!( "Offset of field: ", diff --git a/tests/expectations/tests/no_default_allowlisted.rs b/tests/expectations/tests/no_default_allowlisted.rs index 980f1575..930c6114 100644 --- a/tests/expectations/tests/no_default_allowlisted.rs +++ b/tests/expectations/tests/no_default_allowlisted.rs @@ -23,7 +23,11 @@ fn bindgen_test_layout_NoDefault() { concat!("Alignment of ", stringify!(NoDefault)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<NoDefault>())).i as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<NoDefault>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).i) as usize - ptr as usize + }, 0usize, concat!( "Offset of field: ", diff --git a/tests/expectations/tests/non-type-params.rs b/tests/expectations/tests/non-type-params.rs index acd7a09f..9572d69c 100644 --- a/tests/expectations/tests/non-type-params.rs +++ b/tests/expectations/tests/non-type-params.rs @@ -28,8 +28,9 @@ fn bindgen_test_layout_UsesArray() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<UsesArray>())).array_char_16 as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<UsesArray>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).array_char_16) as usize - ptr as usize }, 0usize, concat!( @@ -41,8 +42,9 @@ fn bindgen_test_layout_UsesArray() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<UsesArray>())).array_bool_8 as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<UsesArray>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).array_bool_8) as usize - ptr as usize }, 16usize, concat!( @@ -54,8 +56,9 @@ fn bindgen_test_layout_UsesArray() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<UsesArray>())).array_int_4 as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<UsesArray>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).array_int_4) as usize - ptr as usize }, 24usize, concat!( diff --git a/tests/expectations/tests/objc_interface_type.rs b/tests/expectations/tests/objc_interface_type.rs index 4ffb15d3..41607b79 100644 --- a/tests/expectations/tests/objc_interface_type.rs +++ b/tests/expectations/tests/objc_interface_type.rs @@ -45,7 +45,9 @@ fn bindgen_test_layout_FooStruct() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<FooStruct>())).foo as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<FooStruct>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).foo) as usize - ptr as usize }, 0usize, concat!( diff --git a/tests/expectations/tests/opaque-template-inst-member-2.rs b/tests/expectations/tests/opaque-template-inst-member-2.rs index f47aff05..e341c689 100644 --- a/tests/expectations/tests/opaque-template-inst-member-2.rs +++ b/tests/expectations/tests/opaque-template-inst-member-2.rs @@ -33,8 +33,10 @@ fn bindgen_test_layout_ContainsOpaqueTemplate() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<ContainsOpaqueTemplate>())).mBlah as *const _ - as usize + let uninit = + ::std::mem::MaybeUninit::<ContainsOpaqueTemplate>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mBlah) as usize - ptr as usize }, 0usize, concat!( @@ -46,8 +48,10 @@ fn bindgen_test_layout_ContainsOpaqueTemplate() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<ContainsOpaqueTemplate>())).mBaz as *const _ - as usize + let uninit = + ::std::mem::MaybeUninit::<ContainsOpaqueTemplate>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mBaz) as usize - ptr as usize }, 4usize, concat!( @@ -79,8 +83,10 @@ fn bindgen_test_layout_InheritsOpaqueTemplate() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<InheritsOpaqueTemplate>())).wow as *const _ - as usize + let uninit = + ::std::mem::MaybeUninit::<InheritsOpaqueTemplate>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).wow) as usize - ptr as usize }, 8usize, concat!( diff --git a/tests/expectations/tests/opaque-template-inst-member.rs b/tests/expectations/tests/opaque-template-inst-member.rs index a3c67784..ef2b3eda 100644 --- a/tests/expectations/tests/opaque-template-inst-member.rs +++ b/tests/expectations/tests/opaque-template-inst-member.rs @@ -31,8 +31,10 @@ fn bindgen_test_layout_ContainsOpaqueTemplate() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<ContainsOpaqueTemplate>())).mBlah as *const _ - as usize + let uninit = + ::std::mem::MaybeUninit::<ContainsOpaqueTemplate>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mBlah) as usize - ptr as usize }, 0usize, concat!( @@ -44,8 +46,10 @@ fn bindgen_test_layout_ContainsOpaqueTemplate() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<ContainsOpaqueTemplate>())).mBaz as *const _ - as usize + let uninit = + ::std::mem::MaybeUninit::<ContainsOpaqueTemplate>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mBaz) as usize - ptr as usize }, 404usize, concat!( @@ -91,8 +95,10 @@ fn bindgen_test_layout_InheritsOpaqueTemplate() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<InheritsOpaqueTemplate>())).wow as *const _ - as usize + let uninit = + ::std::mem::MaybeUninit::<InheritsOpaqueTemplate>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).wow) as usize - ptr as usize }, 408usize, concat!( diff --git a/tests/expectations/tests/opaque-template-instantiation-namespaced.rs b/tests/expectations/tests/opaque-template-instantiation-namespaced.rs index e972443e..fa1ed3b8 100644 --- a/tests/expectations/tests/opaque-template-instantiation-namespaced.rs +++ b/tests/expectations/tests/opaque-template-instantiation-namespaced.rs @@ -47,7 +47,9 @@ pub mod root { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<Foo>())).c as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<Foo>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).c) as usize - ptr as usize }, 0usize, concat!( @@ -77,7 +79,9 @@ pub mod root { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<Bar>())).i as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<Bar>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).i) as usize - ptr as usize }, 0usize, concat!( @@ -107,8 +111,10 @@ pub mod root { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<ContainsInstantiation>())).not_opaque - as *const _ as usize + let uninit = :: std :: mem :: MaybeUninit :: < ContainsInstantiation > :: uninit () ; + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).not_opaque) as usize - + ptr as usize }, 0usize, concat!( @@ -150,8 +156,11 @@ pub mod root { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<ContainsOpaqueInstantiation>())) - .opaque as *const _ as usize + let uninit = ::std::mem::MaybeUninit::< + ContainsOpaqueInstantiation, + >::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).opaque) as usize - ptr as usize }, 0usize, concat!( diff --git a/tests/expectations/tests/opaque-template-instantiation.rs b/tests/expectations/tests/opaque-template-instantiation.rs index 6f0f31b3..994e59a2 100644 --- a/tests/expectations/tests/opaque-template-instantiation.rs +++ b/tests/expectations/tests/opaque-template-instantiation.rs @@ -39,8 +39,10 @@ fn bindgen_test_layout_ContainsInstantiation() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<ContainsInstantiation>())).not_opaque - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<ContainsInstantiation>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).not_opaque) as usize - ptr as usize }, 0usize, concat!( @@ -79,8 +81,11 @@ fn bindgen_test_layout_ContainsOpaqueInstantiation() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<ContainsOpaqueInstantiation>())).opaque - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<ContainsOpaqueInstantiation>::uninit( + ); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).opaque) as usize - ptr as usize }, 0usize, concat!( diff --git a/tests/expectations/tests/opaque_in_struct.rs b/tests/expectations/tests/opaque_in_struct.rs index 980df3d6..f900e5fd 100644 --- a/tests/expectations/tests/opaque_in_struct.rs +++ b/tests/expectations/tests/opaque_in_struct.rs @@ -44,7 +44,9 @@ fn bindgen_test_layout_container() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<container>())).contained as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<container>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).contained) as usize - ptr as usize }, 0usize, concat!( diff --git a/tests/expectations/tests/opaque_pointer.rs b/tests/expectations/tests/opaque_pointer.rs index 90b019b2..9d3af55f 100644 --- a/tests/expectations/tests/opaque_pointer.rs +++ b/tests/expectations/tests/opaque_pointer.rs @@ -52,8 +52,9 @@ fn bindgen_test_layout_WithOpaquePtr() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<WithOpaquePtr>())).whatever as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<WithOpaquePtr>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).whatever) as usize - ptr as usize }, 0usize, concat!( @@ -65,7 +66,9 @@ fn bindgen_test_layout_WithOpaquePtr() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<WithOpaquePtr>())).other as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<WithOpaquePtr>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).other) as usize - ptr as usize }, 8usize, concat!( @@ -77,7 +80,9 @@ fn bindgen_test_layout_WithOpaquePtr() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<WithOpaquePtr>())).t as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<WithOpaquePtr>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).t) as usize - ptr as usize }, 12usize, concat!( diff --git a/tests/expectations/tests/packed-n-with-padding.rs b/tests/expectations/tests/packed-n-with-padding.rs index 13cb0306..4039605a 100644 --- a/tests/expectations/tests/packed-n-with-padding.rs +++ b/tests/expectations/tests/packed-n-with-padding.rs @@ -26,22 +26,38 @@ fn bindgen_test_layout_Packed() { concat!("Alignment of ", stringify!(Packed)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Packed>())).a as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Packed>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).a) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(Packed), "::", stringify!(a)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Packed>())).b as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Packed>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).b) as usize - ptr as usize + }, 2usize, concat!("Offset of field: ", stringify!(Packed), "::", stringify!(b)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Packed>())).c as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Packed>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).c) as usize - ptr as usize + }, 4usize, concat!("Offset of field: ", stringify!(Packed), "::", stringify!(c)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Packed>())).d as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Packed>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).d) as usize - ptr as usize + }, 6usize, concat!("Offset of field: ", stringify!(Packed), "::", stringify!(d)) ); diff --git a/tests/expectations/tests/private.rs b/tests/expectations/tests/private.rs index 328f97f0..568701eb 100644 --- a/tests/expectations/tests/private.rs +++ b/tests/expectations/tests/private.rs @@ -26,8 +26,9 @@ fn bindgen_test_layout_HasPrivate() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<HasPrivate>())).mNotPrivate as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<HasPrivate>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mNotPrivate) as usize - ptr as usize }, 0usize, concat!( @@ -39,8 +40,9 @@ fn bindgen_test_layout_HasPrivate() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<HasPrivate>())).mIsPrivate as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<HasPrivate>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mIsPrivate) as usize - ptr as usize }, 4usize, concat!( @@ -72,8 +74,9 @@ fn bindgen_test_layout_VeryPrivate() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<VeryPrivate>())).mIsPrivate as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<VeryPrivate>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mIsPrivate) as usize - ptr as usize }, 0usize, concat!( @@ -85,8 +88,9 @@ fn bindgen_test_layout_VeryPrivate() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<VeryPrivate>())).mIsAlsoPrivate as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<VeryPrivate>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mIsAlsoPrivate) as usize - ptr as usize }, 4usize, concat!( @@ -119,8 +123,9 @@ fn bindgen_test_layout_ContradictPrivate() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<ContradictPrivate>())).mNotPrivate - as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<ContradictPrivate>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mNotPrivate) as usize - ptr as usize }, 0usize, concat!( @@ -132,8 +137,9 @@ fn bindgen_test_layout_ContradictPrivate() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<ContradictPrivate>())).mIsPrivate as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<ContradictPrivate>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mIsPrivate) as usize - ptr as usize }, 4usize, concat!( diff --git a/tests/expectations/tests/private_fields.rs b/tests/expectations/tests/private_fields.rs index 92a4bf65..887a7360 100644 --- a/tests/expectations/tests/private_fields.rs +++ b/tests/expectations/tests/private_fields.rs @@ -110,7 +110,11 @@ fn bindgen_test_layout_PubPriv() { concat!("Alignment of ", stringify!(PubPriv)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<PubPriv>())).x as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<PubPriv>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).x) as usize - ptr as usize + }, 0usize, concat!( "Offset of field: ", @@ -120,7 +124,11 @@ fn bindgen_test_layout_PubPriv() { ) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<PubPriv>())).y as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<PubPriv>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).y) as usize - ptr as usize + }, 4usize, concat!( "Offset of field: ", @@ -346,7 +354,11 @@ fn bindgen_test_layout_Base() { concat!("Alignment of ", stringify!(Base)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Base>())).member as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Base>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).member) as usize - ptr as usize + }, 0usize, concat!( "Offset of field: ", @@ -417,8 +429,11 @@ fn bindgen_test_layout_WithAnonStruct__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<WithAnonStruct__bindgen_ty_1>())).a - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<WithAnonStruct__bindgen_ty_1>::uninit( + ); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).a) as usize - ptr as usize }, 0usize, concat!( @@ -448,8 +463,11 @@ fn bindgen_test_layout_WithAnonStruct__bindgen_ty_2() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<WithAnonStruct__bindgen_ty_2>())).b - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<WithAnonStruct__bindgen_ty_2>::uninit( + ); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).b) as usize - ptr as usize }, 0usize, concat!( diff --git a/tests/expectations/tests/reparented_replacement.rs b/tests/expectations/tests/reparented_replacement.rs index 1f4fa6e1..d04eaa25 100644 --- a/tests/expectations/tests/reparented_replacement.rs +++ b/tests/expectations/tests/reparented_replacement.rs @@ -32,7 +32,9 @@ pub mod root { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<Bar>())).bazz as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<Bar>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).bazz) as usize - ptr as usize }, 0usize, concat!( diff --git a/tests/expectations/tests/replace_use.rs b/tests/expectations/tests/replace_use.rs index 7bec94b8..ea1da987 100644 --- a/tests/expectations/tests/replace_use.rs +++ b/tests/expectations/tests/replace_use.rs @@ -29,7 +29,11 @@ fn bindgen_test_layout_Test() { concat!("Alignment of ", stringify!(Test)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Test>())).a as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Test>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).a) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(Test), "::", stringify!(a)) ); diff --git a/tests/expectations/tests/repr-align.rs b/tests/expectations/tests/repr-align.rs index df235368..38f55428 100644 --- a/tests/expectations/tests/repr-align.rs +++ b/tests/expectations/tests/repr-align.rs @@ -26,12 +26,20 @@ fn bindgen_test_layout_a() { concat!("Alignment of ", stringify!(a)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<a>())).b as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<a>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).b) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(a), "::", stringify!(b)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<a>())).c as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<a>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).c) as usize - ptr as usize + }, 4usize, concat!("Offset of field: ", stringify!(a), "::", stringify!(c)) ); @@ -56,12 +64,20 @@ fn bindgen_test_layout_b() { concat!("Alignment of ", stringify!(b)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<b>())).b as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<b>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).b) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(b), "::", stringify!(b)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<b>())).c as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<b>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).c) as usize - ptr as usize + }, 4usize, concat!("Offset of field: ", stringify!(b), "::", stringify!(c)) ); diff --git a/tests/expectations/tests/same_struct_name_in_different_namespaces.rs b/tests/expectations/tests/same_struct_name_in_different_namespaces.rs index 056b671b..91c4750a 100644 --- a/tests/expectations/tests/same_struct_name_in_different_namespaces.rs +++ b/tests/expectations/tests/same_struct_name_in_different_namespaces.rs @@ -30,7 +30,9 @@ fn bindgen_test_layout_JS_shadow_Zone() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<JS_shadow_Zone>())).x as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<JS_shadow_Zone>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).x) as usize - ptr as usize }, 0usize, concat!( @@ -42,7 +44,9 @@ fn bindgen_test_layout_JS_shadow_Zone() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<JS_shadow_Zone>())).y as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<JS_shadow_Zone>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).y) as usize - ptr as usize }, 4usize, concat!( diff --git a/tests/expectations/tests/sentry-defined-multiple-times.rs b/tests/expectations/tests/sentry-defined-multiple-times.rs index 5f2ec54d..a11a72b3 100644 --- a/tests/expectations/tests/sentry-defined-multiple-times.rs +++ b/tests/expectations/tests/sentry-defined-multiple-times.rs @@ -41,8 +41,10 @@ pub mod root { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<sentry>())).i_am_plain_sentry - as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<sentry>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).i_am_plain_sentry) as usize - + ptr as usize }, 0usize, concat!( @@ -90,9 +92,14 @@ pub mod root { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<NotTemplateWrapper_sentry>())) - .i_am_not_template_wrapper_sentry - as *const _ as usize + let uninit = ::std::mem::MaybeUninit::< + NotTemplateWrapper_sentry, + >::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!( + (*ptr).i_am_not_template_wrapper_sentry + ) as usize - + ptr as usize }, 0usize, concat!( @@ -133,9 +140,14 @@ pub mod root { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<InlineNotTemplateWrapper_sentry>())) - .i_am_inline_not_template_wrapper_sentry - as *const _ as usize + let uninit = ::std::mem::MaybeUninit::< + InlineNotTemplateWrapper_sentry, + >::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!( + (*ptr).i_am_inline_not_template_wrapper_sentry + ) as usize - + ptr as usize }, 0usize, concat!( @@ -240,11 +252,13 @@ pub mod root { ); assert_eq!( unsafe { - &(*(::std::ptr::null::< + let uninit = ::std::mem::MaybeUninit::< OuterDoubleWrapper_InnerDoubleWrapper_sentry, - >())) - .i_am_double_wrapper_sentry as *const _ - as usize + >::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).i_am_double_wrapper_sentry) + as usize - + ptr as usize }, 0usize, concat!( @@ -275,7 +289,7 @@ pub mod root { ) { assert_eq ! (:: std :: mem :: size_of :: < OuterDoubleInlineWrapper_InnerDoubleInlineWrapper_sentry > () , 4usize , concat ! ("Size of: " , stringify ! (OuterDoubleInlineWrapper_InnerDoubleInlineWrapper_sentry))); assert_eq ! (:: std :: mem :: align_of :: < OuterDoubleInlineWrapper_InnerDoubleInlineWrapper_sentry > () , 4usize , concat ! ("Alignment of " , stringify ! (OuterDoubleInlineWrapper_InnerDoubleInlineWrapper_sentry))); - assert_eq ! (unsafe { & (* (:: std :: ptr :: null :: < OuterDoubleInlineWrapper_InnerDoubleInlineWrapper_sentry > ())) . i_am_double_wrapper_inline_sentry as * const _ as usize } , 0usize , concat ! ("Offset of field: " , stringify ! (OuterDoubleInlineWrapper_InnerDoubleInlineWrapper_sentry) , "::" , stringify ! (i_am_double_wrapper_inline_sentry))); + assert_eq ! (unsafe { let uninit = :: std :: mem :: MaybeUninit :: < OuterDoubleInlineWrapper_InnerDoubleInlineWrapper_sentry > :: uninit () ; let ptr = uninit . as_ptr () ; :: std :: ptr :: addr_of ! ((* ptr) . i_am_double_wrapper_inline_sentry) as usize - ptr as usize } , 0usize , concat ! ("Offset of field: " , stringify ! (OuterDoubleInlineWrapper_InnerDoubleInlineWrapper_sentry) , "::" , stringify ! (i_am_double_wrapper_inline_sentry))); } #[test] fn bindgen_test_layout_OuterDoubleInlineWrapper_InnerDoubleInlineWrapper( @@ -348,8 +362,11 @@ pub mod root { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<sentry>())).i_am_outside_namespace_sentry - as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<sentry>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).i_am_outside_namespace_sentry) + as usize - + ptr as usize }, 0usize, concat!( diff --git a/tests/expectations/tests/size_t_is_usize.rs b/tests/expectations/tests/size_t_is_usize.rs index 0d9ab2ca..60e566f0 100644 --- a/tests/expectations/tests/size_t_is_usize.rs +++ b/tests/expectations/tests/size_t_is_usize.rs @@ -25,17 +25,29 @@ fn bindgen_test_layout_A() { concat!("Alignment of ", stringify!(A)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<A>())).len as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<A>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).len) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(A), "::", stringify!(len)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<A>())).offset as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<A>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).offset) as usize - ptr as usize + }, 8usize, concat!("Offset of field: ", stringify!(A), "::", stringify!(offset)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<A>())).next as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<A>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).next) as usize - ptr as usize + }, 16usize, concat!("Offset of field: ", stringify!(A), "::", stringify!(next)) ); diff --git a/tests/expectations/tests/size_t_template.rs b/tests/expectations/tests/size_t_template.rs index 6796bc9f..512e0552 100644 --- a/tests/expectations/tests/size_t_template.rs +++ b/tests/expectations/tests/size_t_template.rs @@ -23,7 +23,11 @@ fn bindgen_test_layout_C() { concat!("Alignment of ", stringify!(C)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<C>())).arr as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<C>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).arr) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(C), "::", stringify!(arr)) ); diff --git a/tests/expectations/tests/struct_containing_forward_declared_struct.rs b/tests/expectations/tests/struct_containing_forward_declared_struct.rs index 7298095e..d61e9dc3 100644 --- a/tests/expectations/tests/struct_containing_forward_declared_struct.rs +++ b/tests/expectations/tests/struct_containing_forward_declared_struct.rs @@ -23,7 +23,11 @@ fn bindgen_test_layout_a() { concat!("Alignment of ", stringify!(a)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<a>())).val_a as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<a>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).val_a) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(a), "::", stringify!(val_a)) ); @@ -55,7 +59,11 @@ fn bindgen_test_layout_b() { concat!("Alignment of ", stringify!(b)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<b>())).val_b as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<b>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).val_b) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(b), "::", stringify!(val_b)) ); diff --git a/tests/expectations/tests/struct_typedef.rs b/tests/expectations/tests/struct_typedef.rs index 34c9dbd2..9a646afa 100644 --- a/tests/expectations/tests/struct_typedef.rs +++ b/tests/expectations/tests/struct_typedef.rs @@ -24,8 +24,10 @@ fn bindgen_test_layout_typedef_named_struct() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<typedef_named_struct>())).has_name - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<typedef_named_struct>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).has_name) as usize - ptr as usize }, 0usize, concat!( @@ -55,8 +57,9 @@ fn bindgen_test_layout__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<_bindgen_ty_1>())).no_name as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<_bindgen_ty_1>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).no_name) as usize - ptr as usize }, 0usize, concat!( diff --git a/tests/expectations/tests/struct_typedef_ns.rs b/tests/expectations/tests/struct_typedef_ns.rs index ef91fe49..687b31ea 100644 --- a/tests/expectations/tests/struct_typedef_ns.rs +++ b/tests/expectations/tests/struct_typedef_ns.rs @@ -31,8 +31,10 @@ pub mod root { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<typedef_struct>())).foo as *const _ - as usize + let uninit = + ::std::mem::MaybeUninit::<typedef_struct>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).foo) as usize - ptr as usize }, 0usize, concat!( @@ -71,8 +73,10 @@ pub mod root { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<_bindgen_ty_1>())).foo as *const _ - as usize + let uninit = + ::std::mem::MaybeUninit::<_bindgen_ty_1>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).foo) as usize - ptr as usize }, 0usize, concat!( diff --git a/tests/expectations/tests/struct_with_anon_struct.rs b/tests/expectations/tests/struct_with_anon_struct.rs index 0f5d3dac..e34d9294 100644 --- a/tests/expectations/tests/struct_with_anon_struct.rs +++ b/tests/expectations/tests/struct_with_anon_struct.rs @@ -30,7 +30,9 @@ fn bindgen_test_layout_foo__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<foo__bindgen_ty_1>())).a as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<foo__bindgen_ty_1>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).a) as usize - ptr as usize }, 0usize, concat!( @@ -42,7 +44,9 @@ fn bindgen_test_layout_foo__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<foo__bindgen_ty_1>())).b as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<foo__bindgen_ty_1>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).b) as usize - ptr as usize }, 4usize, concat!( @@ -66,7 +70,11 @@ fn bindgen_test_layout_foo() { concat!("Alignment of ", stringify!(foo)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<foo>())).bar as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<foo>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).bar) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(foo), "::", stringify!(bar)) ); diff --git a/tests/expectations/tests/struct_with_anon_struct_array.rs b/tests/expectations/tests/struct_with_anon_struct_array.rs index d5a50448..c5b0fcc5 100644 --- a/tests/expectations/tests/struct_with_anon_struct_array.rs +++ b/tests/expectations/tests/struct_with_anon_struct_array.rs @@ -31,7 +31,9 @@ fn bindgen_test_layout_foo__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<foo__bindgen_ty_1>())).a as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<foo__bindgen_ty_1>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).a) as usize - ptr as usize }, 0usize, concat!( @@ -43,7 +45,9 @@ fn bindgen_test_layout_foo__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<foo__bindgen_ty_1>())).b as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<foo__bindgen_ty_1>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).b) as usize - ptr as usize }, 4usize, concat!( @@ -74,7 +78,9 @@ fn bindgen_test_layout_foo__bindgen_ty_2() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<foo__bindgen_ty_2>())).a as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<foo__bindgen_ty_2>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).a) as usize - ptr as usize }, 0usize, concat!( @@ -86,7 +92,9 @@ fn bindgen_test_layout_foo__bindgen_ty_2() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<foo__bindgen_ty_2>())).b as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<foo__bindgen_ty_2>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).b) as usize - ptr as usize }, 4usize, concat!( @@ -110,12 +118,20 @@ fn bindgen_test_layout_foo() { concat!("Alignment of ", stringify!(foo)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<foo>())).bar as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<foo>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).bar) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(foo), "::", stringify!(bar)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<foo>())).baz as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<foo>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).baz) as usize - ptr as usize + }, 16usize, concat!("Offset of field: ", stringify!(foo), "::", stringify!(baz)) ); diff --git a/tests/expectations/tests/struct_with_anon_struct_pointer.rs b/tests/expectations/tests/struct_with_anon_struct_pointer.rs index 0ed19f76..96825124 100644 --- a/tests/expectations/tests/struct_with_anon_struct_pointer.rs +++ b/tests/expectations/tests/struct_with_anon_struct_pointer.rs @@ -30,7 +30,9 @@ fn bindgen_test_layout_foo__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<foo__bindgen_ty_1>())).a as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<foo__bindgen_ty_1>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).a) as usize - ptr as usize }, 0usize, concat!( @@ -42,7 +44,9 @@ fn bindgen_test_layout_foo__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<foo__bindgen_ty_1>())).b as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<foo__bindgen_ty_1>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).b) as usize - ptr as usize }, 4usize, concat!( @@ -66,7 +70,11 @@ fn bindgen_test_layout_foo() { concat!("Alignment of ", stringify!(foo)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<foo>())).bar as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<foo>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).bar) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(foo), "::", stringify!(bar)) ); diff --git a/tests/expectations/tests/struct_with_anon_union.rs b/tests/expectations/tests/struct_with_anon_union.rs index 15b8c9e4..e15939bd 100644 --- a/tests/expectations/tests/struct_with_anon_union.rs +++ b/tests/expectations/tests/struct_with_anon_union.rs @@ -30,7 +30,9 @@ fn bindgen_test_layout_foo__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<foo__bindgen_ty_1>())).a as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<foo__bindgen_ty_1>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).a) as usize - ptr as usize }, 0usize, concat!( @@ -42,7 +44,9 @@ fn bindgen_test_layout_foo__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<foo__bindgen_ty_1>())).b as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<foo__bindgen_ty_1>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).b) as usize - ptr as usize }, 0usize, concat!( @@ -75,7 +79,11 @@ fn bindgen_test_layout_foo() { concat!("Alignment of ", stringify!(foo)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<foo>())).bar as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<foo>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).bar) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(foo), "::", stringify!(bar)) ); diff --git a/tests/expectations/tests/struct_with_anon_union_1_0.rs b/tests/expectations/tests/struct_with_anon_union_1_0.rs index b02c4448..2b7d33b0 100644 --- a/tests/expectations/tests/struct_with_anon_union_1_0.rs +++ b/tests/expectations/tests/struct_with_anon_union_1_0.rs @@ -74,7 +74,9 @@ fn bindgen_test_layout_foo__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<foo__bindgen_ty_1>())).a as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<foo__bindgen_ty_1>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).a) as usize - ptr as usize }, 0usize, concat!( @@ -86,7 +88,9 @@ fn bindgen_test_layout_foo__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<foo__bindgen_ty_1>())).b as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<foo__bindgen_ty_1>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).b) as usize - ptr as usize }, 0usize, concat!( @@ -115,7 +119,11 @@ fn bindgen_test_layout_foo() { concat!("Alignment of ", stringify!(foo)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<foo>())).bar as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<foo>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).bar) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(foo), "::", stringify!(bar)) ); diff --git a/tests/expectations/tests/struct_with_anon_unnamed_struct.rs b/tests/expectations/tests/struct_with_anon_unnamed_struct.rs index 30751e7d..a6806046 100644 --- a/tests/expectations/tests/struct_with_anon_unnamed_struct.rs +++ b/tests/expectations/tests/struct_with_anon_unnamed_struct.rs @@ -30,7 +30,9 @@ fn bindgen_test_layout_foo__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<foo__bindgen_ty_1>())).a as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<foo__bindgen_ty_1>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).a) as usize - ptr as usize }, 0usize, concat!( @@ -42,7 +44,9 @@ fn bindgen_test_layout_foo__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<foo__bindgen_ty_1>())).b as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<foo__bindgen_ty_1>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).b) as usize - ptr as usize }, 4usize, concat!( diff --git a/tests/expectations/tests/struct_with_anon_unnamed_union.rs b/tests/expectations/tests/struct_with_anon_unnamed_union.rs index 17a83574..07002538 100644 --- a/tests/expectations/tests/struct_with_anon_unnamed_union.rs +++ b/tests/expectations/tests/struct_with_anon_unnamed_union.rs @@ -30,7 +30,9 @@ fn bindgen_test_layout_foo__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<foo__bindgen_ty_1>())).a as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<foo__bindgen_ty_1>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).a) as usize - ptr as usize }, 0usize, concat!( @@ -42,7 +44,9 @@ fn bindgen_test_layout_foo__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<foo__bindgen_ty_1>())).b as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<foo__bindgen_ty_1>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).b) as usize - ptr as usize }, 0usize, concat!( diff --git a/tests/expectations/tests/struct_with_anon_unnamed_union_1_0.rs b/tests/expectations/tests/struct_with_anon_unnamed_union_1_0.rs index f72abd2b..622dbcbe 100644 --- a/tests/expectations/tests/struct_with_anon_unnamed_union_1_0.rs +++ b/tests/expectations/tests/struct_with_anon_unnamed_union_1_0.rs @@ -74,7 +74,9 @@ fn bindgen_test_layout_foo__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<foo__bindgen_ty_1>())).a as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<foo__bindgen_ty_1>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).a) as usize - ptr as usize }, 0usize, concat!( @@ -86,7 +88,9 @@ fn bindgen_test_layout_foo__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<foo__bindgen_ty_1>())).b as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<foo__bindgen_ty_1>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).b) as usize - ptr as usize }, 0usize, concat!( diff --git a/tests/expectations/tests/struct_with_bitfields.rs b/tests/expectations/tests/struct_with_bitfields.rs index 2e95726f..8a7d070e 100644 --- a/tests/expectations/tests/struct_with_bitfields.rs +++ b/tests/expectations/tests/struct_with_bitfields.rs @@ -113,7 +113,11 @@ fn bindgen_test_layout_bitfield() { concat!("Alignment of ", stringify!(bitfield)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<bitfield>())).e as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<bitfield>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).e) as usize - ptr as usize + }, 4usize, concat!( "Offset of field: ", diff --git a/tests/expectations/tests/struct_with_derive_debug.rs b/tests/expectations/tests/struct_with_derive_debug.rs index 721ba96c..9ab32de0 100644 --- a/tests/expectations/tests/struct_with_derive_debug.rs +++ b/tests/expectations/tests/struct_with_derive_debug.rs @@ -24,7 +24,9 @@ fn bindgen_test_layout_LittleArray() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<LittleArray>())).a as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<LittleArray>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).a) as usize - ptr as usize }, 0usize, concat!( @@ -53,7 +55,11 @@ fn bindgen_test_layout_BigArray() { concat!("Alignment of ", stringify!(BigArray)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<BigArray>())).a as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<BigArray>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).a) as usize - ptr as usize + }, 0usize, concat!( "Offset of field: ", @@ -91,7 +97,9 @@ fn bindgen_test_layout_WithLittleArray() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<WithLittleArray>())).a as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<WithLittleArray>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).a) as usize - ptr as usize }, 0usize, concat!( @@ -121,7 +129,9 @@ fn bindgen_test_layout_WithBigArray() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<WithBigArray>())).a as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<WithBigArray>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).a) as usize - ptr as usize }, 0usize, concat!( diff --git a/tests/expectations/tests/struct_with_large_array.rs b/tests/expectations/tests/struct_with_large_array.rs index 56179c20..e323247f 100644 --- a/tests/expectations/tests/struct_with_large_array.rs +++ b/tests/expectations/tests/struct_with_large_array.rs @@ -24,7 +24,9 @@ fn bindgen_test_layout_S() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<S>())).large_array as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<S>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).large_array) as usize - ptr as usize }, 0usize, concat!( diff --git a/tests/expectations/tests/struct_with_nesting.rs b/tests/expectations/tests/struct_with_nesting.rs index 7ced63e6..897b757d 100644 --- a/tests/expectations/tests/struct_with_nesting.rs +++ b/tests/expectations/tests/struct_with_nesting.rs @@ -38,8 +38,11 @@ fn bindgen_test_layout_foo__bindgen_ty_1__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<foo__bindgen_ty_1__bindgen_ty_1>())).c1 - as *const _ as usize + let uninit = ::std::mem::MaybeUninit::< + foo__bindgen_ty_1__bindgen_ty_1, + >::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).c1) as usize - ptr as usize }, 0usize, concat!( @@ -51,8 +54,11 @@ fn bindgen_test_layout_foo__bindgen_ty_1__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<foo__bindgen_ty_1__bindgen_ty_1>())).c2 - as *const _ as usize + let uninit = ::std::mem::MaybeUninit::< + foo__bindgen_ty_1__bindgen_ty_1, + >::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).c2) as usize - ptr as usize }, 2usize, concat!( @@ -85,8 +91,11 @@ fn bindgen_test_layout_foo__bindgen_ty_1__bindgen_ty_2() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<foo__bindgen_ty_1__bindgen_ty_2>())).d1 - as *const _ as usize + let uninit = ::std::mem::MaybeUninit::< + foo__bindgen_ty_1__bindgen_ty_2, + >::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).d1) as usize - ptr as usize }, 0usize, concat!( @@ -98,8 +107,11 @@ fn bindgen_test_layout_foo__bindgen_ty_1__bindgen_ty_2() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<foo__bindgen_ty_1__bindgen_ty_2>())).d2 - as *const _ as usize + let uninit = ::std::mem::MaybeUninit::< + foo__bindgen_ty_1__bindgen_ty_2, + >::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).d2) as usize - ptr as usize }, 1usize, concat!( @@ -111,8 +123,11 @@ fn bindgen_test_layout_foo__bindgen_ty_1__bindgen_ty_2() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<foo__bindgen_ty_1__bindgen_ty_2>())).d3 - as *const _ as usize + let uninit = ::std::mem::MaybeUninit::< + foo__bindgen_ty_1__bindgen_ty_2, + >::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).d3) as usize - ptr as usize }, 2usize, concat!( @@ -124,8 +139,11 @@ fn bindgen_test_layout_foo__bindgen_ty_1__bindgen_ty_2() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<foo__bindgen_ty_1__bindgen_ty_2>())).d4 - as *const _ as usize + let uninit = ::std::mem::MaybeUninit::< + foo__bindgen_ty_1__bindgen_ty_2, + >::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).d4) as usize - ptr as usize }, 3usize, concat!( @@ -150,7 +168,9 @@ fn bindgen_test_layout_foo__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<foo__bindgen_ty_1>())).b as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<foo__bindgen_ty_1>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).b) as usize - ptr as usize }, 0usize, concat!( @@ -183,7 +203,11 @@ fn bindgen_test_layout_foo() { concat!("Alignment of ", stringify!(foo)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<foo>())).a as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<foo>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).a) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(foo), "::", stringify!(a)) ); diff --git a/tests/expectations/tests/struct_with_nesting_1_0.rs b/tests/expectations/tests/struct_with_nesting_1_0.rs index 9f27161a..04d72bc0 100644 --- a/tests/expectations/tests/struct_with_nesting_1_0.rs +++ b/tests/expectations/tests/struct_with_nesting_1_0.rs @@ -82,8 +82,11 @@ fn bindgen_test_layout_foo__bindgen_ty_1__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<foo__bindgen_ty_1__bindgen_ty_1>())).c1 - as *const _ as usize + let uninit = ::std::mem::MaybeUninit::< + foo__bindgen_ty_1__bindgen_ty_1, + >::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).c1) as usize - ptr as usize }, 0usize, concat!( @@ -95,8 +98,11 @@ fn bindgen_test_layout_foo__bindgen_ty_1__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<foo__bindgen_ty_1__bindgen_ty_1>())).c2 - as *const _ as usize + let uninit = ::std::mem::MaybeUninit::< + foo__bindgen_ty_1__bindgen_ty_1, + >::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).c2) as usize - ptr as usize }, 2usize, concat!( @@ -134,8 +140,11 @@ fn bindgen_test_layout_foo__bindgen_ty_1__bindgen_ty_2() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<foo__bindgen_ty_1__bindgen_ty_2>())).d1 - as *const _ as usize + let uninit = ::std::mem::MaybeUninit::< + foo__bindgen_ty_1__bindgen_ty_2, + >::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).d1) as usize - ptr as usize }, 0usize, concat!( @@ -147,8 +156,11 @@ fn bindgen_test_layout_foo__bindgen_ty_1__bindgen_ty_2() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<foo__bindgen_ty_1__bindgen_ty_2>())).d2 - as *const _ as usize + let uninit = ::std::mem::MaybeUninit::< + foo__bindgen_ty_1__bindgen_ty_2, + >::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).d2) as usize - ptr as usize }, 1usize, concat!( @@ -160,8 +172,11 @@ fn bindgen_test_layout_foo__bindgen_ty_1__bindgen_ty_2() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<foo__bindgen_ty_1__bindgen_ty_2>())).d3 - as *const _ as usize + let uninit = ::std::mem::MaybeUninit::< + foo__bindgen_ty_1__bindgen_ty_2, + >::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).d3) as usize - ptr as usize }, 2usize, concat!( @@ -173,8 +188,11 @@ fn bindgen_test_layout_foo__bindgen_ty_1__bindgen_ty_2() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<foo__bindgen_ty_1__bindgen_ty_2>())).d4 - as *const _ as usize + let uninit = ::std::mem::MaybeUninit::< + foo__bindgen_ty_1__bindgen_ty_2, + >::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).d4) as usize - ptr as usize }, 3usize, concat!( @@ -204,7 +222,9 @@ fn bindgen_test_layout_foo__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<foo__bindgen_ty_1>())).b as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<foo__bindgen_ty_1>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).b) as usize - ptr as usize }, 0usize, concat!( @@ -233,7 +253,11 @@ fn bindgen_test_layout_foo() { concat!("Alignment of ", stringify!(foo)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<foo>())).a as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<foo>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).a) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(foo), "::", stringify!(a)) ); diff --git a/tests/expectations/tests/struct_with_packing.rs b/tests/expectations/tests/struct_with_packing.rs index 14ee36fb..8a3b4174 100644 --- a/tests/expectations/tests/struct_with_packing.rs +++ b/tests/expectations/tests/struct_with_packing.rs @@ -24,12 +24,20 @@ fn bindgen_test_layout_a() { concat!("Alignment of ", stringify!(a)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<a>())).b as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<a>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).b) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(a), "::", stringify!(b)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<a>())).c as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<a>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).c) as usize - ptr as usize + }, 1usize, concat!("Offset of field: ", stringify!(a), "::", stringify!(c)) ); diff --git a/tests/expectations/tests/struct_with_struct.rs b/tests/expectations/tests/struct_with_struct.rs index c605c6e2..f62fd057 100644 --- a/tests/expectations/tests/struct_with_struct.rs +++ b/tests/expectations/tests/struct_with_struct.rs @@ -30,7 +30,9 @@ fn bindgen_test_layout_foo__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<foo__bindgen_ty_1>())).x as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<foo__bindgen_ty_1>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).x) as usize - ptr as usize }, 0usize, concat!( @@ -42,7 +44,9 @@ fn bindgen_test_layout_foo__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<foo__bindgen_ty_1>())).y as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<foo__bindgen_ty_1>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).y) as usize - ptr as usize }, 4usize, concat!( @@ -66,7 +70,11 @@ fn bindgen_test_layout_foo() { concat!("Alignment of ", stringify!(foo)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<foo>())).bar as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<foo>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).bar) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(foo), "::", stringify!(bar)) ); diff --git a/tests/expectations/tests/template.rs b/tests/expectations/tests/template.rs index 2e544ec3..7c366328 100644 --- a/tests/expectations/tests/template.rs +++ b/tests/expectations/tests/template.rs @@ -79,13 +79,19 @@ fn bindgen_test_layout_C() { concat!("Alignment of ", stringify!(C)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<C>())).mB as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<C>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mB) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(C), "::", stringify!(mB)) ); assert_eq!( unsafe { - &(*(::std::ptr::null::<C>())).mBConstPtr as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<C>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mBConstPtr) as usize - ptr as usize }, 8usize, concat!( @@ -97,7 +103,10 @@ fn bindgen_test_layout_C() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<C>())).mBConstStructPtr as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<C>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mBConstStructPtr) as usize - + ptr as usize }, 16usize, concat!( @@ -109,8 +118,10 @@ fn bindgen_test_layout_C() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<C>())).mBConstStructPtrArray as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<C>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mBConstStructPtrArray) as usize - + ptr as usize }, 24usize, concat!( @@ -121,7 +132,11 @@ fn bindgen_test_layout_C() { ) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<C>())).mBConst as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<C>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mBConst) as usize - ptr as usize + }, 32usize, concat!( "Offset of field: ", @@ -132,7 +147,9 @@ fn bindgen_test_layout_C() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<C>())).mBVolatile as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<C>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mBVolatile) as usize - ptr as usize }, 36usize, concat!( @@ -144,7 +161,9 @@ fn bindgen_test_layout_C() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<C>())).mBConstBool as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<C>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mBConstBool) as usize - ptr as usize }, 40usize, concat!( @@ -156,7 +175,9 @@ fn bindgen_test_layout_C() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<C>())).mBConstChar as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<C>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mBConstChar) as usize - ptr as usize }, 42usize, concat!( @@ -167,7 +188,11 @@ fn bindgen_test_layout_C() { ) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<C>())).mBArray as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<C>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mBArray) as usize - ptr as usize + }, 44usize, concat!( "Offset of field: ", @@ -178,7 +203,9 @@ fn bindgen_test_layout_C() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<C>())).mBPtrArray as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<C>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mBPtrArray) as usize - ptr as usize }, 48usize, concat!( @@ -190,7 +217,9 @@ fn bindgen_test_layout_C() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<C>())).mBArrayPtr as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<C>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mBArrayPtr) as usize - ptr as usize }, 56usize, concat!( @@ -201,13 +230,19 @@ fn bindgen_test_layout_C() { ) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<C>())).mBRef as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<C>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mBRef) as usize - ptr as usize + }, 64usize, concat!("Offset of field: ", stringify!(C), "::", stringify!(mBRef)) ); assert_eq!( unsafe { - &(*(::std::ptr::null::<C>())).mBConstRef as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<C>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mBConstRef) as usize - ptr as usize }, 72usize, concat!( @@ -218,7 +253,11 @@ fn bindgen_test_layout_C() { ) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<C>())).mPtrRef as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<C>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mPtrRef) as usize - ptr as usize + }, 80usize, concat!( "Offset of field: ", @@ -228,7 +267,11 @@ fn bindgen_test_layout_C() { ) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<C>())).mArrayRef as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<C>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mArrayRef) as usize - ptr as usize + }, 88usize, concat!( "Offset of field: ", @@ -239,7 +282,9 @@ fn bindgen_test_layout_C() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<C>())).mBConstArray as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<C>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mBConstArray) as usize - ptr as usize }, 96usize, concat!( @@ -326,8 +371,9 @@ fn bindgen_test_layout_RootedContainer() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<RootedContainer>())).root as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<RootedContainer>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).root) as usize - ptr as usize }, 0usize, concat!( @@ -382,8 +428,10 @@ fn bindgen_test_layout_PODButContainsDtor() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<PODButContainsDtor>())).member as *const _ - as usize + let uninit = + ::std::mem::MaybeUninit::<PODButContainsDtor>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).member) as usize - ptr as usize }, 0usize, concat!( @@ -428,7 +476,9 @@ fn bindgen_test_layout_POD() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<POD>())).opaque_member as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<POD>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).opaque_member) as usize - ptr as usize }, 0usize, concat!( diff --git a/tests/expectations/tests/test_mixed_header_and_header_contents.rs b/tests/expectations/tests/test_mixed_header_and_header_contents.rs index c97be9b0..76f28dcb 100644 --- a/tests/expectations/tests/test_mixed_header_and_header_contents.rs +++ b/tests/expectations/tests/test_mixed_header_and_header_contents.rs @@ -44,52 +44,92 @@ fn bindgen_test_layout_Test() { concat!("Alignment of ", stringify!(Test)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Test>())).ch as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Test>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).ch) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(Test), "::", stringify!(ch)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Test>())).u as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Test>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).u) as usize - ptr as usize + }, 1usize, concat!("Offset of field: ", stringify!(Test), "::", stringify!(u)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Test>())).d as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Test>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).d) as usize - ptr as usize + }, 2usize, concat!("Offset of field: ", stringify!(Test), "::", stringify!(d)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Test>())).cch as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Test>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).cch) as usize - ptr as usize + }, 3usize, concat!("Offset of field: ", stringify!(Test), "::", stringify!(cch)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Test>())).cu as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Test>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).cu) as usize - ptr as usize + }, 4usize, concat!("Offset of field: ", stringify!(Test), "::", stringify!(cu)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Test>())).cd as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Test>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).cd) as usize - ptr as usize + }, 5usize, concat!("Offset of field: ", stringify!(Test), "::", stringify!(cd)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Test>())).Cch as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Test>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).Cch) as usize - ptr as usize + }, 6usize, concat!("Offset of field: ", stringify!(Test), "::", stringify!(Cch)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Test>())).Cu as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Test>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).Cu) as usize - ptr as usize + }, 7usize, concat!("Offset of field: ", stringify!(Test), "::", stringify!(Cu)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Test>())).Cd as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Test>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).Cd) as usize - ptr as usize + }, 8usize, concat!("Offset of field: ", stringify!(Test), "::", stringify!(Cd)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Test>())).Ccch as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Test>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).Ccch) as usize - ptr as usize + }, 9usize, concat!( "Offset of field: ", @@ -99,12 +139,20 @@ fn bindgen_test_layout_Test() { ) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Test>())).Ccu as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Test>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).Ccu) as usize - ptr as usize + }, 10usize, concat!("Offset of field: ", stringify!(Test), "::", stringify!(Ccu)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Test>())).Ccd as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Test>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).Ccd) as usize - ptr as usize + }, 11usize, concat!("Offset of field: ", stringify!(Test), "::", stringify!(Ccd)) ); diff --git a/tests/expectations/tests/test_multiple_header_calls_in_builder.rs b/tests/expectations/tests/test_multiple_header_calls_in_builder.rs index c77c1834..b90ec730 100644 --- a/tests/expectations/tests/test_multiple_header_calls_in_builder.rs +++ b/tests/expectations/tests/test_multiple_header_calls_in_builder.rs @@ -38,52 +38,92 @@ fn bindgen_test_layout_Test() { concat!("Alignment of ", stringify!(Test)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Test>())).ch as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Test>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).ch) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(Test), "::", stringify!(ch)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Test>())).u as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Test>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).u) as usize - ptr as usize + }, 1usize, concat!("Offset of field: ", stringify!(Test), "::", stringify!(u)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Test>())).d as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Test>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).d) as usize - ptr as usize + }, 2usize, concat!("Offset of field: ", stringify!(Test), "::", stringify!(d)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Test>())).cch as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Test>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).cch) as usize - ptr as usize + }, 3usize, concat!("Offset of field: ", stringify!(Test), "::", stringify!(cch)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Test>())).cu as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Test>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).cu) as usize - ptr as usize + }, 4usize, concat!("Offset of field: ", stringify!(Test), "::", stringify!(cu)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Test>())).cd as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Test>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).cd) as usize - ptr as usize + }, 5usize, concat!("Offset of field: ", stringify!(Test), "::", stringify!(cd)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Test>())).Cch as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Test>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).Cch) as usize - ptr as usize + }, 6usize, concat!("Offset of field: ", stringify!(Test), "::", stringify!(Cch)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Test>())).Cu as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Test>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).Cu) as usize - ptr as usize + }, 7usize, concat!("Offset of field: ", stringify!(Test), "::", stringify!(Cu)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Test>())).Cd as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Test>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).Cd) as usize - ptr as usize + }, 8usize, concat!("Offset of field: ", stringify!(Test), "::", stringify!(Cd)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Test>())).Ccch as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Test>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).Ccch) as usize - ptr as usize + }, 9usize, concat!( "Offset of field: ", @@ -93,12 +133,20 @@ fn bindgen_test_layout_Test() { ) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Test>())).Ccu as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Test>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).Ccu) as usize - ptr as usize + }, 10usize, concat!("Offset of field: ", stringify!(Test), "::", stringify!(Ccu)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Test>())).Ccd as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Test>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).Ccd) as usize - ptr as usize + }, 11usize, concat!("Offset of field: ", stringify!(Test), "::", stringify!(Ccd)) ); diff --git a/tests/expectations/tests/timex.rs b/tests/expectations/tests/timex.rs index b2a84d84..ec761f34 100644 --- a/tests/expectations/tests/timex.rs +++ b/tests/expectations/tests/timex.rs @@ -111,7 +111,11 @@ fn bindgen_test_layout_timex() { concat!("Alignment of ", stringify!(timex)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<timex>())).tai as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<timex>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).tai) as usize - ptr as usize + }, 0usize, concat!( "Offset of field: ", @@ -151,7 +155,9 @@ fn bindgen_test_layout_timex_named() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<timex_named>())).tai as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<timex_named>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).tai) as usize - ptr as usize }, 0usize, concat!( diff --git a/tests/expectations/tests/type-referenced-by-allowlisted-function.rs b/tests/expectations/tests/type-referenced-by-allowlisted-function.rs index 568f9433..cc491fcc 100644 --- a/tests/expectations/tests/type-referenced-by-allowlisted-function.rs +++ b/tests/expectations/tests/type-referenced-by-allowlisted-function.rs @@ -24,7 +24,9 @@ fn bindgen_test_layout_dl_phdr_info() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<dl_phdr_info>())).x as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<dl_phdr_info>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).x) as usize - ptr as usize }, 0usize, concat!( diff --git a/tests/expectations/tests/typeref.rs b/tests/expectations/tests/typeref.rs index 1c34be7e..00f8f527 100644 --- a/tests/expectations/tests/typeref.rs +++ b/tests/expectations/tests/typeref.rs @@ -24,8 +24,10 @@ fn bindgen_test_layout_mozilla_FragmentOrURL() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<mozilla_FragmentOrURL>())).mIsLocalRef - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<mozilla_FragmentOrURL>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mIsLocalRef) as usize - ptr as usize }, 0usize, concat!( @@ -99,7 +101,11 @@ fn bindgen_test_layout_Bar() { concat!("Alignment of ", stringify!(Bar)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Bar>())).mFoo as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Bar>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mFoo) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(Bar), "::", stringify!(mFoo)) ); @@ -130,7 +136,11 @@ fn bindgen_test_layout_nsFoo() { concat!("Alignment of ", stringify!(nsFoo)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<nsFoo>())).mBar as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<nsFoo>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mBar) as usize - ptr as usize + }, 0usize, concat!( "Offset of field: ", diff --git a/tests/expectations/tests/typeref_1_0.rs b/tests/expectations/tests/typeref_1_0.rs index 2820d9f9..b4d896cd 100644 --- a/tests/expectations/tests/typeref_1_0.rs +++ b/tests/expectations/tests/typeref_1_0.rs @@ -67,8 +67,10 @@ fn bindgen_test_layout_mozilla_FragmentOrURL() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<mozilla_FragmentOrURL>())).mIsLocalRef - as *const _ as usize + let uninit = + ::std::mem::MaybeUninit::<mozilla_FragmentOrURL>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mIsLocalRef) as usize - ptr as usize }, 0usize, concat!( @@ -137,7 +139,11 @@ fn bindgen_test_layout_Bar() { concat!("Alignment of ", stringify!(Bar)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Bar>())).mFoo as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Bar>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mFoo) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(Bar), "::", stringify!(mFoo)) ); @@ -174,7 +180,11 @@ fn bindgen_test_layout_nsFoo() { concat!("Alignment of ", stringify!(nsFoo)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<nsFoo>())).mBar as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<nsFoo>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mBar) as usize - ptr as usize + }, 0usize, concat!( "Offset of field: ", diff --git a/tests/expectations/tests/underscore.rs b/tests/expectations/tests/underscore.rs index 6ef2d8a1..8e5e4566 100644 --- a/tests/expectations/tests/underscore.rs +++ b/tests/expectations/tests/underscore.rs @@ -24,7 +24,11 @@ fn bindgen_test_layout_ptr_t() { concat!("Alignment of ", stringify!(ptr_t)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<ptr_t>())).__ as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<ptr_t>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).__) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(ptr_t), "::", stringify!(__)) ); diff --git a/tests/expectations/tests/union-align.rs b/tests/expectations/tests/union-align.rs index 86127641..cb938f49 100644 --- a/tests/expectations/tests/union-align.rs +++ b/tests/expectations/tests/union-align.rs @@ -24,7 +24,11 @@ fn bindgen_test_layout_Bar() { concat!("Alignment of ", stringify!(Bar)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Bar>())).foo as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Bar>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).foo) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(Bar), "::", stringify!(foo)) ); @@ -57,7 +61,11 @@ fn bindgen_test_layout_Baz() { concat!("Alignment of ", stringify!(Baz)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Baz>())).bar as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Baz>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).bar) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(Baz), "::", stringify!(bar)) ); diff --git a/tests/expectations/tests/union-in-ns.rs b/tests/expectations/tests/union-in-ns.rs index b52c6c36..f7187c49 100644 --- a/tests/expectations/tests/union-in-ns.rs +++ b/tests/expectations/tests/union-in-ns.rs @@ -27,7 +27,11 @@ pub mod root { concat!("Alignment of ", stringify!(bar)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<bar>())).baz as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<bar>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).baz) as usize - ptr as usize + }, 0usize, concat!( "Offset of field: ", diff --git a/tests/expectations/tests/union-in-ns_1_0.rs b/tests/expectations/tests/union-in-ns_1_0.rs index c210c38c..6e58fee2 100644 --- a/tests/expectations/tests/union-in-ns_1_0.rs +++ b/tests/expectations/tests/union-in-ns_1_0.rs @@ -74,7 +74,11 @@ pub mod root { concat!("Alignment of ", stringify!(bar)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<bar>())).baz as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<bar>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).baz) as usize - ptr as usize + }, 0usize, concat!( "Offset of field: ", diff --git a/tests/expectations/tests/union_dtor.rs b/tests/expectations/tests/union_dtor.rs index 94ad3fd8..f7240fd5 100644 --- a/tests/expectations/tests/union_dtor.rs +++ b/tests/expectations/tests/union_dtor.rs @@ -24,7 +24,9 @@ fn bindgen_test_layout_UnionWithDtor() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<UnionWithDtor>())).mFoo as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<UnionWithDtor>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mFoo) as usize - ptr as usize }, 0usize, concat!( @@ -36,7 +38,9 @@ fn bindgen_test_layout_UnionWithDtor() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<UnionWithDtor>())).mBar as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<UnionWithDtor>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mBar) as usize - ptr as usize }, 0usize, concat!( diff --git a/tests/expectations/tests/union_dtor_1_0.rs b/tests/expectations/tests/union_dtor_1_0.rs index a59f99fc..928884de 100644 --- a/tests/expectations/tests/union_dtor_1_0.rs +++ b/tests/expectations/tests/union_dtor_1_0.rs @@ -69,7 +69,9 @@ fn bindgen_test_layout_UnionWithDtor() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<UnionWithDtor>())).mFoo as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<UnionWithDtor>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mFoo) as usize - ptr as usize }, 0usize, concat!( @@ -81,7 +83,9 @@ fn bindgen_test_layout_UnionWithDtor() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<UnionWithDtor>())).mBar as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<UnionWithDtor>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mBar) as usize - ptr as usize }, 0usize, concat!( diff --git a/tests/expectations/tests/union_fields.rs b/tests/expectations/tests/union_fields.rs index 6cd0d56c..d0b316a8 100644 --- a/tests/expectations/tests/union_fields.rs +++ b/tests/expectations/tests/union_fields.rs @@ -26,7 +26,9 @@ fn bindgen_test_layout_nsStyleUnion() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<nsStyleUnion>())).mInt as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<nsStyleUnion>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mInt) as usize - ptr as usize }, 0usize, concat!( @@ -38,7 +40,9 @@ fn bindgen_test_layout_nsStyleUnion() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<nsStyleUnion>())).mFloat as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<nsStyleUnion>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mFloat) as usize - ptr as usize }, 0usize, concat!( @@ -50,8 +54,9 @@ fn bindgen_test_layout_nsStyleUnion() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<nsStyleUnion>())).mPointer as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<nsStyleUnion>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mPointer) as usize - ptr as usize }, 0usize, concat!( diff --git a/tests/expectations/tests/union_fields_1_0.rs b/tests/expectations/tests/union_fields_1_0.rs index 36972b6b..90c01f48 100644 --- a/tests/expectations/tests/union_fields_1_0.rs +++ b/tests/expectations/tests/union_fields_1_0.rs @@ -70,7 +70,9 @@ fn bindgen_test_layout_nsStyleUnion() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<nsStyleUnion>())).mInt as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<nsStyleUnion>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mInt) as usize - ptr as usize }, 0usize, concat!( @@ -82,7 +84,9 @@ fn bindgen_test_layout_nsStyleUnion() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<nsStyleUnion>())).mFloat as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<nsStyleUnion>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mFloat) as usize - ptr as usize }, 0usize, concat!( @@ -94,8 +98,9 @@ fn bindgen_test_layout_nsStyleUnion() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<nsStyleUnion>())).mPointer as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<nsStyleUnion>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mPointer) as usize - ptr as usize }, 0usize, concat!( diff --git a/tests/expectations/tests/union_with_anon_struct.rs b/tests/expectations/tests/union_with_anon_struct.rs index afb73504..d70f7f38 100644 --- a/tests/expectations/tests/union_with_anon_struct.rs +++ b/tests/expectations/tests/union_with_anon_struct.rs @@ -30,7 +30,9 @@ fn bindgen_test_layout_foo__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<foo__bindgen_ty_1>())).a as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<foo__bindgen_ty_1>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).a) as usize - ptr as usize }, 0usize, concat!( @@ -42,7 +44,9 @@ fn bindgen_test_layout_foo__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<foo__bindgen_ty_1>())).b as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<foo__bindgen_ty_1>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).b) as usize - ptr as usize }, 4usize, concat!( @@ -66,7 +70,11 @@ fn bindgen_test_layout_foo() { concat!("Alignment of ", stringify!(foo)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<foo>())).bar as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<foo>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).bar) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(foo), "::", stringify!(bar)) ); diff --git a/tests/expectations/tests/union_with_anon_struct_1_0.rs b/tests/expectations/tests/union_with_anon_struct_1_0.rs index 09dcfa1b..ba582c10 100644 --- a/tests/expectations/tests/union_with_anon_struct_1_0.rs +++ b/tests/expectations/tests/union_with_anon_struct_1_0.rs @@ -74,7 +74,9 @@ fn bindgen_test_layout_foo__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<foo__bindgen_ty_1>())).a as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<foo__bindgen_ty_1>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).a) as usize - ptr as usize }, 0usize, concat!( @@ -86,7 +88,9 @@ fn bindgen_test_layout_foo__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<foo__bindgen_ty_1>())).b as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<foo__bindgen_ty_1>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).b) as usize - ptr as usize }, 4usize, concat!( @@ -115,7 +119,11 @@ fn bindgen_test_layout_foo() { concat!("Alignment of ", stringify!(foo)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<foo>())).bar as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<foo>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).bar) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(foo), "::", stringify!(bar)) ); diff --git a/tests/expectations/tests/union_with_anon_struct_bitfield.rs b/tests/expectations/tests/union_with_anon_struct_bitfield.rs index 09ed515f..85bf0dae 100644 --- a/tests/expectations/tests/union_with_anon_struct_bitfield.rs +++ b/tests/expectations/tests/union_with_anon_struct_bitfield.rs @@ -175,7 +175,11 @@ fn bindgen_test_layout_foo() { concat!("Alignment of ", stringify!(foo)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<foo>())).a as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<foo>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).a) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(foo), "::", stringify!(a)) ); diff --git a/tests/expectations/tests/union_with_anon_struct_bitfield_1_0.rs b/tests/expectations/tests/union_with_anon_struct_bitfield_1_0.rs index 43736b03..1989a830 100644 --- a/tests/expectations/tests/union_with_anon_struct_bitfield_1_0.rs +++ b/tests/expectations/tests/union_with_anon_struct_bitfield_1_0.rs @@ -224,7 +224,11 @@ fn bindgen_test_layout_foo() { concat!("Alignment of ", stringify!(foo)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<foo>())).a as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<foo>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).a) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(foo), "::", stringify!(a)) ); diff --git a/tests/expectations/tests/union_with_anon_union.rs b/tests/expectations/tests/union_with_anon_union.rs index a24962c4..6c049f9b 100644 --- a/tests/expectations/tests/union_with_anon_union.rs +++ b/tests/expectations/tests/union_with_anon_union.rs @@ -30,7 +30,9 @@ fn bindgen_test_layout_foo__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<foo__bindgen_ty_1>())).a as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<foo__bindgen_ty_1>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).a) as usize - ptr as usize }, 0usize, concat!( @@ -42,7 +44,9 @@ fn bindgen_test_layout_foo__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<foo__bindgen_ty_1>())).b as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<foo__bindgen_ty_1>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).b) as usize - ptr as usize }, 0usize, concat!( @@ -75,7 +79,11 @@ fn bindgen_test_layout_foo() { concat!("Alignment of ", stringify!(foo)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<foo>())).bar as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<foo>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).bar) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(foo), "::", stringify!(bar)) ); diff --git a/tests/expectations/tests/union_with_anon_union_1_0.rs b/tests/expectations/tests/union_with_anon_union_1_0.rs index f892c45f..56675f36 100644 --- a/tests/expectations/tests/union_with_anon_union_1_0.rs +++ b/tests/expectations/tests/union_with_anon_union_1_0.rs @@ -75,7 +75,9 @@ fn bindgen_test_layout_foo__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<foo__bindgen_ty_1>())).a as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<foo__bindgen_ty_1>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).a) as usize - ptr as usize }, 0usize, concat!( @@ -87,7 +89,9 @@ fn bindgen_test_layout_foo__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<foo__bindgen_ty_1>())).b as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<foo__bindgen_ty_1>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).b) as usize - ptr as usize }, 0usize, concat!( @@ -116,7 +120,11 @@ fn bindgen_test_layout_foo() { concat!("Alignment of ", stringify!(foo)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<foo>())).bar as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<foo>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).bar) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(foo), "::", stringify!(bar)) ); diff --git a/tests/expectations/tests/union_with_anon_unnamed_struct.rs b/tests/expectations/tests/union_with_anon_unnamed_struct.rs index 94380d1a..622bb4a6 100644 --- a/tests/expectations/tests/union_with_anon_unnamed_struct.rs +++ b/tests/expectations/tests/union_with_anon_unnamed_struct.rs @@ -33,8 +33,10 @@ fn bindgen_test_layout_pixel__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<pixel__bindgen_ty_1>())).r as *const _ - as usize + let uninit = + ::std::mem::MaybeUninit::<pixel__bindgen_ty_1>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).r) as usize - ptr as usize }, 0usize, concat!( @@ -46,8 +48,10 @@ fn bindgen_test_layout_pixel__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<pixel__bindgen_ty_1>())).g as *const _ - as usize + let uninit = + ::std::mem::MaybeUninit::<pixel__bindgen_ty_1>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).g) as usize - ptr as usize }, 1usize, concat!( @@ -59,8 +63,10 @@ fn bindgen_test_layout_pixel__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<pixel__bindgen_ty_1>())).b as *const _ - as usize + let uninit = + ::std::mem::MaybeUninit::<pixel__bindgen_ty_1>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).b) as usize - ptr as usize }, 2usize, concat!( @@ -72,8 +78,10 @@ fn bindgen_test_layout_pixel__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<pixel__bindgen_ty_1>())).a as *const _ - as usize + let uninit = + ::std::mem::MaybeUninit::<pixel__bindgen_ty_1>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).a) as usize - ptr as usize }, 3usize, concat!( @@ -97,7 +105,11 @@ fn bindgen_test_layout_pixel() { concat!("Alignment of ", stringify!(pixel)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<pixel>())).rgba as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<pixel>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).rgba) as usize - ptr as usize + }, 0usize, concat!( "Offset of field: ", diff --git a/tests/expectations/tests/union_with_anon_unnamed_struct_1_0.rs b/tests/expectations/tests/union_with_anon_unnamed_struct_1_0.rs index cbdac700..cb4897a8 100644 --- a/tests/expectations/tests/union_with_anon_unnamed_struct_1_0.rs +++ b/tests/expectations/tests/union_with_anon_unnamed_struct_1_0.rs @@ -77,8 +77,10 @@ fn bindgen_test_layout_pixel__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<pixel__bindgen_ty_1>())).r as *const _ - as usize + let uninit = + ::std::mem::MaybeUninit::<pixel__bindgen_ty_1>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).r) as usize - ptr as usize }, 0usize, concat!( @@ -90,8 +92,10 @@ fn bindgen_test_layout_pixel__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<pixel__bindgen_ty_1>())).g as *const _ - as usize + let uninit = + ::std::mem::MaybeUninit::<pixel__bindgen_ty_1>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).g) as usize - ptr as usize }, 1usize, concat!( @@ -103,8 +107,10 @@ fn bindgen_test_layout_pixel__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<pixel__bindgen_ty_1>())).b as *const _ - as usize + let uninit = + ::std::mem::MaybeUninit::<pixel__bindgen_ty_1>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).b) as usize - ptr as usize }, 2usize, concat!( @@ -116,8 +122,10 @@ fn bindgen_test_layout_pixel__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<pixel__bindgen_ty_1>())).a as *const _ - as usize + let uninit = + ::std::mem::MaybeUninit::<pixel__bindgen_ty_1>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).a) as usize - ptr as usize }, 3usize, concat!( @@ -146,7 +154,11 @@ fn bindgen_test_layout_pixel() { concat!("Alignment of ", stringify!(pixel)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<pixel>())).rgba as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<pixel>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).rgba) as usize - ptr as usize + }, 0usize, concat!( "Offset of field: ", diff --git a/tests/expectations/tests/union_with_anon_unnamed_union.rs b/tests/expectations/tests/union_with_anon_unnamed_union.rs index 2004ff4c..2156a325 100644 --- a/tests/expectations/tests/union_with_anon_unnamed_union.rs +++ b/tests/expectations/tests/union_with_anon_unnamed_union.rs @@ -31,7 +31,9 @@ fn bindgen_test_layout_foo__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<foo__bindgen_ty_1>())).b as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<foo__bindgen_ty_1>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).b) as usize - ptr as usize }, 0usize, concat!( @@ -43,7 +45,9 @@ fn bindgen_test_layout_foo__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<foo__bindgen_ty_1>())).c as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<foo__bindgen_ty_1>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).c) as usize - ptr as usize }, 0usize, concat!( @@ -76,7 +80,11 @@ fn bindgen_test_layout_foo() { concat!("Alignment of ", stringify!(foo)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<foo>())).a as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<foo>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).a) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(foo), "::", stringify!(a)) ); diff --git a/tests/expectations/tests/union_with_anon_unnamed_union_1_0.rs b/tests/expectations/tests/union_with_anon_unnamed_union_1_0.rs index 910f5885..613d8e48 100644 --- a/tests/expectations/tests/union_with_anon_unnamed_union_1_0.rs +++ b/tests/expectations/tests/union_with_anon_unnamed_union_1_0.rs @@ -76,7 +76,9 @@ fn bindgen_test_layout_foo__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<foo__bindgen_ty_1>())).b as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<foo__bindgen_ty_1>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).b) as usize - ptr as usize }, 0usize, concat!( @@ -88,7 +90,9 @@ fn bindgen_test_layout_foo__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<foo__bindgen_ty_1>())).c as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<foo__bindgen_ty_1>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).c) as usize - ptr as usize }, 0usize, concat!( @@ -117,7 +121,11 @@ fn bindgen_test_layout_foo() { concat!("Alignment of ", stringify!(foo)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<foo>())).a as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<foo>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).a) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(foo), "::", stringify!(a)) ); diff --git a/tests/expectations/tests/union_with_big_member.rs b/tests/expectations/tests/union_with_big_member.rs index 3f9294dd..66e0ad8a 100644 --- a/tests/expectations/tests/union_with_big_member.rs +++ b/tests/expectations/tests/union_with_big_member.rs @@ -25,7 +25,9 @@ fn bindgen_test_layout_WithBigArray() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<WithBigArray>())).a as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<WithBigArray>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).a) as usize - ptr as usize }, 0usize, concat!( @@ -37,7 +39,9 @@ fn bindgen_test_layout_WithBigArray() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<WithBigArray>())).b as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<WithBigArray>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).b) as usize - ptr as usize }, 0usize, concat!( @@ -77,7 +81,9 @@ fn bindgen_test_layout_WithBigArray2() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<WithBigArray2>())).a as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<WithBigArray2>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).a) as usize - ptr as usize }, 0usize, concat!( @@ -89,7 +95,9 @@ fn bindgen_test_layout_WithBigArray2() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<WithBigArray2>())).b as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<WithBigArray2>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).b) as usize - ptr as usize }, 0usize, concat!( @@ -129,7 +137,9 @@ fn bindgen_test_layout_WithBigMember() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<WithBigMember>())).a as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<WithBigMember>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).a) as usize - ptr as usize }, 0usize, concat!( @@ -141,7 +151,9 @@ fn bindgen_test_layout_WithBigMember() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<WithBigMember>())).b as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<WithBigMember>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).b) as usize - ptr as usize }, 0usize, concat!( 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 541c9d4c..252d2fb8 100644 --- a/tests/expectations/tests/union_with_big_member_1_0.rs +++ b/tests/expectations/tests/union_with_big_member_1_0.rs @@ -69,7 +69,9 @@ fn bindgen_test_layout_WithBigArray() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<WithBigArray>())).a as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<WithBigArray>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).a) as usize - ptr as usize }, 0usize, concat!( @@ -81,7 +83,9 @@ fn bindgen_test_layout_WithBigArray() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<WithBigArray>())).b as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<WithBigArray>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).b) as usize - ptr as usize }, 0usize, concat!( @@ -127,7 +131,9 @@ fn bindgen_test_layout_WithBigArray2() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<WithBigArray2>())).a as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<WithBigArray2>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).a) as usize - ptr as usize }, 0usize, concat!( @@ -139,7 +145,9 @@ fn bindgen_test_layout_WithBigArray2() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<WithBigArray2>())).b as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<WithBigArray2>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).b) as usize - ptr as usize }, 0usize, concat!( @@ -176,7 +184,9 @@ fn bindgen_test_layout_WithBigMember() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<WithBigMember>())).a as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<WithBigMember>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).a) as usize - ptr as usize }, 0usize, concat!( @@ -188,7 +198,9 @@ fn bindgen_test_layout_WithBigMember() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<WithBigMember>())).b as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<WithBigMember>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).b) as usize - ptr as usize }, 0usize, concat!( diff --git a/tests/expectations/tests/union_with_nesting.rs b/tests/expectations/tests/union_with_nesting.rs index 54a3179b..87556243 100644 --- a/tests/expectations/tests/union_with_nesting.rs +++ b/tests/expectations/tests/union_with_nesting.rs @@ -37,8 +37,11 @@ fn bindgen_test_layout_foo__bindgen_ty_1__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<foo__bindgen_ty_1__bindgen_ty_1>())).b1 - as *const _ as usize + let uninit = ::std::mem::MaybeUninit::< + foo__bindgen_ty_1__bindgen_ty_1, + >::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).b1) as usize - ptr as usize }, 0usize, concat!( @@ -50,8 +53,11 @@ fn bindgen_test_layout_foo__bindgen_ty_1__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<foo__bindgen_ty_1__bindgen_ty_1>())).b2 - as *const _ as usize + let uninit = ::std::mem::MaybeUninit::< + foo__bindgen_ty_1__bindgen_ty_1, + >::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).b2) as usize - ptr as usize }, 0usize, concat!( @@ -91,8 +97,11 @@ fn bindgen_test_layout_foo__bindgen_ty_1__bindgen_ty_2() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<foo__bindgen_ty_1__bindgen_ty_2>())).c1 - as *const _ as usize + let uninit = ::std::mem::MaybeUninit::< + foo__bindgen_ty_1__bindgen_ty_2, + >::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).c1) as usize - ptr as usize }, 0usize, concat!( @@ -104,8 +113,11 @@ fn bindgen_test_layout_foo__bindgen_ty_1__bindgen_ty_2() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<foo__bindgen_ty_1__bindgen_ty_2>())).c2 - as *const _ as usize + let uninit = ::std::mem::MaybeUninit::< + foo__bindgen_ty_1__bindgen_ty_2, + >::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).c2) as usize - ptr as usize }, 0usize, concat!( @@ -160,7 +172,11 @@ fn bindgen_test_layout_foo() { concat!("Alignment of ", stringify!(foo)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<foo>())).a as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<foo>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).a) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(foo), "::", stringify!(a)) ); diff --git a/tests/expectations/tests/union_with_nesting_1_0.rs b/tests/expectations/tests/union_with_nesting_1_0.rs index 3f105c39..cd6104b7 100644 --- a/tests/expectations/tests/union_with_nesting_1_0.rs +++ b/tests/expectations/tests/union_with_nesting_1_0.rs @@ -82,8 +82,11 @@ fn bindgen_test_layout_foo__bindgen_ty_1__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<foo__bindgen_ty_1__bindgen_ty_1>())).b1 - as *const _ as usize + let uninit = ::std::mem::MaybeUninit::< + foo__bindgen_ty_1__bindgen_ty_1, + >::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).b1) as usize - ptr as usize }, 0usize, concat!( @@ -95,8 +98,11 @@ fn bindgen_test_layout_foo__bindgen_ty_1__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<foo__bindgen_ty_1__bindgen_ty_1>())).b2 - as *const _ as usize + let uninit = ::std::mem::MaybeUninit::< + foo__bindgen_ty_1__bindgen_ty_1, + >::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).b2) as usize - ptr as usize }, 0usize, concat!( @@ -133,8 +139,11 @@ fn bindgen_test_layout_foo__bindgen_ty_1__bindgen_ty_2() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<foo__bindgen_ty_1__bindgen_ty_2>())).c1 - as *const _ as usize + let uninit = ::std::mem::MaybeUninit::< + foo__bindgen_ty_1__bindgen_ty_2, + >::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).c1) as usize - ptr as usize }, 0usize, concat!( @@ -146,8 +155,11 @@ fn bindgen_test_layout_foo__bindgen_ty_1__bindgen_ty_2() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<foo__bindgen_ty_1__bindgen_ty_2>())).c2 - as *const _ as usize + let uninit = ::std::mem::MaybeUninit::< + foo__bindgen_ty_1__bindgen_ty_2, + >::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).c2) as usize - ptr as usize }, 0usize, concat!( @@ -194,7 +206,11 @@ fn bindgen_test_layout_foo() { concat!("Alignment of ", stringify!(foo)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<foo>())).a as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<foo>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).a) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(foo), "::", stringify!(a)) ); diff --git a/tests/expectations/tests/unknown_attr.rs b/tests/expectations/tests/unknown_attr.rs index 8dbda00d..bc2dd0a0 100644 --- a/tests/expectations/tests/unknown_attr.rs +++ b/tests/expectations/tests/unknown_attr.rs @@ -27,8 +27,10 @@ fn bindgen_test_layout_max_align_t() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<max_align_t>())).__clang_max_align_nonce1 - as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<max_align_t>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).__clang_max_align_nonce1) as usize - + ptr as usize }, 0usize, concat!( @@ -40,8 +42,10 @@ fn bindgen_test_layout_max_align_t() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<max_align_t>())).__clang_max_align_nonce2 - as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<max_align_t>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).__clang_max_align_nonce2) as usize - + ptr as usize }, 16usize, concat!( diff --git a/tests/expectations/tests/use-core.rs b/tests/expectations/tests/use-core.rs index 66e3b363..49020c78 100644 --- a/tests/expectations/tests/use-core.rs +++ b/tests/expectations/tests/use-core.rs @@ -27,17 +27,29 @@ fn bindgen_test_layout_foo() { concat!("Alignment of ", stringify!(foo)) ); assert_eq!( - unsafe { &(*(::core::ptr::null::<foo>())).a as *const _ as usize }, + unsafe { + let uninit = ::core::mem::MaybeUninit::<foo>::uninit(); + let ptr = uninit.as_ptr(); + ::core::ptr::addr_of!((*ptr).a) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(foo), "::", stringify!(a)) ); assert_eq!( - unsafe { &(*(::core::ptr::null::<foo>())).b as *const _ as usize }, + unsafe { + let uninit = ::core::mem::MaybeUninit::<foo>::uninit(); + let ptr = uninit.as_ptr(); + ::core::ptr::addr_of!((*ptr).b) as usize - ptr as usize + }, 4usize, concat!("Offset of field: ", stringify!(foo), "::", stringify!(b)) ); assert_eq!( - unsafe { &(*(::core::ptr::null::<foo>())).bar as *const _ as usize }, + unsafe { + let uninit = ::core::mem::MaybeUninit::<foo>::uninit(); + let ptr = uninit.as_ptr(); + ::core::ptr::addr_of!((*ptr).bar) as usize - ptr as usize + }, 8usize, concat!("Offset of field: ", stringify!(foo), "::", stringify!(bar)) ); @@ -71,7 +83,9 @@ fn bindgen_test_layout__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::core::ptr::null::<_bindgen_ty_1>())).bar as *const _ as usize + let uninit = ::core::mem::MaybeUninit::<_bindgen_ty_1>::uninit(); + let ptr = uninit.as_ptr(); + ::core::ptr::addr_of!((*ptr).bar) as usize - ptr as usize }, 0usize, concat!( @@ -83,7 +97,9 @@ fn bindgen_test_layout__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::core::ptr::null::<_bindgen_ty_1>())).baz as *const _ as usize + let uninit = ::core::mem::MaybeUninit::<_bindgen_ty_1>::uninit(); + let ptr = uninit.as_ptr(); + ::core::ptr::addr_of!((*ptr).baz) as usize - ptr as usize }, 0usize, concat!( diff --git a/tests/expectations/tests/use-core_1_0.rs b/tests/expectations/tests/use-core_1_0.rs index 61ddfc42..fbe27223 100644 --- a/tests/expectations/tests/use-core_1_0.rs +++ b/tests/expectations/tests/use-core_1_0.rs @@ -70,17 +70,29 @@ fn bindgen_test_layout_foo() { concat!("Alignment of ", stringify!(foo)) ); assert_eq!( - unsafe { &(*(::core::ptr::null::<foo>())).a as *const _ as usize }, + unsafe { + let uninit = ::core::mem::MaybeUninit::<foo>::uninit(); + let ptr = uninit.as_ptr(); + ::core::ptr::addr_of!((*ptr).a) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(foo), "::", stringify!(a)) ); assert_eq!( - unsafe { &(*(::core::ptr::null::<foo>())).b as *const _ as usize }, + unsafe { + let uninit = ::core::mem::MaybeUninit::<foo>::uninit(); + let ptr = uninit.as_ptr(); + ::core::ptr::addr_of!((*ptr).b) as usize - ptr as usize + }, 4usize, concat!("Offset of field: ", stringify!(foo), "::", stringify!(b)) ); assert_eq!( - unsafe { &(*(::core::ptr::null::<foo>())).bar as *const _ as usize }, + unsafe { + let uninit = ::core::mem::MaybeUninit::<foo>::uninit(); + let ptr = uninit.as_ptr(); + ::core::ptr::addr_of!((*ptr).bar) as usize - ptr as usize + }, 8usize, concat!("Offset of field: ", stringify!(foo), "::", stringify!(bar)) ); @@ -120,7 +132,9 @@ fn bindgen_test_layout__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::core::ptr::null::<_bindgen_ty_1>())).bar as *const _ as usize + let uninit = ::core::mem::MaybeUninit::<_bindgen_ty_1>::uninit(); + let ptr = uninit.as_ptr(); + ::core::ptr::addr_of!((*ptr).bar) as usize - ptr as usize }, 0usize, concat!( @@ -132,7 +146,9 @@ fn bindgen_test_layout__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(::core::ptr::null::<_bindgen_ty_1>())).baz as *const _ as usize + let uninit = ::core::mem::MaybeUninit::<_bindgen_ty_1>::uninit(); + let ptr = uninit.as_ptr(); + ::core::ptr::addr_of!((*ptr).baz) as usize - ptr as usize }, 0usize, concat!( diff --git a/tests/expectations/tests/var-tracing.rs b/tests/expectations/tests/var-tracing.rs index 2931f912..a77453c5 100644 --- a/tests/expectations/tests/var-tracing.rs +++ b/tests/expectations/tests/var-tracing.rs @@ -23,7 +23,11 @@ fn bindgen_test_layout_Bar() { concat!("Alignment of ", stringify!(Bar)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<Bar>())).m_baz as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<Bar>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).m_baz) as usize - ptr as usize + }, 0usize, concat!( "Offset of field: ", diff --git a/tests/expectations/tests/vector.rs b/tests/expectations/tests/vector.rs index 04f4de71..434e786d 100644 --- a/tests/expectations/tests/vector.rs +++ b/tests/expectations/tests/vector.rs @@ -23,7 +23,11 @@ fn bindgen_test_layout_foo() { concat!("Alignment of ", stringify!(foo)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<foo>())).mMember as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<foo>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mMember) as usize - ptr as usize + }, 0usize, concat!( "Offset of field: ", diff --git a/tests/expectations/tests/virtual_inheritance.rs b/tests/expectations/tests/virtual_inheritance.rs index eac6aa66..85575d2f 100644 --- a/tests/expectations/tests/virtual_inheritance.rs +++ b/tests/expectations/tests/virtual_inheritance.rs @@ -23,7 +23,11 @@ fn bindgen_test_layout_A() { concat!("Alignment of ", stringify!(A)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<A>())).foo as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<A>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).foo) as usize - ptr as usize + }, 0usize, concat!("Offset of field: ", stringify!(A), "::", stringify!(foo)) ); @@ -49,7 +53,11 @@ fn bindgen_test_layout_B() { concat!("Alignment of ", stringify!(B)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<B>())).bar as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<B>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).bar) as usize - ptr as usize + }, 8usize, concat!("Offset of field: ", stringify!(B), "::", stringify!(bar)) ); @@ -84,7 +92,11 @@ fn bindgen_test_layout_C() { concat!("Alignment of ", stringify!(C)) ); assert_eq!( - unsafe { &(*(::std::ptr::null::<C>())).baz as *const _ as usize }, + unsafe { + let uninit = ::std::mem::MaybeUninit::<C>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).baz) as usize - ptr as usize + }, 8usize, concat!("Offset of field: ", stringify!(C), "::", stringify!(baz)) ); diff --git a/tests/expectations/tests/weird_bitfields.rs b/tests/expectations/tests/weird_bitfields.rs index c4dfa55a..091732d0 100644 --- a/tests/expectations/tests/weird_bitfields.rs +++ b/tests/expectations/tests/weird_bitfields.rs @@ -133,8 +133,10 @@ fn bindgen_test_layout_Weird() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<Weird>())).mStrokeDasharrayLength as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<Weird>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mStrokeDasharrayLength) as usize - + ptr as usize }, 0usize, concat!( @@ -146,7 +148,9 @@ fn bindgen_test_layout_Weird() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<Weird>())).mClipRule as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<Weird>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mClipRule) as usize - ptr as usize }, 8usize, concat!( @@ -158,8 +162,10 @@ fn bindgen_test_layout_Weird() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<Weird>())).mColorInterpolation as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<Weird>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mColorInterpolation) as usize - + ptr as usize }, 9usize, concat!( @@ -171,8 +177,10 @@ fn bindgen_test_layout_Weird() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<Weird>())).mColorInterpolationFilters - as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<Weird>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mColorInterpolationFilters) as usize - + ptr as usize }, 10usize, concat!( @@ -184,7 +192,9 @@ fn bindgen_test_layout_Weird() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<Weird>())).mFillRule as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<Weird>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mFillRule) as usize - ptr as usize }, 11usize, concat!( @@ -196,8 +206,9 @@ fn bindgen_test_layout_Weird() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<Weird>())).mImageRendering as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<Weird>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mImageRendering) as usize - ptr as usize }, 12usize, concat!( @@ -209,7 +220,9 @@ fn bindgen_test_layout_Weird() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<Weird>())).mPaintOrder as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<Weird>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mPaintOrder) as usize - ptr as usize }, 13usize, concat!( @@ -221,8 +234,9 @@ fn bindgen_test_layout_Weird() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<Weird>())).mShapeRendering as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<Weird>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mShapeRendering) as usize - ptr as usize }, 14usize, concat!( @@ -234,8 +248,9 @@ fn bindgen_test_layout_Weird() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<Weird>())).mStrokeLinecap as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<Weird>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mStrokeLinecap) as usize - ptr as usize }, 15usize, concat!( @@ -247,8 +262,9 @@ fn bindgen_test_layout_Weird() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<Weird>())).mStrokeLinejoin as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<Weird>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mStrokeLinejoin) as usize - ptr as usize }, 16usize, concat!( @@ -260,7 +276,9 @@ fn bindgen_test_layout_Weird() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<Weird>())).mTextAnchor as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<Weird>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mTextAnchor) as usize - ptr as usize }, 17usize, concat!( @@ -272,8 +290,9 @@ fn bindgen_test_layout_Weird() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<Weird>())).mTextRendering as *const _ - as usize + let uninit = ::std::mem::MaybeUninit::<Weird>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).mTextRendering) as usize - ptr as usize }, 18usize, concat!( diff --git a/tests/expectations/tests/zero-size-array-align.rs b/tests/expectations/tests/zero-size-array-align.rs index 92b6798f..6b943244 100644 --- a/tests/expectations/tests/zero-size-array-align.rs +++ b/tests/expectations/tests/zero-size-array-align.rs @@ -56,7 +56,9 @@ fn bindgen_test_layout_dm_deps() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<dm_deps>())).count as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<dm_deps>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).count) as usize - ptr as usize }, 0usize, concat!( @@ -68,7 +70,9 @@ fn bindgen_test_layout_dm_deps() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<dm_deps>())).filler as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<dm_deps>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).filler) as usize - ptr as usize }, 4usize, concat!( @@ -80,7 +84,9 @@ fn bindgen_test_layout_dm_deps() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<dm_deps>())).device as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<dm_deps>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).device) as usize - ptr as usize }, 8usize, concat!( diff --git a/tests/expectations/tests/zero-sized-array.rs b/tests/expectations/tests/zero-sized-array.rs index 347c2264..c615ae0b 100644 --- a/tests/expectations/tests/zero-sized-array.rs +++ b/tests/expectations/tests/zero-sized-array.rs @@ -55,7 +55,9 @@ fn bindgen_test_layout_ZeroSizedArray() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<ZeroSizedArray>())).arr as *const _ as usize + let uninit = ::std::mem::MaybeUninit::<ZeroSizedArray>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).arr) as usize - ptr as usize }, 0usize, concat!( @@ -86,8 +88,10 @@ fn bindgen_test_layout_ContainsZeroSizedArray() { ); assert_eq!( unsafe { - &(*(::std::ptr::null::<ContainsZeroSizedArray>())).zsa as *const _ - as usize + let uninit = + ::std::mem::MaybeUninit::<ContainsZeroSizedArray>::uninit(); + let ptr = uninit.as_ptr(); + ::std::ptr::addr_of!((*ptr).zsa) as usize - ptr as usize }, 0usize, concat!( |