use offset_of

kouhe3 · dtolnay · kouhe3 · commit febd55a2a103 · 2025-11-04T22:53:12.000+08:00
Co-authored-by: David Tolnay &lt;dtolnay@gmail.com&gt;
diff --git a/library/std/src/os/windows/net/addr.rs b/library/std/src/os/windows/net/addr.rs
@@ -41,10 +41,7 @@ pub fn sockaddr_un(path: &Path) -> io::Result<(c::sockaddr_un, c_int)> {
     Ok((addr, len as _))
 }
 fn sun_path_offset(addr: &c::sockaddr_un) -> usize {
-    // Work with an actual instance of the type since using a null pointer is UB
-    let base = addr as *const _ as usize;
-    let path = &addr.sun_path as *const _ as usize;
-    path - base
+    offset_of!(c::sockaddr_un, sun_path)
 }
 #[allow(dead_code)]
 pub struct SocketAddr {

Original file line number	Diff line number	Diff line change
`@@ -41,10 +41,7 @@ pub fn sockaddr_un(path: &Path) -> io::Result<(c::sockaddr_un, c_int)> {`
`41`	`41`	`Ok((addr, len as _))`
`42`	`42`	`}`
`43`	`43`	`fn sun_path_offset(addr: &c::sockaddr_un) -> usize {`
`44`		`- // Work with an actual instance of the type since using a null pointer is UB`
`45`		`- let base = addr as *const _ as usize;`
`46`		`- let path = &addr.sun_path as *const _ as usize;`
`47`		`- path - base`
	`44`	`+ offset_of!(c::sockaddr_un, sun_path)`
`48`	`45`	`}`
`49`	`46`	`#[allow(dead_code)]`
`50`	`47`	`pub struct SocketAddr {`