From f2ec550c8439cfd35a6b984fe49d22e0fc913cfe Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Wed, 27 Jul 2022 21:24:46 -0700
Subject: [PATCH] Fixed linting and tests

---
 lib/cli-compiler/src/store.rs      |  5 +++--
 lib/compiler/src/engine/builder.rs |  6 ------
 lib/compiler/src/engine/inner.rs   | 12 +++++++++---
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/lib/cli-compiler/src/store.rs b/lib/cli-compiler/src/store.rs
index 2f4ae826fda..ef5f102d04b 100644
--- a/lib/cli-compiler/src/store.rs
+++ b/lib/cli-compiler/src/store.rs
@@ -174,8 +174,9 @@ impl CompilerOptions {
         compiler_config: Box<dyn CompilerConfig>,
     ) -> Result<EngineBuilder> {
         let features = self.get_features(compiler_config.default_features_for_target(&target))?;
-        let engine: EngineBuilder =
-            EngineBuilder::new(compiler_config, Some(target), Some(features));
+        let engine: EngineBuilder = EngineBuilder::new(compiler_config)
+            .set_target(Some(target))
+            .set_features(Some(features));
 
         Ok(engine)
     }
diff --git a/lib/compiler/src/engine/builder.rs b/lib/compiler/src/engine/builder.rs
index 430586bd6b6..0f07396578d 100644
--- a/lib/compiler/src/engine/builder.rs
+++ b/lib/compiler/src/engine/builder.rs
@@ -76,9 +76,3 @@ impl EngineBuilder {
         self.target.as_ref()
     }
 }
-
-impl Into<Engine> for EngineBuilder {
-    fn into(self) -> Engine {
-        self.engine()
-    }
-}
diff --git a/lib/compiler/src/engine/inner.rs b/lib/compiler/src/engine/inner.rs
index dc2b2ec8b5d..26ac7b5fd85 100644
--- a/lib/compiler/src/engine/inner.rs
+++ b/lib/compiler/src/engine/inner.rs
@@ -354,9 +354,15 @@ impl EngineInner {
     }
 }
 
-impl Into<Engine> for Box<dyn CompilerConfig> {
-    fn into(self) -> Engine {
-        EngineBuilder::new(self).engine()
+impl From<Box<dyn CompilerConfig>> for Engine {
+    fn from(config: Box<dyn CompilerConfig>) -> Self {
+        EngineBuilder::new(config).engine()
+    }
+}
+
+impl From<EngineBuilder> for Engine {
+    fn from(engine_builder: EngineBuilder) -> Self {
+        engine_builder.engine()
     }
 }