remove prelude and fix cargo.toml

the-ssd · the-ssd · commit 39c067d4450d · 2026-01-05T23:09:28.000+01:00
diff --git a/Cargo.toml b/Cargo.toml
@@ -304,7 +304,7 @@ cranelift-jit = { path = "cranelift/jit", version = "0.129.0" }
 cranelift-fuzzgen = { path = "cranelift/fuzzgen" }
 cranelift-bforest = { path = "cranelift/bforest", version = "0.129.0" }
 cranelift-bitset = { path = "cranelift/bitset", version = "0.129.0" }
-cranelift-control = { path = "cranelift/control", version = "0.129.0" }
+cranelift-control = { path = "cranelift/control", version = "0.129.0", default-features = false }
 cranelift-srcgen = { path = "cranelift/srcgen", version = "0.129.0" }
 cranelift = { path = "cranelift/umbrella", version = "0.129.0" }
 
diff --git a/cranelift/codegen/src/alias_analysis.rs b/cranelift/codegen/src/alias_analysis.rs
@@ -61,7 +61,7 @@
 //! must be correct likely reduce the potential benefit, we don't yet
 //! do this.
 
-use crate::prelude::*;
+
 use crate::{FxHashMap, FxHashSet};
 use crate::{
     cursor::{Cursor, FuncCursor},
diff --git a/cranelift/codegen/src/dominator_tree.rs b/cranelift/codegen/src/dominator_tree.rs
@@ -4,7 +4,7 @@ use crate::entity::SecondaryMap;
 use crate::flowgraph::{BlockPredecessor, ControlFlowGraph};
 use crate::ir::{Block, Function, Layout, ProgramPoint};
 use crate::packed_option::PackedOption;
-use crate::prelude::*;
+
 use crate::timing;
 use alloc::vec::Vec;
 use core::cmp;
diff --git a/cranelift/codegen/src/egraph/elaborate.rs b/cranelift/codegen/src/egraph/elaborate.rs
@@ -9,7 +9,7 @@ use crate::hash_map::Entry as HashEntry;
 use crate::inst_predicates::is_pure_for_egraph;
 use crate::ir::{Block, Function, Inst, Value, ValueDef};
 use crate::loop_analysis::{Loop, LoopAnalysis};
-use crate::prelude::*;
+
 use crate::scoped_hash_map::ScopedHashMap;
 use crate::trace;
 use crate::{FxHashMap, FxHashSet};
diff --git a/cranelift/codegen/src/egraph/mod.rs b/cranelift/codegen/src/egraph/mod.rs
@@ -15,7 +15,7 @@ use crate::ir::{
 use crate::loop_analysis::LoopAnalysis;
 use crate::opts::IsleContext;
 use crate::opts::generated_code::SkeletonInstSimplification;
-use crate::prelude::*;
+
 use crate::scoped_hash_map::{Entry as ScopedEntry, ScopedHashMap};
 use crate::settings::Flags;
 use crate::take_and_replace::TakeAndReplace;
diff --git a/cranelift/codegen/src/ir/exception_table.rs b/cranelift/codegen/src/ir/exception_table.rs
@@ -19,7 +19,7 @@
 use crate::ir::entities::{ExceptionTag, SigRef};
 use crate::ir::instructions::ValueListPool;
 use crate::ir::{BlockCall, Value};
-use crate::prelude::*;
+
 use alloc::vec::Vec;
 use core::fmt::{self, Display, Formatter};
 #[cfg(feature = "enable-serde")]
diff --git a/cranelift/codegen/src/ir/immediates.rs b/cranelift/codegen/src/ir/immediates.rs
@@ -4,7 +4,7 @@
 //! Each type here should have a corresponding definition in the
 //! `cranelift-codegen/meta/src/shared/immediates` crate in the meta language.
 
-use crate::prelude::*;
+
 use alloc::vec::Vec;
 use core::cmp::Ordering;
 use core::fmt::{self, Display, Formatter};
diff --git a/cranelift/codegen/src/ir/stackslot.rs b/cranelift/codegen/src/ir/stackslot.rs
@@ -6,7 +6,7 @@
 use crate::entity::PrimaryMap;
 use crate::ir::StackSlot;
 use crate::ir::entities::{DynamicStackSlot, DynamicType};
-use crate::prelude::*;
+
 use core::fmt;
 use core::str::FromStr;
 
diff --git a/cranelift/codegen/src/isa/aarch64/abi.rs b/cranelift/codegen/src/isa/aarch64/abi.rs
@@ -11,7 +11,7 @@ use crate::isa::aarch64::{inst::*, settings as aarch64_settings};
 use crate::isa::unwind::UnwindInst;
 use crate::isa::winch;
 use crate::machinst::*;
-use crate::prelude::*;
+
 use crate::settings;
 use alloc::borrow::ToOwned;
 use alloc::boxed::Box;
diff --git a/cranelift/codegen/src/isa/aarch64/inst/imms.rs b/cranelift/codegen/src/isa/aarch64/inst/imms.rs
@@ -3,7 +3,7 @@
 use crate::ir::types::*;
 use crate::isa::aarch64::inst::{OperandSize, ScalarSize};
 use crate::machinst::PrettyPrint;
-use crate::prelude::*;
+
 
 use alloc::string::String;
 
diff --git a/cranelift/codegen/src/isa/aarch64/inst/mod.rs b/cranelift/codegen/src/isa/aarch64/inst/mod.rs
@@ -5,7 +5,7 @@ use crate::ir::types::{F16, F32, F64, F128, I8, I8X16, I16, I32, I64, I128};
 use crate::ir::{MemFlags, Type, types};
 use crate::isa::{CallConv, FunctionAlignment};
 use crate::machinst::*;
-use crate::prelude::*;
+
 use crate::{CodegenError, CodegenResult, settings};
 
 use crate::machinst::{PrettyPrint, Reg, RegClass, Writable};
diff --git a/cranelift/codegen/src/isa/aarch64/inst/regs.rs b/cranelift/codegen/src/isa/aarch64/inst/regs.rs
@@ -5,7 +5,7 @@ use crate::isa::aarch64::inst::ScalarSize;
 use crate::isa::aarch64::inst::VectorSize;
 use crate::machinst::RealReg;
 use crate::machinst::{Reg, RegClass, Writable};
-use crate::prelude::*;
+
 use regalloc2::PReg;
 use regalloc2::VReg;
 
diff --git a/cranelift/codegen/src/isa/aarch64/mod.rs b/cranelift/codegen/src/isa/aarch64/mod.rs
@@ -10,7 +10,7 @@ use crate::machinst::{
     CompiledCode, CompiledCodeStencil, MachInst, MachTextSectionBuilder, Reg, SigSet,
     TextSectionBuilder, VCode, compile,
 };
-use crate::prelude::*;
+
 use crate::result::CodegenResult;
 use crate::settings as shared_settings;
 use alloc::string::String;
diff --git a/cranelift/codegen/src/isa/riscv64/abi.rs b/cranelift/codegen/src/isa/riscv64/abi.rs
@@ -14,7 +14,7 @@ use crate::ir::LibCall;
 use crate::ir::Signature;
 use crate::isa::riscv64::settings::Flags as RiscvFlags;
 use crate::isa::unwind::UnwindInst;
-use crate::prelude::*;
+
 use crate::settings;
 use alloc::boxed::Box;
 use alloc::vec::Vec;
diff --git a/cranelift/codegen/src/isa/riscv64/inst/mod.rs b/cranelift/codegen/src/isa/riscv64/inst/mod.rs
@@ -8,7 +8,7 @@ use crate::ir::types::{self, F16, F32, F64, F128, I8, I8X16, I16, I32, I64, I128
 pub use crate::ir::{ExternalName, MemFlags, Type};
 use crate::isa::{CallConv, FunctionAlignment};
 use crate::machinst::*;
-use crate::prelude::*;
+
 use crate::{CodegenError, CodegenResult, settings};
 
 pub use crate::ir::condcodes::FloatCC;
diff --git a/cranelift/codegen/src/isa/riscv64/inst/vector.rs b/cranelift/codegen/src/isa/riscv64/inst/vector.rs
@@ -5,7 +5,7 @@ use crate::isa::riscv64::lower::isle::generated_code::{
     VecElementWidth, VecLmul, VecMaskMode, VecOpCategory, VecOpMasking, VecTailMode,
 };
 use crate::machinst::{OperandVisitor, RegClass};
-use crate::prelude::*;
+
 use core::fmt;
 
 use super::{Type, UImm5};
diff --git a/cranelift/codegen/src/isa/riscv64/mod.rs b/cranelift/codegen/src/isa/riscv64/mod.rs
@@ -10,7 +10,7 @@ use crate::machinst::{
     CompiledCode, CompiledCodeStencil, MachInst, MachTextSectionBuilder, Reg, SigSet,
     TextSectionBuilder, VCode, compile,
 };
-use crate::prelude::*;
+
 use crate::result::CodegenResult;
 use crate::settings::{self as shared_settings, Flags};
 use crate::{CodegenError, ir};
diff --git a/cranelift/codegen/src/isa/s390x/abi.rs b/cranelift/codegen/src/isa/s390x/abi.rs
@@ -143,7 +143,7 @@ use crate::isa;
 use crate::isa::s390x::{inst::*, settings as s390x_settings};
 use crate::isa::unwind::UnwindInst;
 use crate::machinst::*;
-use crate::prelude::*;
+
 use crate::settings;
 use alloc::borrow::ToOwned;
 use alloc::vec::Vec;
diff --git a/cranelift/codegen/src/isa/s390x/inst/imms.rs b/cranelift/codegen/src/isa/s390x/inst/imms.rs
@@ -1,7 +1,7 @@
 //! S390x ISA definitions: immediate constants.
 
 use crate::machinst::PrettyPrint;
-use crate::prelude::*;
+
 use alloc::string::String;
 
 /// An unsigned 12-bit immediate.
diff --git a/cranelift/codegen/src/isa/s390x/inst/mod.rs b/cranelift/codegen/src/isa/s390x/inst/mod.rs
@@ -5,7 +5,7 @@ use crate::ir::{ExternalName, Type, types};
 use crate::isa::s390x::abi::S390xMachineDeps;
 use crate::isa::{CallConv, FunctionAlignment};
 use crate::machinst::*;
-use crate::prelude::*;
+
 use crate::{CodegenError, CodegenResult, settings};
 use alloc::boxed::Box;
 use alloc::string::{String, ToString};
diff --git a/cranelift/codegen/src/isa/s390x/inst/regs.rs b/cranelift/codegen/src/isa/s390x/inst/regs.rs
@@ -5,7 +5,7 @@ use regalloc2::PReg;
 
 use crate::isa::s390x::inst::{RegPair, WritableRegPair};
 use crate::machinst::*;
-use crate::prelude::*;
+
 
 //=============================================================================
 // Registers, the Universe thereof, and printing
diff --git a/cranelift/codegen/src/isa/s390x/mod.rs b/cranelift/codegen/src/isa/s390x/mod.rs
@@ -10,7 +10,7 @@ use crate::machinst::{
     CompiledCode, CompiledCodeStencil, MachInst, MachTextSectionBuilder, Reg, SigSet,
     TextSectionBuilder, VCode, compile,
 };
-use crate::prelude::*;
+
 use crate::result::CodegenResult;
 use crate::settings as shared_settings;
 use alloc::string::String;
diff --git a/cranelift/codegen/src/isa/x64/abi.rs b/cranelift/codegen/src/isa/x64/abi.rs
@@ -8,7 +8,7 @@ use crate::isa::winch;
 use crate::isa::{CallConv, unwind::UnwindInst, x64::inst::*, x64::settings as x64_settings};
 use crate::machinst::abi::*;
 use crate::machinst::*;
-use crate::prelude::*;
+
 use crate::settings;
 use alloc::borrow::ToOwned;
 use alloc::boxed::Box;
diff --git a/cranelift/codegen/src/isa/x64/inst/args.rs b/cranelift/codegen/src/isa/x64/inst/args.rs
@@ -7,7 +7,7 @@ use crate::ir::types::*;
 use crate::isa::x64::inst::Inst;
 use crate::isa::x64::inst::regs::pretty_print_reg;
 use crate::machinst::*;
-use crate::prelude::*;
+
 use alloc::string::String;
 use core::fmt;
 
diff --git a/cranelift/codegen/src/isa/x64/inst/external.rs b/cranelift/codegen/src/isa/x64/inst/external.rs
@@ -4,7 +4,7 @@ use super::{
     Amode, Gpr, Inst, LabelUse, MachBuffer, MachLabel, OperandVisitor, OperandVisitorImpl,
     SyntheticAmode, VCodeConstant, WritableGpr, WritableXmm, Xmm, args::FromWritableReg,
 };
-use crate::prelude::*;
+
 use crate::{Reg, Writable, ir::TrapCode};
 use alloc::string::String;
 use cranelift_assembler_x64 as asm;
diff --git a/cranelift/codegen/src/isa/x64/inst/mod.rs b/cranelift/codegen/src/isa/x64/inst/mod.rs
@@ -8,7 +8,7 @@ use crate::isa::x64::abi::X64ABIMachineSpec;
 use crate::isa::x64::inst::regs::pretty_print_reg;
 use crate::isa::x64::settings as x64_settings;
 use crate::isa::{CallConv, FunctionAlignment};
-use crate::prelude::*;
+
 use crate::{CodegenError, CodegenResult, settings};
 use crate::{machinst::*, trace};
 use alloc::boxed::Box;
diff --git a/cranelift/codegen/src/isa/x64/inst/regs.rs b/cranelift/codegen/src/isa/x64/inst/regs.rs
@@ -6,7 +6,7 @@
 //! Note also that we make use of pinned VRegs to refer to PRegs.
 
 use crate::machinst::Reg;
-use crate::prelude::*;
+
 use alloc::string::String;
 use alloc::string::ToString;
 use cranelift_assembler_x64::{gpr, xmm};
diff --git a/cranelift/codegen/src/isa/x64/mod.rs b/cranelift/codegen/src/isa/x64/mod.rs
@@ -13,7 +13,7 @@ use crate::machinst::{
     CompiledCode, CompiledCodeStencil, MachInst, MachTextSectionBuilder, Reg, SigSet,
     TextSectionBuilder, VCode, compile,
 };
-use crate::prelude::*;
+
 use crate::result::{CodegenError, CodegenResult};
 use crate::settings::{self as shared_settings, Flags};
 use crate::{Final, MachBufferFinalized};
diff --git a/cranelift/codegen/src/lib.rs b/cranelift/codegen/src/lib.rs
@@ -14,6 +14,7 @@
     allow(dead_code, reason = "see comment above")
 )]
 
+#[macro_use]
 extern crate alloc;
 
 #[cfg(feature = "std")]
@@ -45,8 +46,6 @@ pub use gimli;
 // Pull in generated the `isle_numerics_methods` macro.
 include!(concat!(env!("ISLE_DIR"), "/isle_numerics.rs"));
 
-mod prelude;
-
 #[macro_use]
 mod machinst;
 
diff --git a/cranelift/codegen/src/machinst/abi.rs b/cranelift/codegen/src/machinst/abi.rs
@@ -105,7 +105,7 @@ use crate::entity::SecondaryMap;
 use crate::ir::{ArgumentExtension, ArgumentPurpose, ExceptionTag, Signature};
 use crate::ir::{StackSlotKey, types::*};
 use crate::isa::TargetIsa;
-use crate::prelude::*;
+
 use crate::settings::ProbestackStrategy;
 use crate::{ir, isa};
 use crate::{machinst::*, trace};
diff --git a/cranelift/codegen/src/machinst/buffer.rs b/cranelift/codegen/src/machinst/buffer.rs
@@ -177,7 +177,7 @@ use crate::isa::unwind::UnwindInst;
 use crate::machinst::{
     BlockIndex, MachInstLabelUse, TextSectionBuilder, VCodeConstant, VCodeConstants, VCodeInst,
 };
-use crate::prelude::*;
+
 use crate::trace;
 use crate::{MachInstEmitState, ir};
 use crate::{VCodeConstantData, timing};
diff --git a/cranelift/codegen/src/machinst/lower.rs b/cranelift/codegen/src/machinst/lower.rs
@@ -20,7 +20,7 @@ use crate::machinst::{
     VCodeBuilder, VCodeConstant, VCodeConstantData, VCodeConstants, VCodeInst, ValueRegs, Writable,
     writable_value_regs,
 };
-use crate::prelude::*;
+
 use crate::settings::Flags;
 use crate::{CodegenError, CodegenResult, trace};
 use crate::{FxHashMap, FxHashSet};
diff --git a/cranelift/codegen/src/machinst/vcode.rs b/cranelift/codegen/src/machinst/vcode.rs
@@ -21,7 +21,7 @@ use crate::CodegenError;
 use crate::FxHashMap;
 use crate::ir::pcc::*;
 use crate::ir::{self, Constant, ConstantData, ValueLabel, types};
-use crate::prelude::*;
+
 use crate::ranges::Ranges;
 use crate::timing;
 use crate::trace;
diff --git a/cranelift/codegen/src/prelude.rs b/cranelift/codegen/src/prelude.rs
diff --git a/cranelift/codegen/src/settings.rs b/cranelift/codegen/src/settings.rs
@@ -22,7 +22,7 @@
 
 use crate::constant_hash::{probe, simple_hash};
 use crate::isa::TargetIsa;
-use crate::prelude::*;
+
 use alloc::boxed::Box;
 use alloc::string::{String, ToString};
 use core::fmt;
diff --git a/cranelift/codegen/src/verifier/mod.rs b/cranelift/codegen/src/verifier/mod.rs
@@ -77,7 +77,7 @@ use crate::ir::{
     ValueList, types,
 };
 use crate::isa::TargetIsa;
-use crate::prelude::*;
+
 use crate::print_errors::pretty_verifier_error;
 use crate::settings::FlagsOrIsa;
 use crate::timing;
diff --git a/cranelift/codegen/src/write.rs b/cranelift/codegen/src/write.rs
@@ -9,7 +9,7 @@ use crate::ir::immediates::Ieee128;
 use crate::ir::pcc::Fact;
 use crate::ir::{Block, DataFlowGraph, Function, Inst, Opcode, SigRef, Type, Value, ValueDef};
 use crate::packed_option::ReservedValue;
-use crate::prelude::*;
+
 use alloc::string::{String, ToString};
 use alloc::vec::Vec;
 use core::fmt::{self, Write};
