f

ethereum · May 9, 2022 · 17bf67b · 17bf67b
1 parent 2a98c22
commit 17bf67b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/bindings/rust/evmc-loader/Cargo.toml b/bindings/rust/evmc-loader/Cargo.toml
@@ -13,4 +13,4 @@ edition = "2018"
 
 [build-dependencies]
 bindgen = "0.59"
-cmake = "0.1"
+cmake = "0.1"
diff --git a/bindings/rust/evmc-loader/build.rs b/bindings/rust/evmc-loader/build.rs
@@ -27,6 +27,7 @@ fn main() {
         .rustified_enum("*")
         .allowlist_type("evmc_.*")
         .allowlist_function("evmc_.*")
+        .blocklist_type("evmc_vm")
         // TODO: consider removing this
         .size_t_is_usize(true)
         .generate()

diff --git a/bindings/rust/evmc-loader/src/lib.rs b/bindings/rust/evmc-loader/src/lib.rs
@@ -28,9 +28,6 @@ pub fn load_and_configure(
 
 #[cfg(test)]
 mod tests {
-    use std::ffi::CString;
-    use std::os::raw::c_char;
-
     use super::*;
 
     #[test]

diff --git a/bindings/rust/evmc-loader/src/sys.rs b/bindings/rust/evmc-loader/src/sys.rs
@@ -8,6 +8,10 @@
 
 include!(concat!(env!("OUT_DIR"), "/bindings.rs"));
 
+// Defining evmc_vm here, because bindgen cannot create a useful declaration yet.
+
+pub type evmc_vm = ::std::os::raw::c_void;
+
 #[cfg(test)]
 mod tests {
     use std::ffi::CString;
@@ -21,7 +25,7 @@ mod tests {
         unsafe {
             let mut error_code = evmc_loader_error_code::EVMC_LOADER_UNSPECIFIED_ERROR;
             let instance = evmc_load_and_create(c_str.as_ptr() as *const c_char, &mut error_code);
-            println!("{:?}", error_code);
+            println!("{:?} {:?}", error_code, instance);
         }
     }
 }