diff --git a/lib/c-api/build.rs b/lib/c-api/build.rs index 660ffd478..63f0a98fd 100644 --- a/lib/c-api/build.rs +++ b/lib/c-api/build.rs @@ -496,7 +496,6 @@ fn exclude_items_from_wasm_c_api(builder: Builder) -> Builder { .exclude_item("wasmer_triple_new") .exclude_item("wasmer_triple_new_from_host") .exclude_item("wasmer_triple_t") - .exclude_item("wasmer_wat2wasm") .exclude_item("wat2wasm") } diff --git a/lib/c-api/src/error.rs b/lib/c-api/src/error.rs index 991f1c4f6..9011303dc 100644 --- a/lib/c-api/src/error.rs +++ b/lib/c-api/src/error.rs @@ -21,7 +21,7 @@ //! wasm_byte_vec_t wat; //! wasmer_byte_vec_new_from_string(&wat, "(foobar)"); //! wasm_byte_vec_t wasm; -//! wasmer_wat2wasm(&wat, &wasm); +//! wat2wasm(&wat, &wasm); //! //! int error_length = wasmer_last_error_length(); //! diff --git a/lib/c-api/src/wasm_c_api/externals/global.rs b/lib/c-api/src/wasm_c_api/externals/global.rs index e13fc62c8..b7b53b3e5 100644 --- a/lib/c-api/src/wasm_c_api/externals/global.rs +++ b/lib/c-api/src/wasm_c_api/externals/global.rs @@ -127,7 +127,7 @@ mod tests { wasm_byte_vec_t wat; wasmer_byte_vec_new_from_string(&wat, "(module (global $global (export \"global\") f32 (f32.const 1)))"); wasm_byte_vec_t wasm_bytes; - wasmer_wat2wasm(&wat, &wasm_bytes); + wat2wasm(&wat, &wasm_bytes); wasm_module_t* module = wasm_module_new(store, &wasm_bytes); wasm_extern_vec_t import_object = WASM_EMPTY_VEC; wasm_instance_t* instance = wasm_instance_new(store, module, &import_object, NULL); diff --git a/lib/c-api/src/wasm_c_api/externals/mod.rs b/lib/c-api/src/wasm_c_api/externals/mod.rs index a7d4aac18..23dff955e 100644 --- a/lib/c-api/src/wasm_c_api/externals/mod.rs +++ b/lib/c-api/src/wasm_c_api/externals/mod.rs @@ -156,7 +156,7 @@ mod tests { " (func (export \"function\")))" ); wasm_byte_vec_t wasm; - wasmer_wat2wasm(&wat, &wasm); + wat2wasm(&wat, &wasm); wasm_module_t* module = wasm_module_new(store, &wasm); assert(module); diff --git a/lib/c-api/src/wasm_c_api/instance.rs b/lib/c-api/src/wasm_c_api/instance.rs index 798fe138c..c562daa41 100644 --- a/lib/c-api/src/wasm_c_api/instance.rs +++ b/lib/c-api/src/wasm_c_api/instance.rs @@ -118,7 +118,7 @@ pub unsafe extern "C" fn wasm_instance_delete(_instance: Option 0); diff --git a/lib/c-api/src/wasm_c_api/module.rs b/lib/c-api/src/wasm_c_api/module.rs index e718716bc..aee356b03 100644 --- a/lib/c-api/src/wasm_c_api/module.rs +++ b/lib/c-api/src/wasm_c_api/module.rs @@ -76,7 +76,7 @@ pub unsafe extern "C" fn wasm_module_delete(_module: Option>) /// wasm_byte_vec_t wat; /// wasmer_byte_vec_new_from_string(&wat, "(module)"); /// wasm_byte_vec_t wasm; -/// wasmer_wat2wasm(&wat, &wasm); +/// wat2wasm(&wat, &wasm); /// /// // Validate that the WebAssembly module is correct. /// assert(wasm_module_validate(store, &wasm)); @@ -150,7 +150,7 @@ pub unsafe extern "C" fn wasm_module_validate( /// " (memory (export \"memory\") 1))" /// ); /// wasm_byte_vec_t wasm; -/// wasmer_wat2wasm(&wat, &wasm); +/// wat2wasm(&wat, &wasm); /// /// // Create the module. /// wasm_module_t* module = wasm_module_new(store, &wasm); @@ -274,7 +274,7 @@ pub unsafe extern "C" fn wasm_module_exports( /// " (import \"ns\" \"memory\" (memory 3 4)))" /// ); /// wasm_byte_vec_t wasm; -/// wasmer_wat2wasm(&wat, &wasm); +/// wat2wasm(&wat, &wasm); /// /// // Create the module. /// wasm_module_t* module = wasm_module_new(store, &wasm); @@ -426,7 +426,7 @@ pub unsafe extern "C" fn wasm_module_imports( /// " (memory (export \"memory\") 1))" /// ); /// wasm_byte_vec_t wasm; -/// wasmer_wat2wasm(&wat, &wasm); +/// wat2wasm(&wat, &wasm); /// /// // Create the module. /// wasm_module_t* module = wasm_module_new(store, &wasm); @@ -533,7 +533,7 @@ mod tests { wasm_byte_vec_t wat; wasmer_byte_vec_new_from_string(&wat, "(module)"); wasm_byte_vec_t wasm; - wasmer_wat2wasm(&wat, &wasm); + wat2wasm(&wat, &wasm); assert(wasm_module_validate(store, &wasm)); @@ -560,7 +560,7 @@ mod tests { wasm_byte_vec_t wat; wasmer_byte_vec_new_from_string(&wat, "(module)"); wasm_byte_vec_t wasm; - wasmer_wat2wasm(&wat, &wasm); + wat2wasm(&wat, &wasm); wasm_module_t* module = wasm_module_new(store, &wasm); assert(module); @@ -596,7 +596,7 @@ mod tests { " (memory (export \"memory\") 1))" ); wasm_byte_vec_t wasm; - wasmer_wat2wasm(&wat, &wasm); + wat2wasm(&wat, &wasm); wasm_module_t* module = wasm_module_new(store, &wasm); assert(module); @@ -704,7 +704,7 @@ mod tests { " (import \"ns\" \"memory\" (memory 3 4)))" ); wasm_byte_vec_t wasm; - wasmer_wat2wasm(&wat, &wasm); + wat2wasm(&wat, &wasm); wasm_module_t* module = wasm_module_new(store, &wasm); assert(module); @@ -815,7 +815,7 @@ mod tests { wasm_byte_vec_t wat; wasmer_byte_vec_new_from_string(&wat, "(module)"); wasm_byte_vec_t wasm; - wasmer_wat2wasm(&wat, &wasm); + wat2wasm(&wat, &wasm); wasm_module_t* module = wasm_module_new(store, &wasm); assert(module); @@ -856,7 +856,7 @@ mod tests { " (memory (export \"memory\") 1))" ); wasm_byte_vec_t wasm; - wasmer_wat2wasm(&wat, &wasm); + wat2wasm(&wat, &wasm); wasm_module_t* module = wasm_module_new(store, &wasm); assert(module); diff --git a/lib/c-api/src/wasm_c_api/unstable/module.rs b/lib/c-api/src/wasm_c_api/unstable/module.rs index 5ff5e0185..09bd716d8 100644 --- a/lib/c-api/src/wasm_c_api/unstable/module.rs +++ b/lib/c-api/src/wasm_c_api/unstable/module.rs @@ -28,7 +28,7 @@ use std::sync::Arc; /// wasmer_byte_vec_new_from_string(&wat, "(module $moduleName)"); /// // ^~~~~~~~~~~ that's the name! /// wasm_byte_vec_t wasm; -/// wasmer_wat2wasm(&wat, &wasm); +/// wat2wasm(&wat, &wasm); /// /// // Create the module. /// wasm_module_t* module = wasm_module_new(store, &wasm); @@ -94,7 +94,7 @@ pub unsafe extern "C" fn wasmer_module_name( /// wasm_byte_vec_t wat; /// wasmer_byte_vec_new_from_string(&wat, "(module)"); /// wasm_byte_vec_t wasm; -/// wasmer_wat2wasm(&wat, &wasm); +/// wat2wasm(&wat, &wasm); /// /// // Create the module. /// wasm_module_t* module = wasm_module_new(store, &wasm); diff --git a/lib/c-api/src/wasm_c_api/wasi/mod.rs b/lib/c-api/src/wasm_c_api/wasi/mod.rs index 6bddcbadb..5d16fabb0 100644 --- a/lib/c-api/src/wasm_c_api/wasi/mod.rs +++ b/lib/c-api/src/wasm_c_api/wasi/mod.rs @@ -429,7 +429,7 @@ mod tests { wasm_byte_vec_t wat; wasmer_byte_vec_new_from_string(&wat, "(module (import \"wasi_unstable\" \"args_get\" (func (param i32 i32) (result i32))))"); wasm_byte_vec_t wasm; - wasmer_wat2wasm(&wat, &wasm); + wat2wasm(&wat, &wasm); wasm_module_t* module = wasm_module_new(store, &wasm); assert(module); @@ -460,7 +460,7 @@ mod tests { wasm_byte_vec_t wat; wasmer_byte_vec_new_from_string(&wat, "(module (import \"wasi_snapshot_preview1\" \"args_get\" (func (param i32 i32) (result i32))))"); wasm_byte_vec_t wasm; - wasmer_wat2wasm(&wat, &wasm); + wat2wasm(&wat, &wasm); wasm_module_t* module = wasm_module_new(store, &wasm); assert(module); @@ -491,7 +491,7 @@ mod tests { wasm_byte_vec_t wat; wasmer_byte_vec_new_from_string(&wat, "(module (import \"wasi_snpsht_prvw1\" \"args_get\" (func (param i32 i32) (result i32))))"); wasm_byte_vec_t wasm; - wasmer_wat2wasm(&wat, &wasm); + wat2wasm(&wat, &wasm); wasm_module_t* module = wasm_module_new(store, &wasm); assert(module); diff --git a/lib/c-api/src/wasm_c_api/wat.rs b/lib/c-api/src/wasm_c_api/wat.rs index ca1200976..07d634b88 100644 --- a/lib/c-api/src/wasm_c_api/wat.rs +++ b/lib/c-api/src/wasm_c_api/wat.rs @@ -10,7 +10,7 @@ use super::types::wasm_byte_vec_t; /// See the module's documentation. #[cfg(feature = "wat")] #[no_mangle] -pub unsafe extern "C" fn wasmer_wat2wasm(wat: &wasm_byte_vec_t, out: &mut wasm_byte_vec_t) { +pub unsafe extern "C" fn wat2wasm(wat: &wasm_byte_vec_t, out: &mut wasm_byte_vec_t) { let wat: &[u8] = match wat.into_slice() { Some(v) => v, _ => { @@ -32,15 +32,6 @@ pub unsafe extern "C" fn wasmer_wat2wasm(wat: &wasm_byte_vec_t, out: &mut wasm_b *out = result; } -/// Please use `wasmer_wat2wasm`. -/// -/// cbindgen:prefix=DEPRECATED("This function has been renamed `wasmer_wat2wasm`.") -#[cfg(feature = "wat")] -#[no_mangle] -pub unsafe extern "C" fn wat2wasm(wat: &wasm_byte_vec_t, out: &mut wasm_byte_vec_t) { - wasmer_wat2wasm(wat, out); -} - #[cfg(test)] mod tests { use inline_c::assert_c; @@ -54,7 +45,7 @@ mod tests { wasm_byte_vec_t wat; wasmer_byte_vec_new_from_string(&wat, "(module)"); wasm_byte_vec_t wasm; - wasmer_wat2wasm(&wat, &wasm); + wat2wasm(&wat, &wasm); assert(wasm.data); assert(wasm.size == 8); @@ -87,7 +78,7 @@ mod tests { wasm_byte_vec_t wat; wasmer_byte_vec_new_from_string(&wat, "(module"); wasm_byte_vec_t wasm; - wasmer_wat2wasm(&wat, &wasm); + wat2wasm(&wat, &wasm); assert(!wasm.data); assert(wasmer_last_error_length() > 0); diff --git a/lib/c-api/wasmer_wasm.h b/lib/c-api/wasmer_wasm.h index 982c95883..230fd391f 100644 --- a/lib/c-api/wasmer_wasm.h +++ b/lib/c-api/wasmer_wasm.h @@ -332,11 +332,7 @@ uint8_t wasmer_version_patch(void); const char *wasmer_version_pre(void); -void wasmer_wat2wasm(const wasm_byte_vec_t *wat, wasm_byte_vec_t *out); - -DEPRECATED("This function has been renamed `wasmer_wat2wasm`.") -void wat2wasm(const wasm_byte_vec_t *wat, - wasm_byte_vec_t *out); +void wat2wasm(const wasm_byte_vec_t *wat, wasm_byte_vec_t *out); #ifdef __cplusplus } // extern "C"