Merge #1689

1689: feat(c-api) Use `Option<NonNull<wasm_valtype_t>>` in `wasm_valtype_kind` r=syrusakbary a=Hywan A more Rust-FFI idiomatic way to handle null pointer. Note: In `wasm_valtype_kind`, it's tricky to handle the error because we _must_ return a `wasm_valtype_kind` value. For the moment, it continues to panic, which is probably the best tradeoff. Co-authored-by: Ivan Enderlin <[email protected]>
wasmerio · Oct 13, 2020 · 9c309ea · 9c309ea
2 parents 41abb4d + 7cc4d5a
commit 9c309ea
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/lib/c-api/src/wasm_c_api/types/value.rs b/lib/c-api/src/wasm_c_api/types/value.rs
@@ -83,10 +83,8 @@ pub extern "C" fn wasm_valtype_new(kind: wasm_valkind_t) -> Option<Box<wasm_valt
 pub unsafe extern "C" fn wasm_valtype_delete(_valtype: Option<Box<wasm_valtype_t>>) {}
 
 #[no_mangle]
-pub unsafe extern "C" fn wasm_valtype_kind(valtype: *const wasm_valtype_t) -> wasm_valkind_t {
-    if valtype.is_null() {
-        // TODO: handle error
-        panic!("wasm_valtype_kind: argument is null pointer");
-    }
-    return (*valtype).valkind as wasm_valkind_t;
+pub unsafe extern "C" fn wasm_valtype_kind(valtype: Option<&wasm_valtype_t>) -> wasm_valkind_t {
+    valtype
+        .expect("`wasm_valtype_kind: argument is a null pointer")
+        .valkind as wasm_valkind_t
 }