Renamed fn_asm_traits.rs to asm_traits.rs and exported it

icedland · Dec 6, 2021 · a5c7f62 · a5c7f62
1 parent 28e9b13
commit a5c7f62
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 7 deletions.
diff --git a/src/csharp/Intel/Generator/Assembler/Rust/RustAssemblerSyntaxGenerator.cs b/src/csharp/Intel/Generator/Assembler/Rust/RustAssemblerSyntaxGenerator.cs
@@ -453,7 +453,7 @@ static void WriteGenericParameterTypes(FileWriter writer, int count) {
 		}
 
 		void GenerateAsmTraits(TraitGroup[] traitGroups) {
-			var filename = genTypes.Dirs.GetRustFilename("code_asm", "fn_asm_traits.rs");
+			var filename = genTypes.Dirs.GetRustFilename("code_asm", "asm_traits.rs");
 			using (var writer = new FileWriter(TargetLanguage.Rust, FileUtils.OpenWrite(filename))) {
 				writer.WriteFileHeader();
 				writer.WriteLine(RustConstants.InnerAttributeAllowNonCamelCaseTypes);
@@ -565,7 +565,7 @@ void GenerateAsmPub(TraitGroup[] traitGroups) {
 			var filename = genTypes.Dirs.GetRustFilename("code_asm", "fn_asm_pub.rs");
 			using (var writer = new FileWriter(TargetLanguage.Rust, FileUtils.OpenWrite(filename))) {
 				writer.WriteFileHeader();
-				writer.WriteLine("use crate::code_asm::fn_asm_traits::*;");
+				writer.WriteLine("use crate::code_asm::asm_traits::*;");
 				writer.WriteLine($"use crate::code_asm::{CodeAssembler};");
 				writer.WriteLine($"use crate::{ErrorType};");
 				writer.WriteLine();
@@ -696,7 +696,7 @@ void GenerateAsmImpl(TraitGroup[] traitGroups) {
 				writer.WriteFileHeader();
 				writer.WriteLine("#![allow(clippy::if_same_then_else)]");
 				writer.WriteLine();
-				writer.WriteLine("use crate::code_asm::fn_asm_traits::*;");
+				writer.WriteLine("use crate::code_asm::asm_traits::*;");
 				writer.WriteLine("use crate::code_asm::mem::*;");
 				writer.WriteLine($"use crate::code_asm::op_state::{memoryOperandSizeType.Name(idConverter)};");
 				writer.WriteLine("use crate::code_asm::reg::*;");

diff --git a/src/rust/iced-x86/src/code_asm.rs b/src/rust/iced-x86/src/code_asm.rs
@@ -15,18 +15,17 @@
 //!
 //! [`CodeAssembler`]: struct.CodeAssembler.html
 
+pub mod asm_traits;
 mod code_asm_methods;
 mod fn_asm_impl;
 mod fn_asm_pub;
-mod fn_asm_traits;
 mod mem;
 mod op_state;
 mod reg;
 pub mod registers;
 #[cfg(test)]
 mod tests;
 
-pub use crate::code_asm::fn_asm_traits as asm_traits;
 pub use crate::code_asm::mem::*;
 pub use crate::code_asm::reg::*;
 pub use crate::code_asm::registers::*;

diff --git a/...st/iced-x86/src/code_asm/fn_asm_traits.rs → src/rust/iced-x86/src/code_asm/asm_traits.rs b/...st/iced-x86/src/code_asm/fn_asm_traits.rs → src/rust/iced-x86/src/code_asm/asm_traits.rs
diff --git a/src/rust/iced-x86/src/code_asm/fn_asm_impl.rs b/src/rust/iced-x86/src/code_asm/fn_asm_impl.rs
@@ -5,7 +5,7 @@
 
 #![allow(clippy::if_same_then_else)]
 
-use crate::code_asm::fn_asm_traits::*;
+use crate::code_asm::asm_traits::*;
 use crate::code_asm::mem::*;
 use crate::code_asm::op_state::MemoryOperandSize;
 use crate::code_asm::reg::*;

diff --git a/src/rust/iced-x86/src/code_asm/fn_asm_pub.rs b/src/rust/iced-x86/src/code_asm/fn_asm_pub.rs
@@ -3,7 +3,7 @@
 
 // ⚠️This file was generated by GENERATOR!🦹‍♂️
 
-use crate::code_asm::fn_asm_traits::*;
+use crate::code_asm::asm_traits::*;
 use crate::code_asm::CodeAssembler;
 use crate::IcedError;