From 52f9a52f9dffacb12e89e306ef6e852c6e82e45d Mon Sep 17 00:00:00 2001
From: Khyber Sen <kkysen@gmail.com>
Date: Tue, 5 Dec 2023 23:13:05 -0800
Subject: [PATCH] `fn {in,out}put_open`: Replace `offset_of`s of trailing ZSTs
 with `size_of`s as they are equivalent due to the ZST.

---
 tests/seek_stress.rs   | 1 -
 tools/dav1d.rs         | 1 -
 tools/input/input.rs   | 2 +-
 tools/output/output.rs | 2 +-
 4 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/tests/seek_stress.rs b/tests/seek_stress.rs
index 4adc0cd97..1a37991f5 100644
--- 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
index e54189ed4..f31853817 100644
--- 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
index 6fa659ded..163bf775e 100644
--- 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
index 4d6e92b28..646fce60b 100644
--- 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(