Merge pull request #524 from ethereum/rust-host-context

rust: turn evmc_host_context into a void type
ethereum · May 22, 2022 · 4b1dbad · 4b1dbad
2 parents 1982c04 + e47280b
commit 4b1dbad
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/bindings/rust/evmc-sys/build.rs b/bindings/rust/evmc-sys/build.rs
@@ -19,7 +19,7 @@ fn gen_bindings() {
         .derive_hash(true)
         // force deriving the PratialEq trait on basic types (address, bytes32)
         .derive_partialeq(true)
-        .opaque_type("evmc_host_context")
+        .blocklist_type("evmc_host_context")
         .allowlist_type("evmc_.*")
         .allowlist_function("evmc_.*")
         .allowlist_var("EVMC_ABI_VERSION")

diff --git a/bindings/rust/evmc-sys/src/lib.rs b/bindings/rust/evmc-sys/src/lib.rs
@@ -8,6 +8,11 @@
 
 include!(concat!(env!("OUT_DIR"), "/bindings.rs"));
 
+// Defining evmc_host_context here, because bindgen cannot create a useful declaration yet.
+
+/// This is a void type given host context is an opaque pointer. Functions allow it to be a null ptr.
+pub type evmc_host_context = ::std::os::raw::c_void;
+
 // TODO: add `.derive_default(true)` to bindgen instead?
 
 impl Default for evmc_address {