diff --git a/src/mir/builder/control_flow/joinir/merge/exit_line/reconnector.rs b/src/mir/builder/control_flow/joinir/merge/exit_line/reconnector.rs index 4beda740..263cd1e8 100644 --- a/src/mir/builder/control_flow/joinir/merge/exit_line/reconnector.rs +++ b/src/mir/builder/control_flow/joinir/merge/exit_line/reconnector.rs @@ -8,7 +8,6 @@ use crate::mir::builder::joinir_id_remapper::JoinIrIdRemapper; use crate::mir::builder::MirBuilder; use crate::mir::join_ir::lowering::inline_boundary::JoinInlineBoundary; -use crate::mir::ValueId; /// ExitLineReconnector: A Box that manages exit value reconnection /// diff --git a/src/mir/join_ir/lowering/generic_case_a/append_defs.rs b/src/mir/join_ir/lowering/generic_case_a/append_defs.rs index a59471bb..92cb91cd 100644 --- a/src/mir/join_ir/lowering/generic_case_a/append_defs.rs +++ b/src/mir/join_ir/lowering/generic_case_a/append_defs.rs @@ -30,7 +30,6 @@ //! - `value_id_ranges::funcscanner_append_defs` - ValueId allocation strategy //! - `loop_scope_shape::CaseAContext` - Context extraction -use std::collections::BTreeMap; use crate::mir::join_ir::lowering::loop_scope_shape::CaseAContext; use crate::mir::join_ir::lowering::value_id_ranges; diff --git a/src/mir/join_ir/lowering/generic_case_a/mod.rs b/src/mir/join_ir/lowering/generic_case_a/mod.rs index fa2e1391..c76e7edd 100644 --- a/src/mir/join_ir/lowering/generic_case_a/mod.rs +++ b/src/mir/join_ir/lowering/generic_case_a/mod.rs @@ -100,5 +100,3 @@ pub(crate) use append_defs::lower_case_a_append_defs_with_scope; pub(crate) use stage1_using_resolver::lower_case_a_stage1_usingresolver_with_scope; // Re-export helper utilities -pub(crate) use entry_builder::EntryFunctionBuilder; -pub(crate) use whitespace_check::{WhitespaceCheckResult, WhitespaceDetector}; diff --git a/src/mir/join_ir/lowering/generic_case_a/skip_ws.rs b/src/mir/join_ir/lowering/generic_case_a/skip_ws.rs index 521a4d8e..9eed347c 100644 --- a/src/mir/join_ir/lowering/generic_case_a/skip_ws.rs +++ b/src/mir/join_ir/lowering/generic_case_a/skip_ws.rs @@ -31,7 +31,6 @@ //! - `value_id_ranges::skip_ws` - ValueId allocation strategy //! - `loop_scope_shape::CaseAContext` - Context extraction -use std::collections::BTreeMap; use crate::mir::join_ir::lowering::loop_scope_shape::CaseAContext; use crate::mir::join_ir::lowering::value_id_ranges; diff --git a/src/mir/join_ir/lowering/generic_case_a/stage1_using_resolver.rs b/src/mir/join_ir/lowering/generic_case_a/stage1_using_resolver.rs index 4fcde5a5..c2b1c7ce 100644 --- a/src/mir/join_ir/lowering/generic_case_a/stage1_using_resolver.rs +++ b/src/mir/join_ir/lowering/generic_case_a/stage1_using_resolver.rs @@ -30,7 +30,6 @@ //! - `value_id_ranges::stage1_using_resolver` - ValueId allocation strategy //! - `loop_scope_shape::CaseAContext` - Context extraction -use std::collections::BTreeMap; use crate::mir::join_ir::lowering::loop_scope_shape::CaseAContext; use crate::mir::join_ir::lowering::value_id_ranges; diff --git a/src/mir/join_ir/lowering/generic_case_a/trim.rs b/src/mir/join_ir/lowering/generic_case_a/trim.rs index 4cb70465..02981939 100644 --- a/src/mir/join_ir/lowering/generic_case_a/trim.rs +++ b/src/mir/join_ir/lowering/generic_case_a/trim.rs @@ -44,7 +44,6 @@ //! - `value_id_ranges::funcscanner_trim` - ValueId allocation strategy //! - `whitespace_check` - Whitespace detection helper (shared with skip_ws) -use std::collections::BTreeMap; use crate::mir::join_ir::lowering::loop_scope_shape::CaseAContext; use crate::mir::join_ir::lowering::value_id_ranges; diff --git a/src/mir/join_ir/lowering/if_merge.rs b/src/mir/join_ir/lowering/if_merge.rs index 2b6d4d11..a95eb525 100644 --- a/src/mir/join_ir/lowering/if_merge.rs +++ b/src/mir/join_ir/lowering/if_merge.rs @@ -15,7 +15,7 @@ //! - Loop の PHI には触らない(Loop lowering の責務) use crate::mir::join_ir::{JoinInst, MergePair}; -use crate::mir::{BasicBlockId, MirFunction, MirInstruction, MirType, ValueId}; +use crate::mir::{BasicBlockId, MirFunction, MirInstruction, ValueId}; use std::collections::HashSet; // Phase 61-1: If-in-loop context support diff --git a/src/mir/join_ir/lowering/if_select.rs b/src/mir/join_ir/lowering/if_select.rs index 1b1f2fdf..d1465690 100644 --- a/src/mir/join_ir/lowering/if_select.rs +++ b/src/mir/join_ir/lowering/if_select.rs @@ -13,7 +13,6 @@ use crate::mir::join_ir::JoinInst; use crate::mir::{BasicBlockId, MirFunction, MirInstruction, ValueId}; // Phase 63-2: Type hint inference from MIR -use crate::mir::{ConstValue, MirType}; // Phase 61-1: If-in-loop context support use super::if_phi_context::IfPhiContext; diff --git a/src/mir/join_ir/lowering/loop_patterns.rs b/src/mir/join_ir/lowering/loop_patterns.rs index 166a502b..49489153 100644 --- a/src/mir/join_ir/lowering/loop_patterns.rs +++ b/src/mir/join_ir/lowering/loop_patterns.rs @@ -321,7 +321,7 @@ pub fn lower_loop_with_break_to_joinir( // Phase 188-Impl-2: Delegate to minimal lowerer // TODO: Extract LoopScopeShape from loop_form for generic implementation use crate::mir::join_ir::lowering::loop_scope_shape::LoopScopeShape; - use crate::mir::join_ir::lowering::loop_with_break_minimal::lower_loop_with_break_minimal; + use crate::mir::BasicBlockId; use std::collections::{BTreeMap, BTreeSet}; diff --git a/src/mir/join_ir/lowering/simple_while_minimal.rs b/src/mir/join_ir/lowering/simple_while_minimal.rs index 1dec59b9..06584895 100644 --- a/src/mir/join_ir/lowering/simple_while_minimal.rs +++ b/src/mir/join_ir/lowering/simple_while_minimal.rs @@ -44,7 +44,7 @@ use crate::mir::join_ir::lowering::loop_scope_shape::LoopScopeShape; use crate::mir::join_ir::{ - BinOpKind, CompareOp, ConstValue, JoinContId, JoinFuncId, JoinFunction, JoinInst, JoinModule, + BinOpKind, CompareOp, ConstValue, JoinFuncId, JoinFunction, JoinInst, JoinModule, MirLikeInst, UnaryOp, }; use crate::mir::ValueId; diff --git a/src/mir/join_ir_vm_bridge/joinir_function_converter.rs b/src/mir/join_ir_vm_bridge/joinir_function_converter.rs index 0c390075..f9823a27 100644 --- a/src/mir/join_ir_vm_bridge/joinir_function_converter.rs +++ b/src/mir/join_ir_vm_bridge/joinir_function_converter.rs @@ -5,16 +5,14 @@ //! - ブロック変換の統合 //! - 関数署名の管理 -use crate::ast::Span; -use crate::mir::join_ir::{JoinFunction, JoinInst, JoinModule}; +use crate::mir::join_ir::{JoinFunction, JoinModule}; use crate::mir::{ - BasicBlockId, EffectMask, FunctionSignature, MirFunction, MirInstruction, MirModule, MirType, - ValueId, + BasicBlockId, EffectMask, FunctionSignature, MirFunction, MirModule, MirType, }; use super::joinir_block_converter::JoinIrBlockConverter; use super::JoinIrVmBridgeError; -use super::{convert_mir_like_inst, join_func_name}; +use super::join_func_name; pub(crate) struct JoinIrFunctionConverter;