Use crate:: instead of self::

src/rust/iced-x86/src/block_enc.rs

@@ -7,9 +7,9 @@ mod instr;
 #[cfg(test)]
 mod tests;
 
-use self::block::*;
-pub use self::enums::*;
-use self::instr::*;
+use crate::block_enc::block::*;
+pub use crate::block_enc::enums::*;
+use crate::block_enc::instr::*;
 use crate::iced_constants::IcedConstants;
 use crate::iced_error::IcedError;
 use crate::*;

src/rust/iced-x86/src/block_enc/instr/mod.rs

@@ -9,14 +9,14 @@ mod simple_br_instr;
 mod simple_instr;
 mod xbegin_instr;
 
-use self::call_instr::CallInstr;
-use self::ip_relmem_instr::IpRelMemOpInstr;
-use self::jcc_instr::JccInstr;
-use self::jmp_instr::JmpInstr;
-use self::simple_br_instr::SimpleBranchInstr;
-use self::simple_instr::SimpleInstr;
-use self::xbegin_instr::XbeginInstr;
 use crate::block_enc::block::{Block, BlockData};
+use crate::block_enc::instr::call_instr::CallInstr;
+use crate::block_enc::instr::ip_relmem_instr::IpRelMemOpInstr;
+use crate::block_enc::instr::jcc_instr::JccInstr;
+use crate::block_enc::instr::jmp_instr::JmpInstr;
+use crate::block_enc::instr::simple_br_instr::SimpleBranchInstr;
+use crate::block_enc::instr::simple_instr::SimpleInstr;
+use crate::block_enc::instr::xbegin_instr::XbeginInstr;
 use crate::block_enc::*;
 use crate::iced_error::IcedError;
 use alloc::rc::Rc;

src/rust/iced-x86/src/decoder.rs

@@ -15,8 +15,8 @@ mod table_de;
 #[cfg(test)]
 pub(crate) mod tests;
 
-use self::handlers::OpCodeHandler;
-use self::handlers_tables::TABLES;
+use crate::decoder::handlers::OpCodeHandler;
+use crate::decoder::handlers_tables::TABLES;
 use crate::iced_constants::IcedConstants;
 use crate::iced_error::IcedError;
 use crate::tuple_type_tbl::get_disp8n;

src/rust/iced-x86/src/decoder/table_de/mod.rs

@@ -15,10 +15,10 @@ mod legacy_reader;
 #[cfg(any(not(feature = "no_vex"), not(feature = "no_xop")))]
 mod vex_reader;
 
-use self::enums::*;
 use crate::data_reader::DataReader;
 use crate::decoder::handlers::is_null_instance_handler;
 use crate::decoder::handlers::OpCodeHandler;
+use crate::decoder::table_de::enums::*;
 use crate::Register;
 #[cfg(not(feature = "no_evex"))]
 use crate::TupleType;

src/rust/iced-x86/src/decoder/tests/mod.rs

@@ -10,9 +10,9 @@ mod test_cases;
 mod test_parser;
 pub(crate) mod test_utils;
 
-use self::decoder_mem_test_case::*;
-use self::decoder_test_case::*;
-use self::test_utils::*;
+use crate::decoder::tests::decoder_mem_test_case::*;
+use crate::decoder::tests::decoder_test_case::*;
+use crate::decoder::tests::test_utils::*;
 use crate::iced_constants::IcedConstants;
 use crate::test_utils::from_str_conv::{code_names, is_ignored_code, to_vec_u8};
 use crate::test_utils::*;

src/rust/iced-x86/src/encoder.rs

@@ -25,12 +25,12 @@ mod ops_tables;
 #[cfg(test)]
 pub(crate) mod tests;
 
-pub use self::enums::*;
-use self::handlers_table::*;
-pub use self::mem_op::*;
+pub use crate::encoder::enums::*;
+use crate::encoder::handlers_table::*;
+pub use crate::encoder::mem_op::*;
 #[cfg(feature = "op_code_info")]
-pub use self::op_code::*;
-use self::op_code_handler::OpCodeHandler;
+pub use crate::encoder::op_code::*;
+use crate::encoder::op_code_handler::OpCodeHandler;
 use crate::iced_constants::IcedConstants;
 use crate::iced_error::IcedError;
 use crate::*;

src/rust/iced-x86/src/encoder/tests/mod.rs

@@ -10,12 +10,12 @@ mod op_code_test_case;
 #[cfg(feature = "op_code_info")]
 mod op_code_test_case_parser;
 
-#[cfg(feature = "op_code_info")]
-use self::op_code_test_case::*;
-#[cfg(feature = "op_code_info")]
-use self::op_code_test_case_parser::OpCodeInfoTestParser;
 use crate::decoder::tests::test_utils::*;
 use crate::encoder::op_code_handler::InvalidHandler;
+#[cfg(feature = "op_code_info")]
+use crate::encoder::tests::op_code_test_case::*;
+#[cfg(feature = "op_code_info")]
+use crate::encoder::tests::op_code_test_case_parser::OpCodeInfoTestParser;
 use crate::iced_constants::IcedConstants;
 use crate::test_utils::from_str_conv::to_vec_u8;
 #[cfg(feature = "op_code_info")]

src/rust/iced-x86/src/formatter/fast.rs

@@ -8,9 +8,9 @@ mod mem_size_tbl;
 #[cfg(test)]
 mod tests;
 
-use self::enums::*;
-use self::fmt_tbl::FMT_DATA;
-use self::mem_size_tbl::MEM_SIZE_TBL;
+use crate::formatter::fast::enums::*;
+use crate::formatter::fast::fmt_tbl::FMT_DATA;
+use crate::formatter::fast::mem_size_tbl::MEM_SIZE_TBL;
 use crate::formatter::fmt_utils_all::*;
 use crate::formatter::instruction_internal::get_address_size_in_bytes;
 use crate::formatter::pseudo_ops::get_pseudo_ops;

src/rust/iced-x86/src/formatter/fast/tests/mod.rs

@@ -6,7 +6,7 @@ mod misc;
 mod options;
 mod symres;
 
-use self::fmt_factory::*;
+use crate::formatter::fast::tests::fmt_factory::*;
 use crate::formatter::tests::formatter_test_fast;
 #[cfg(feature = "encoder")]
 use crate::formatter::tests::formatter_test_nondec_fast;

src/rust/iced-x86/src/formatter/gas.rs

@@ -10,14 +10,14 @@ mod regs;
 #[cfg(test)]
 mod tests;
 
-use self::enums::*;
-use self::fmt_tbl::ALL_INFOS;
-use self::info::*;
-use self::mem_size_tbl::MEM_SIZE_TBL;
-use self::regs::*;
 use crate::formatter::fmt_consts::*;
 use crate::formatter::fmt_utils::*;
 use crate::formatter::fmt_utils_all::*;
+use crate::formatter::gas::enums::*;
+use crate::formatter::gas::fmt_tbl::ALL_INFOS;
+use crate::formatter::gas::info::*;
+use crate::formatter::gas::mem_size_tbl::MEM_SIZE_TBL;
+use crate::formatter::gas::regs::*;
 use crate::formatter::instruction_internal::get_address_size_in_bytes;
 use crate::formatter::num_fmt::*;
 use crate::formatter::regs_tbl::REGS_TBL;

src/rust/iced-x86/src/formatter/gas/tests/mod.rs

@@ -8,7 +8,7 @@ mod options;
 mod registers;
 mod symres;
 
-use self::fmt_factory::*;
+use crate::formatter::gas::tests::fmt_factory::*;
 use crate::formatter::tests::formatter_test;
 #[cfg(feature = "encoder")]
 use crate::formatter::tests::formatter_test_nondec;

src/rust/iced-x86/src/formatter/intel.rs

@@ -10,16 +10,16 @@ mod regs;
 #[cfg(test)]
 mod tests;
 
-use self::enums::*;
-use self::fmt_tbl::ALL_INFOS;
-use self::info::*;
-use self::mem_size_tbl::Info;
-use self::mem_size_tbl::MEM_SIZE_TBL;
-use self::regs::*;
 use crate::formatter::fmt_consts::*;
 use crate::formatter::fmt_utils::*;
 use crate::formatter::fmt_utils_all::*;
 use crate::formatter::instruction_internal::get_address_size_in_bytes;
+use crate::formatter::intel::enums::*;
+use crate::formatter::intel::fmt_tbl::ALL_INFOS;
+use crate::formatter::intel::info::*;
+use crate::formatter::intel::mem_size_tbl::Info;
+use crate::formatter::intel::mem_size_tbl::MEM_SIZE_TBL;
+use crate::formatter::intel::regs::*;
 use crate::formatter::num_fmt::*;
 use crate::formatter::regs_tbl::REGS_TBL;
 use crate::formatter::*;

src/rust/iced-x86/src/formatter/intel/tests/mod.rs

@@ -8,7 +8,7 @@ mod options;
 mod registers;
 mod symres;
 
-use self::fmt_factory::*;
+use crate::formatter::intel::tests::fmt_factory::*;
 use crate::formatter::tests::formatter_test;
 #[cfg(feature = "encoder")]
 use crate::formatter::tests::formatter_test_nondec;

src/rust/iced-x86/src/formatter/masm.rs

@@ -10,16 +10,16 @@ mod regs;
 #[cfg(test)]
 mod tests;
 
-use self::enums::*;
-use self::fmt_tbl::ALL_INFOS;
-use self::info::*;
-use self::mem_size_tbl::Info;
-use self::mem_size_tbl::MEM_SIZE_TBL;
-use self::regs::*;
 use crate::formatter::fmt_consts::*;
 use crate::formatter::fmt_utils::*;
 use crate::formatter::fmt_utils_all::*;
 use crate::formatter::instruction_internal::get_address_size_in_bytes;
+use crate::formatter::masm::enums::*;
+use crate::formatter::masm::fmt_tbl::ALL_INFOS;
+use crate::formatter::masm::info::*;
+use crate::formatter::masm::mem_size_tbl::Info;
+use crate::formatter::masm::mem_size_tbl::MEM_SIZE_TBL;
+use crate::formatter::masm::regs::*;
 use crate::formatter::num_fmt::*;
 use crate::formatter::regs_tbl::REGS_TBL;
 use crate::formatter::*;

src/rust/iced-x86/src/formatter/masm/tests/mod.rs

@@ -10,7 +10,7 @@ mod sym_opts;
 mod sym_opts_parser;
 mod symres;
 
-use self::fmt_factory::*;
+use crate::formatter::masm::tests::fmt_factory::*;
 use crate::formatter::tests::formatter_test;
 #[cfg(feature = "encoder")]
 use crate::formatter::tests::formatter_test_nondec;

src/rust/iced-x86/src/formatter/mod.rs

@@ -39,29 +39,29 @@ mod symres;
 pub(crate) mod tests;
 
 #[cfg(any(feature = "gas", feature = "intel", feature = "masm", feature = "nasm"))]
-pub use self::enums::*;
-pub use self::enums_shared::*;
+pub use crate::formatter::enums::*;
+pub use crate::formatter::enums_shared::*;
 #[cfg(feature = "fast_fmt")]
-pub use self::fast::*;
+pub use crate::formatter::fast::*;
 #[cfg(any(feature = "gas", feature = "intel", feature = "masm", feature = "nasm"))]
-pub use self::fmt_opt_provider::*;
+pub use crate::formatter::fmt_opt_provider::*;
 #[cfg(any(feature = "gas", feature = "intel", feature = "masm", feature = "nasm"))]
-pub use self::fmt_opts::*;
+pub use crate::formatter::fmt_opts::*;
 #[cfg(feature = "gas")]
-pub use self::gas::*;
+pub use crate::formatter::gas::*;
 #[cfg(feature = "intel")]
-pub use self::intel::*;
+pub use crate::formatter::intel::*;
 #[cfg(feature = "masm")]
-pub use self::masm::*;
+pub use crate::formatter::masm::*;
 #[cfg(feature = "nasm")]
-pub use self::nasm::*;
+pub use crate::formatter::nasm::*;
 #[cfg(any(feature = "gas", feature = "intel", feature = "masm", feature = "nasm"))]
-use self::num_fmt::NumberFormatter;
+use crate::formatter::num_fmt::NumberFormatter;
 #[cfg(any(feature = "gas", feature = "intel", feature = "masm", feature = "nasm"))]
-pub use self::num_fmt_opts::*;
+pub use crate::formatter::num_fmt_opts::*;
 #[cfg(any(feature = "gas", feature = "intel", feature = "masm", feature = "nasm"))]
-pub use self::string_output::*;
-pub use self::symres::*;
+pub use crate::formatter::string_output::*;
+pub use crate::formatter::symres::*;
 use crate::*;
 use alloc::string::String;
 use alloc::vec::Vec;

src/rust/iced-x86/src/formatter/nasm.rs

@@ -10,16 +10,16 @@ mod regs;
 #[cfg(test)]
 mod tests;
 
-use self::enums::*;
-use self::fmt_tbl::ALL_INFOS;
-use self::info::*;
-use self::mem_size_tbl::Info;
-use self::mem_size_tbl::MEM_SIZE_TBL;
-use self::regs::*;
 use crate::formatter::fmt_consts::*;
 use crate::formatter::fmt_utils::*;
 use crate::formatter::fmt_utils_all::*;
 use crate::formatter::instruction_internal::get_address_size_in_bytes;
+use crate::formatter::nasm::enums::*;
+use crate::formatter::nasm::fmt_tbl::ALL_INFOS;
+use crate::formatter::nasm::info::*;
+use crate::formatter::nasm::mem_size_tbl::Info;
+use crate::formatter::nasm::mem_size_tbl::MEM_SIZE_TBL;
+use crate::formatter::nasm::regs::*;
 use crate::formatter::num_fmt::*;
 use crate::formatter::*;
 use crate::iced_error::IcedError;

src/rust/iced-x86/src/formatter/nasm/tests/mod.rs

@@ -8,7 +8,7 @@ mod options;
 mod registers;
 mod symres;
 
-use self::fmt_factory::*;
+use crate::formatter::nasm::tests::fmt_factory::*;
 use crate::formatter::tests::formatter_test;
 #[cfg(feature = "encoder")]
 use crate::formatter::tests::formatter_test_nondec;

src/rust/iced-x86/src/formatter/tests/mod.rs

@@ -22,9 +22,9 @@ pub(super) mod sym_res;
 pub(super) mod sym_res_test_case;
 pub(super) mod sym_res_test_parser;
 
-use self::instr_infos::*;
 #[cfg(feature = "encoder")]
 use crate::encoder::tests::non_decoded_tests;
+use crate::formatter::tests::instr_infos::*;
 #[cfg(feature = "fast_fmt")]
 use crate::formatter::FastFormatter;
 #[cfg(any(feature = "gas", feature = "intel", feature = "masm", feature = "nasm"))]

src/rust/iced-x86/src/info/mod.rs

@@ -9,8 +9,8 @@ pub(crate) mod rflags_table;
 #[cfg(test)]
 mod tests;
 
-pub use self::factory::*;
 use crate::iced_constants::IcedConstants;
+pub use crate::info::factory::*;
 use crate::*;
 use alloc::vec::Vec;
 use core::fmt;
@@ -332,7 +332,7 @@ impl InstructionInfo {
 	#[must_use]
 	#[inline(always)]
 	fn new(options: u32) -> Self {
-		use self::enums::InstrInfoConstants;
+		use crate::info::enums::InstrInfoConstants;
 		Self {
 			used_registers: if (options & InstructionInfoOptions::NO_REGISTER_USAGE) == 0 {
 				Vec::with_capacity(InstrInfoConstants::DEFAULT_USED_REGISTER_COLL_CAPACITY)

src/rust/iced-x86/src/info/tests/mod.rs

@@ -11,14 +11,14 @@ mod reg_test_parser;
 mod test_parser;
 mod va;
 
-use self::constants::*;
-use self::info_test_case::*;
-use self::mem_size_test_parser::*;
-use self::misc_test_data::*;
-use self::reg_test_parser::*;
-use self::test_parser::*;
 use crate::iced_constants::IcedConstants;
 use crate::info::factory::*;
+use crate::info::tests::constants::*;
+use crate::info::tests::info_test_case::*;
+use crate::info::tests::mem_size_test_parser::*;
+use crate::info::tests::misc_test_data::*;
+use crate::info::tests::reg_test_parser::*;
+use crate::info::tests::test_parser::*;
 use crate::test_utils::from_str_conv::*;
 use crate::test_utils::*;
 use crate::*;

src/rust/iced-x86/src/lib.rs

@@ -1261,22 +1261,22 @@ pub(crate) mod test_utils;
 mod tuple_type_tbl;
 
 #[cfg(all(feature = "encoder", feature = "block_encoder"))]
-pub use self::block_enc::*;
-pub use self::code::*;
+pub use crate::block_enc::*;
+pub use crate::code::*;
 #[cfg(any(feature = "decoder", feature = "encoder"))]
-pub use self::constant_offsets::*;
+pub use crate::constant_offsets::*;
 #[cfg(feature = "decoder")]
-pub use self::decoder::*;
+pub use crate::decoder::*;
 #[cfg(feature = "encoder")]
-pub use self::encoder::*;
-pub use self::enums::*;
+pub use crate::encoder::*;
+pub use crate::enums::*;
 #[cfg(any(feature = "gas", feature = "intel", feature = "masm", feature = "nasm", feature = "fast_fmt"))]
-pub use self::formatter::*;
-pub use self::iced_error::*;
-pub use self::iced_features::*;
+pub use crate::formatter::*;
+pub use crate::iced_error::*;
+pub use crate::iced_features::*;
 #[cfg(feature = "instr_info")]
-pub use self::info::*;
-pub use self::instruction::*;
-pub use self::memory_size::*;
-pub use self::mnemonic::*;
-pub use self::register::*;
+pub use crate::info::*;
+pub use crate::instruction::*;
+pub use crate::memory_size::*;
+pub use crate::mnemonic::*;
+pub use crate::register::*;

src/rust/iced-x86/src/memory_size.rs

@@ -8,12 +8,12 @@ use core::iter::{ExactSizeIterator, FusedIterator, Iterator};
 use core::{fmt, mem};
 
 #[cfg(any(feature = "instr_info", feature = "encoder"))]
-pub use self::info::*;
+pub use crate::memory_size::info::*;
 
 #[cfg(any(feature = "instr_info", feature = "encoder"))]
 mod info {
-	use super::MemorySize;
 	use crate::iced_constants::IcedConstants;
+	use crate::MemorySize;
 
 	#[rustfmt::skip]
 	pub(super) static MEMORY_SIZE_INFOS: &[MemorySizeInfo; IcedConstants::MEMORY_SIZE_ENUM_COUNT] = &[