From ad9dd47371d0e8b9865b96b9079d1fdd70eba773 Mon Sep 17 00:00:00 2001 From: Chase Wilson Date: Sat, 4 Dec 2021 10:51:11 -0600 Subject: [PATCH 1/3] Made CodeAssembler traits public --- src/rust/iced-x86/src/code_asm.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/rust/iced-x86/src/code_asm.rs b/src/rust/iced-x86/src/code_asm.rs index 22daeb31c..27b04d2af 100644 --- a/src/rust/iced-x86/src/code_asm.rs +++ b/src/rust/iced-x86/src/code_asm.rs @@ -26,6 +26,7 @@ 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::*; From 8dcafe049003517c8ec969a42d3954415c84c131 Mon Sep 17 00:00:00 2001 From: Chase Wilson Date: Sun, 5 Dec 2021 10:59:23 -0600 Subject: [PATCH 2/3] Renamed fn_asm_traits.rs to asm_traits.rs and exported it --- .../Assembler/Rust/RustAssemblerSyntaxGenerator.cs | 6 +++--- src/rust/iced-x86/src/code_asm.rs | 5 +++-- .../src/code_asm/{fn_asm_traits.rs => asm_traits.rs} | 0 src/rust/iced-x86/src/code_asm/fn_asm_impl.rs | 2 +- src/rust/iced-x86/src/code_asm/fn_asm_pub.rs | 2 +- 5 files changed, 8 insertions(+), 7 deletions(-) rename src/rust/iced-x86/src/code_asm/{fn_asm_traits.rs => asm_traits.rs} (100%) diff --git a/src/csharp/Intel/Generator/Assembler/Rust/RustAssemblerSyntaxGenerator.cs b/src/csharp/Intel/Generator/Assembler/Rust/RustAssemblerSyntaxGenerator.cs index eb777cd37..c016cc6fe 100644 --- 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 index 27b04d2af..f9d0a13d5 100644 --- a/src/rust/iced-x86/src/code_asm.rs +++ b/src/rust/iced-x86/src/code_asm.rs @@ -15,10 +15,12 @@ //! //! [`CodeAssembler`]: struct.CodeAssembler.html +#[doc(hidden)] +#[allow(clippy::missing_errors_doc)] +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; @@ -26,7 +28,6 @@ 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/src/rust/iced-x86/src/code_asm/fn_asm_traits.rs b/src/rust/iced-x86/src/code_asm/asm_traits.rs similarity index 100% rename from src/rust/iced-x86/src/code_asm/fn_asm_traits.rs rename to 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 index 08f525803..6f02adefb 100644 --- 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 index 27242f740..dee22f4d2 100644 --- 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; From 0d5167ce4521e531979b385082ab65f467a51299 Mon Sep 17 00:00:00 2001 From: Chase Wilson Date: Tue, 14 Dec 2021 20:40:14 -0600 Subject: [PATCH 3/3] Allow inline and doc warnings --- src/rust/iced-x86/src/code_asm.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/rust/iced-x86/src/code_asm.rs b/src/rust/iced-x86/src/code_asm.rs index f9d0a13d5..87ef18f0a 100644 --- a/src/rust/iced-x86/src/code_asm.rs +++ b/src/rust/iced-x86/src/code_asm.rs @@ -15,10 +15,10 @@ //! //! [`CodeAssembler`]: struct.CodeAssembler.html -#[doc(hidden)] -#[allow(clippy::missing_errors_doc)] +#[allow(missing_docs, clippy::missing_errors_doc)] pub mod asm_traits; mod code_asm_methods; +#[allow(clippy::missing_inline_in_public_items)] mod fn_asm_impl; mod fn_asm_pub; mod mem;