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, ) -> Result { 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 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..34dc5323b58 100644 --- a/lib/compiler/src/engine/inner.rs +++ b/lib/compiler/src/engine/inner.rs @@ -186,12 +186,6 @@ impl Engine { } } -impl Into for &Engine { - fn into(self) -> Engine { - self.cloned() - } -} - /// The inner contents of `Engine` pub struct EngineInner { #[cfg(feature = "compiler")] @@ -354,9 +348,21 @@ impl EngineInner { } } -impl Into for Box { - fn into(self) -> Engine { - EngineBuilder::new(self).engine() +impl From> for Engine { + fn from(config: Box) -> Self { + EngineBuilder::new(config).engine() + } +} + +impl From for Engine { + fn from(engine_builder: EngineBuilder) -> Self { + engine_builder.engine() + } +} + +impl From<&Engine> for Engine { + fn from(engine_ref: &Engine) -> Engine { + engine_ref.cloned() } }