fn {in,out}put_open: Replace offset_ofs of trailing ZSTs with `si…

…ze_of`s as they are equivalent due to the ZST.
memorysafety · Dec 6, 2023 · 52f9a52 · 52f9a52
1 parent 1c9bfc3
commit 52f9a52
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 4 deletions.
diff --git a/tests/seek_stress.rs b/tests/seek_stress.rs
@@ -2,7 +2,6 @@
 #![allow(non_upper_case_globals)]
 #![feature(extern_types)]
 #![feature(c_variadic)]
-#![feature(offset_of)]
 #![allow(clippy::all)]
 
 #[path = "../tools/input"]

diff --git a/tools/dav1d.rs b/tools/dav1d.rs
@@ -2,7 +2,6 @@
 #![allow(non_upper_case_globals)]
 #![feature(extern_types)]
 #![feature(c_variadic)]
-#![feature(offset_of)]
 #![allow(clippy::all)]
 
 mod input {

diff --git a/tools/input/input.rs b/tools/input/input.rs
@@ -157,7 +157,7 @@ pub unsafe fn input_open(
     }
     c = calloc(
         1,
-        mem::offset_of!(DemuxerContext, priv_data) + (*impl_0).priv_data_size as usize,
+        mem::size_of::<DemuxerContext>() + (*impl_0).priv_data_size as usize,
     ) as *mut DemuxerContext;
     if c.is_null() {
         fprintf(

diff --git a/tools/output/output.rs b/tools/output/output.rs
@@ -161,7 +161,7 @@ pub unsafe fn output_open(
             return -ENOPROTOOPT;
         }
     }
-    c = malloc(mem::offset_of!(MuxerContext, priv_data) + (*impl_0).priv_data_size as usize)
+    c = malloc(mem::size_of::<MuxerContext>() + (*impl_0).priv_data_size as usize)
         as *mut MuxerContext;
     if c.is_null() {
         fprintf(