Move FuncTranslator internals into func submodule of translator module (#1532)

* no longer re-export Instr from engine module

* move FuncTranslator internals into func submodule

* fix broken doc link

Author: Robbepop

crates/wasmi/src/engine/mod.rs

@@ -48,7 +48,7 @@ pub use self::{
         TypedResumableCallOutOfFuel,
     },
     traits::{CallParams, CallResults},
-    translator::{Instr, TranslationError},
+    translator::TranslationError,
 };
 use crate::{
     collections::arena::{ArenaIndex, GuardedEntity},

crates/wasmi/src/engine/translator/comparator.rs renamed to crates/wasmi/src/engine/translator/func/comparator.rs

@@ -1,5 +1,5 @@
-use super::ValueStack;
 use crate::{
+    engine::translator::func::ValueStack,
     ir::{BranchOffset, BranchOffset16, Comparator, ComparatorAndOffset, Instruction, Reg},
     Error,
 };

crates/wasmi/src/engine/translator/control_frame.rs renamed to crates/wasmi/src/engine/translator/func/control_frame.rs

@@ -4,7 +4,7 @@ use super::LabelRef;
 #[cfg(doc)]
 use super::ValueStack;
 use crate::{
-    engine::{BlockType, Instr, TranslationError},
+    engine::{translator::Instr, BlockType, TranslationError},
     ir::{BoundedRegSpan, RegSpan},
     Engine,
     Error,

crates/wasmi/src/engine/translator/control_stack.rs renamed to crates/wasmi/src/engine/translator/func/control_stack.rs

@@ -1,7 +1,7 @@
 use super::ControlFrame;
 use crate::{
     core::TypedVal,
-    engine::translator::{Provider, ProviderSliceStack},
+    engine::translator::func::{Provider, ProviderSliceStack},
     Error,
 };
 use alloc::vec::{Drain, Vec};

crates/wasmi/src/engine/translator/instr_encoder.rs renamed to crates/wasmi/src/engine/translator/func/instr_encoder.rs

@@ -1,21 +1,25 @@
-use super::{
-    comparator::TryIntoCmpSelectInstr,
-    relink_result::RelinkResult as _,
-    utils::{FromProviders as _, WasmInteger},
-    visit_register::VisitInputRegisters as _,
-    BumpFuelConsumption as _,
-    FuelInfo,
-    LabelRef,
-    LabelRegistry,
-    LogicalizeCmpInstr,
-    NegateCmpInstr,
-    TryIntoCmpBranchFallbackInstr,
-    TryIntoCmpBranchInstr,
-    TypedProvider,
-};
 use crate::{
     core::{FuelCostsProvider, UntypedVal, ValType},
-    engine::translator::{stack::RegisterSpace, ValueStack},
+    engine::translator::{
+        func::{
+            stack::RegisterSpace,
+            utils::FromProviders as _,
+            FuelInfo,
+            LabelRef,
+            LabelRegistry,
+            LogicalizeCmpInstr,
+            NegateCmpInstr,
+            TryIntoCmpBranchFallbackInstr,
+            TryIntoCmpBranchInstr,
+            TryIntoCmpSelectInstr,
+            TypedProvider,
+            ValueStack,
+        },
+        relink_result::RelinkResult as _,
+        utils::WasmInteger,
+        visit_register::VisitInputRegisters as _,
+        BumpFuelConsumption as _,
+    },
     ir::{
         BoundedRegSpan,
         BranchOffset,