diff --git a/lib/c-api/build.rs b/lib/c-api/build.rs index 63f0a98fd..64542cc5a 100644 --- a/lib/c-api/build.rs +++ b/lib/c-api/build.rs @@ -468,11 +468,11 @@ fn exclude_items_from_wasm_c_api(builder: Builder) -> Builder { .exclude_item("wasi_get_wasi_version") .exclude_item("wasi_version_t") .exclude_item("wasm_config_set_compiler") + .exclude_item("wasm_config_set_compiler") .exclude_item("wasm_config_set_engine") + .exclude_item("wasm_config_set_engine") + .exclude_item("wasm_config_set_target") .exclude_item("wasmer_compiler_t") - .exclude_item("wasmer_config_set_compiler") - .exclude_item("wasmer_config_set_engine") - .exclude_item("wasmer_config_set_target") .exclude_item("wasmer_cpu_features_add") .exclude_item("wasmer_cpu_features_delete") .exclude_item("wasmer_cpu_features_new") diff --git a/lib/c-api/src/wasm_c_api/engine.rs b/lib/c-api/src/wasm_c_api/engine.rs index c031bfba2..e53027539 100644 --- a/lib/c-api/src/wasm_c_api/engine.rs +++ b/lib/c-api/src/wasm_c_api/engine.rs @@ -1,4 +1,4 @@ -pub use super::unstable::engine::wasmer_config_set_target; +pub use super::unstable::engine::wasm_config_set_target; use super::unstable::target_lexicon::wasmer_target_t; use crate::error::{update_last_error, CApiError}; use cfg_if::cfg_if; @@ -181,7 +181,7 @@ pub extern "C" fn wasm_config_delete(_config: Option>) {} /// wasm_config_t* config = wasm_config_new(); /// /// // Use the Cranelift compiler. -/// wasmer_config_set_compiler(config, CRANELIFT); +/// wasm_config_set_compiler(config, CRANELIFT); /// /// // Create the engine. /// wasm_engine_t* engine = wasm_engine_new_with_config(config); @@ -200,23 +200,11 @@ pub extern "C" fn wasm_config_delete(_config: Option>) {} /// ``` #[cfg(feature = "compiler")] #[no_mangle] -pub extern "C" fn wasmer_config_set_compiler( - config: &mut wasm_config_t, - compiler: wasmer_compiler_t, -) { - config.compiler = compiler; -} - -/// Please use `wasmer_config_set_compiler` instead. -/// -/// cbindgen:prefix=DEPRECATED("This function has been renamed `wasmer_config_set_compiler`.") -#[cfg(feature = "compiler")] -#[no_mangle] pub extern "C" fn wasm_config_set_compiler( config: &mut wasm_config_t, compiler: wasmer_compiler_t, ) { - wasmer_config_set_compiler(config, compiler); + config.compiler = compiler; } /// Updates the configuration to specify a particular engine to use. @@ -236,7 +224,7 @@ pub extern "C" fn wasm_config_set_compiler( /// wasm_config_t* config = wasm_config_new(); /// /// // Use the JIT engine. -/// wasmer_config_set_engine(config, JIT); +/// wasm_config_set_engine(config, JIT); /// /// // Create the engine. /// wasm_engine_t* engine = wasm_engine_new_with_config(config); @@ -254,16 +242,8 @@ pub extern "C" fn wasm_config_set_compiler( /// # } /// ``` #[no_mangle] -pub extern "C" fn wasmer_config_set_engine(config: &mut wasm_config_t, engine: wasmer_engine_t) { - config.engine = engine; -} - -/// Please use `wasmer_config_set_engine` instead. -/// -/// cbindgen:prefix=DEPRECATED("This function has been renamed `wasmer_config_set_engine`.") -#[no_mangle] pub extern "C" fn wasm_config_set_engine(config: &mut wasm_config_t, engine: wasmer_engine_t) { - wasmer_config_set_engine(config, engine); + config.engine = engine; } /// An engine is used by the store to drive the compilation and the diff --git a/lib/c-api/src/wasm_c_api/unstable/engine.rs b/lib/c-api/src/wasm_c_api/unstable/engine.rs index e2e8a1770..25ed8b230 100644 --- a/lib/c-api/src/wasm_c_api/unstable/engine.rs +++ b/lib/c-api/src/wasm_c_api/unstable/engine.rs @@ -25,7 +25,7 @@ use super::target_lexicon::wasmer_target_t; /// wasmer_cpu_features_t* cpu_features = wasmer_cpu_features_new(); /// wasmer_target_t* target = wasmer_target_new(triple, cpu_features); /// -/// wasmer_config_set_target(config, target); +/// wasm_config_set_target(config, target); /// } /// /// // Create the engine. @@ -44,7 +44,7 @@ use super::target_lexicon::wasmer_target_t; /// # } /// ``` #[no_mangle] -pub extern "C" fn wasmer_config_set_target( +pub extern "C" fn wasm_config_set_target( config: &mut wasm_config_t, target: Box, ) { diff --git a/lib/c-api/wasmer_wasm.h b/lib/c-api/wasmer_wasm.h index 230fd391f..ea53ff050 100644 --- a/lib/c-api/wasmer_wasm.h +++ b/lib/c-api/wasmer_wasm.h @@ -246,22 +246,12 @@ wasi_version_t wasi_get_wasi_version(const wasm_module_t *module); #endif #if defined(WASMER_COMPILER_ENABLED) -DEPRECATED("This function has been renamed `wasmer_config_set_compiler`.") -void wasm_config_set_compiler(wasm_config_t *config, - wasmer_compiler_t compiler); +void wasm_config_set_compiler(wasm_config_t *config, wasmer_compiler_t compiler); #endif -DEPRECATED("This function has been renamed `wasmer_config_set_engine`.") -void wasm_config_set_engine(wasm_config_t *config, - wasmer_engine_t engine); +void wasm_config_set_engine(wasm_config_t *config, wasmer_engine_t engine); -#if defined(WASMER_COMPILER_ENABLED) -void wasmer_config_set_compiler(wasm_config_t *config, wasmer_compiler_t compiler); -#endif - -void wasmer_config_set_engine(wasm_config_t *config, wasmer_engine_t engine); - -void wasmer_config_set_target(wasm_config_t *config, wasmer_target_t *target); +void wasm_config_set_target(wasm_config_t *config, wasmer_target_t *target); bool wasmer_cpu_features_add(wasmer_cpu_features_t *cpu_features, const wasm_name_t *feature);