From 8ac54f270e11ad3d7308bdd4705a031b5b5442b3 Mon Sep 17 00:00:00 2001
From: Simon Warta <simon@warta.it>
Date: Tue, 22 Dec 2020 08:31:41 +0100
Subject: [PATCH] Remove to_wasm_error

---
 CHANGELOG.md                         | 2 +-
 lib/compiler/src/lib.rs              | 3 ---
 lib/compiler/src/translator/error.rs | 6 ------
 lib/compiler/src/translator/mod.rs   | 2 --
 4 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 75d4927764a..788858a4cf3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,7 +16,7 @@
 * [#1941](https://github.com/wasmerio/wasmer/pull/1941) Turn `get_remaining_points`/`set_remaining_points` of the `Metering` middleware into free functions to allow using them in an ahead-of-time compilation setup
 * [#1955](https://github.com/wasmerio/wasmer/pull/1955) Set `jit` as a default feature of the `wasmer-wasm-c-api` crate
 * [#1944](https://github.com/wasmerio/wasmer/pull/1944) Require `WasmerEnv` to be `Send + Sync` even in dynamic functions.
-* [#1963](https://github.com/wasmerio/wasmer/pull/1963) Deprecated `to_wasm_error` in favour of `impl From<BinaryReaderError> for WasmError`
+* [#1963](https://github.com/wasmerio/wasmer/pull/1963) Removed `to_wasm_error` in favour of `impl From<BinaryReaderError> for WasmError`
 
 ### Fixed
 
diff --git a/lib/compiler/src/lib.rs b/lib/compiler/src/lib.rs
index 4f07121ba6e..ae497431b8e 100644
--- a/lib/compiler/src/lib.rs
+++ b/lib/compiler/src/lib.rs
@@ -84,9 +84,6 @@ pub use crate::target::{
     PointerWidth, Target, Triple,
 };
 
-#[cfg(feature = "translator")]
-#[allow(deprecated)]
-pub use crate::translator::to_wasm_error;
 #[cfg(feature = "translator")]
 pub use crate::translator::{
     translate_module, wptype_to_type, FunctionBodyData, FunctionMiddleware, MiddlewareBinaryReader,
diff --git a/lib/compiler/src/translator/error.rs b/lib/compiler/src/translator/error.rs
index 714d67e4bd4..97f5557fcc6 100644
--- a/lib/compiler/src/translator/error.rs
+++ b/lib/compiler/src/translator/error.rs
@@ -16,9 +16,3 @@ impl From<BinaryReaderError> for WasmError {
         }
     }
 }
-
-/// Converts a Wasm binary reading error to a runtime Wasm error
-#[deprecated(since = "1.0.0-beta3", note = "Use WasmError::from")]
-pub fn to_wasm_error(e: BinaryReaderError) -> WasmError {
-    e.into()
-}
diff --git a/lib/compiler/src/translator/mod.rs b/lib/compiler/src/translator/mod.rs
index 8c8df3e0f20..4a3a8ac23c2 100644
--- a/lib/compiler/src/translator/mod.rs
+++ b/lib/compiler/src/translator/mod.rs
@@ -14,8 +14,6 @@ mod error;
 mod sections;
 
 pub use self::environ::{FunctionBodyData, ModuleEnvironment, ModuleInfoTranslation};
-#[allow(deprecated)]
-pub use self::error::to_wasm_error;
 pub use self::middleware::{
     FunctionMiddleware, MiddlewareBinaryReader, MiddlewareReaderState, ModuleMiddleware,
     ModuleMiddlewareChain,