diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7924d7b0a..498e22d49 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -331,7 +331,7 @@ jobs: # shell: bash -le {0} # setup-python is faster to install than setup-miniconda so we only # use setup-miniconda if this is a macos image. - - uses: conda-incubator/setup-miniconda@v3.0.4 + - uses: conda-incubator/setup-miniconda@v3.1.0 with: python-version: '3.8' - name: Install Python tools @@ -346,7 +346,7 @@ jobs: ./build/build-python --no-set-rustflags --python python --quick-check git clean -xdf - - uses: conda-incubator/setup-miniconda@v3.0.4 + - uses: conda-incubator/setup-miniconda@v3.1.0 with: python-version: '3.8' - name: Build and test the wheel @@ -355,7 +355,7 @@ jobs: python --version 2>&1 | grep 'Python 3\.8' bash build/ci-py-build-wheels.sh --build - - uses: conda-incubator/setup-miniconda@v3.0.4 + - uses: conda-incubator/setup-miniconda@v3.1.0 with: python-version: '3.9' - name: Build and test the wheel @@ -364,7 +364,7 @@ jobs: python --version 2>&1 | grep 'Python 3\.9' bash build/ci-py-build-wheels.sh - - uses: conda-incubator/setup-miniconda@v3.0.4 + - uses: conda-incubator/setup-miniconda@v3.1.0 with: python-version: '3.10' - name: Build and test the wheel @@ -373,7 +373,7 @@ jobs: python --version 2>&1 | grep 'Python 3\.10' bash build/ci-py-build-wheels.sh - - uses: conda-incubator/setup-miniconda@v3.0.4 + - uses: conda-incubator/setup-miniconda@v3.1.0 with: python-version: '3.11' - name: Build and test the wheel diff --git a/src/csharp/Intel/Iced.UnitTests/Iced.UnitTests.csproj b/src/csharp/Intel/Iced.UnitTests/Iced.UnitTests.csproj index 9834cd999..d77227233 100644 --- a/src/csharp/Intel/Iced.UnitTests/Iced.UnitTests.csproj +++ b/src/csharp/Intel/Iced.UnitTests/Iced.UnitTests.csproj @@ -14,9 +14,9 @@ - - - + + + diff --git a/src/java/iced-x86/pom.xml b/src/java/iced-x86/pom.xml index 0885d8e4f..dd880f7da 100644 --- a/src/java/iced-x86/pom.xml +++ b/src/java/iced-x86/pom.xml @@ -47,13 +47,13 @@ org.junit.jupiter junit-jupiter-engine - 5.10.3 + 5.11.3 test org.junit.jupiter junit-jupiter-params - 5.10.3 + 5.11.3 test @@ -82,7 +82,7 @@ maven-surefire-plugin - 3.3.1 + 3.5.2 maven-jar-plugin @@ -102,19 +102,19 @@ maven-install-plugin - 3.1.2 + 3.1.3 maven-deploy-plugin - 3.1.2 + 3.1.3 maven-site-plugin - 4.0.0-M15 + 4.0.0-M16 maven-project-info-reports-plugin - 3.6.1 + 3.8.0 maven-source-plugin @@ -131,7 +131,7 @@ maven-javadoc-plugin - 3.7.0 + 3.11.1 attach-javadocs @@ -151,7 +151,7 @@ maven-gpg-plugin - 3.2.4 + 3.2.7 sign-artifacts diff --git a/src/rust/iced-x86/src/block_enc/instr/mod.rs b/src/rust/iced-x86/src/block_enc/instr/mod.rs index ea8d5035c..c5b449ccb 100644 --- a/src/rust/iced-x86/src/block_enc/instr/mod.rs +++ b/src/rust/iced-x86/src/block_enc/instr/mod.rs @@ -130,6 +130,7 @@ impl InstrUtils { format!("{} : 0x{:X}", error_message, instruction.ip()) } + #[allow(unexpected_cfgs)] pub(super) fn create(block_encoder: &mut BlockEncInt, base: &mut InstrBase, instruction: &Instruction) -> Box { #[cfg_attr(feature = "cargo-fmt", rustfmt::skip)] match instruction.code() { diff --git a/src/rust/iced-x86/src/code.rs b/src/rust/iced-x86/src/code.rs index e8cc5f97d..1f9c3b84a 100644 --- a/src/rust/iced-x86/src/code.rs +++ b/src/rust/iced-x86/src/code.rs @@ -44853,6 +44853,7 @@ impl Code { #[must_use] #[inline] #[allow(clippy::match_like_matches_macro)] + #[allow(unexpected_cfgs)] pub const fn is_string_instruction(self) -> bool { #[cfg_attr(feature = "cargo-fmt", rustfmt::skip)] match self { @@ -45083,6 +45084,7 @@ impl Code { impl Code { #[must_use] #[allow(clippy::match_like_matches_macro)] + #[allow(unexpected_cfgs)] pub(crate) const fn ignores_segment(self) -> bool { #[cfg_attr(feature = "cargo-fmt", rustfmt::skip)] match self { @@ -45108,6 +45110,7 @@ impl Code { #[must_use] #[inline] #[allow(clippy::match_like_matches_macro)] + #[allow(unexpected_cfgs)] pub(crate) const fn ignores_index(self) -> bool { #[cfg_attr(feature = "cargo-fmt", rustfmt::skip)] match self { @@ -45123,6 +45126,7 @@ impl Code { #[must_use] #[inline] + #[allow(unexpected_cfgs)] pub(crate) const fn is_tile_stride_index(self) -> bool { #[cfg_attr(feature = "cargo-fmt", rustfmt::skip)] match self { diff --git a/src/rust/iced-x86/src/encoder/instruction_fmt.rs b/src/rust/iced-x86/src/encoder/instruction_fmt.rs index 091570523..6cefaf5e2 100644 --- a/src/rust/iced-x86/src/encoder/instruction_fmt.rs +++ b/src/rust/iced-x86/src/encoder/instruction_fmt.rs @@ -282,6 +282,7 @@ impl<'a, 'b> InstructionFormatter<'a, 'b> { } } + #[allow(unexpected_cfgs)] pub(super) fn format(&mut self) -> String { if !self.op_code.is_instruction() { match self.op_code.code() { diff --git a/src/rust/iced-x86/src/encoder/op_code_fmt.rs b/src/rust/iced-x86/src/encoder/op_code_fmt.rs index 8b2b2dc14..cf6b9a76f 100644 --- a/src/rust/iced-x86/src/encoder/op_code_fmt.rs +++ b/src/rust/iced-x86/src/encoder/op_code_fmt.rs @@ -141,6 +141,7 @@ impl<'a, 'b> OpCodeFormatter<'a, 'b> { EncodingKind::EVEX | EncodingKind::XOP | EncodingKind::D3NOW | EncodingKind::MVEX => return true, } + #[allow(unexpected_cfgs)] for &op_kind in self.op_code.op_kinds() { #[cfg_attr(feature = "cargo-fmt", rustfmt::skip)] match op_kind { @@ -205,6 +206,7 @@ impl<'a, 'b> OpCodeFormatter<'a, 'b> { false } + #[allow(unexpected_cfgs)] fn has_vsib(&self) -> bool { for &op_kind in self.op_code.op_kinds() { #[cfg_attr(feature = "cargo-fmt", rustfmt::skip)] diff --git a/src/rust/iced-x86/src/encoder/ops.rs b/src/rust/iced-x86/src/encoder/ops.rs index 56becbbec..55af8c7a3 100644 --- a/src/rust/iced-x86/src/encoder/ops.rs +++ b/src/rust/iced-x86/src/encoder/ops.rs @@ -268,6 +268,7 @@ impl Op for OpIq { } #[allow(non_camel_case_types)] +#[allow(dead_code)] pub(super) struct OpI4; impl Op for OpI4 { fn encode(&self, encoder: &mut Encoder, instruction: &Instruction, operand: u32) { @@ -484,6 +485,7 @@ impl Op for OpImm { } #[allow(non_camel_case_types)] +#[allow(dead_code)] pub(super) struct OpHx { pub(super) reg_lo: Register, pub(super) reg_hi: Register, diff --git a/src/rust/iced-x86/src/encoder/tests/dec_enc.rs b/src/rust/iced-x86/src/encoder/tests/dec_enc.rs index 38eb70c25..70d067429 100644 --- a/src/rust/iced-x86/src/encoder/tests/dec_enc.rs +++ b/src/rust/iced-x86/src/encoder/tests/dec_enc.rs @@ -695,17 +695,21 @@ fn verify_tuple_type_bcst() { continue; } let op_code = code.op_code(); - let expected_bcst = - matches!( - op_code.tuple_type(), - TupleType::N8b4 - | TupleType::N16b4 | TupleType::N32b4 - | TupleType::N64b4 | TupleType::N16b8 - | TupleType::N32b8 | TupleType::N64b8 - | TupleType::N4b2 | TupleType::N8b2 - | TupleType::N16b2 | TupleType::N32b2 - | TupleType::N64b2 - ); + let expected_bcst = matches!( + op_code.tuple_type(), + TupleType::N8b4 + | TupleType::N16b4 + | TupleType::N32b4 + | TupleType::N64b4 + | TupleType::N16b8 + | TupleType::N32b8 + | TupleType::N64b8 + | TupleType::N4b2 + | TupleType::N8b2 + | TupleType::N16b2 + | TupleType::N32b2 + | TupleType::N64b2 + ); assert_eq!(op_code.can_broadcast(), expected_bcst); } } diff --git a/src/rust/iced-x86/src/encoder/tests/mod.rs b/src/rust/iced-x86/src/encoder/tests/mod.rs index f9d2dc5e0..3fb358a79 100644 --- a/src/rust/iced-x86/src/encoder/tests/mod.rs +++ b/src/rust/iced-x86/src/encoder/tests/mod.rs @@ -287,6 +287,7 @@ fn encode_invalid_code_value_is_an_error() { } #[test] +#[allow(unexpected_cfgs)] fn displsize_eq_1_uses_long_form_if_it_does_not_fit_in_1_byte() { const RIP: u64 = 0; diff --git a/src/rust/iced-x86/src/formatter/fmt_utils.rs b/src/rust/iced-x86/src/formatter/fmt_utils.rs index b84309191..7968245a0 100644 --- a/src/rust/iced-x86/src/formatter/fmt_utils.rs +++ b/src/rust/iced-x86/src/formatter/fmt_utils.rs @@ -71,6 +71,7 @@ pub(super) fn is_call(kind: FormatterFlowControl) -> bool { } #[must_use] +#[allow(unexpected_cfgs)] pub(super) fn get_flow_control(instruction: &Instruction) -> FormatterFlowControl { #[cfg_attr(feature = "cargo-fmt", rustfmt::skip)] match instruction.code() { diff --git a/src/rust/iced-x86/src/instruction.rs b/src/rust/iced-x86/src/instruction.rs index 0c0a61294..822595277 100644 --- a/src/rust/iced-x86/src/instruction.rs +++ b/src/rust/iced-x86/src/instruction.rs @@ -349,9 +349,12 @@ impl Instruction { | Code::Xchg_rm16_r16 | Code::Xchg_rm32_r32 | Code::Xchg_rm64_r64 - | Code::Mov_rm8_r8 | Code::Mov_rm16_r16 - | Code::Mov_rm32_r32 | Code::Mov_rm64_r64 - | Code::Mov_rm8_imm8 | Code::Mov_rm16_imm16 + | Code::Mov_rm8_r8 + | Code::Mov_rm16_r16 + | Code::Mov_rm32_r32 + | Code::Mov_rm64_r64 + | Code::Mov_rm8_imm8 + | Code::Mov_rm16_imm16 | Code::Mov_rm32_imm32 | Code::Mov_rm64_imm32 ) @@ -2447,6 +2450,7 @@ impl Instruction { #[must_use] #[allow(clippy::missing_inline_in_public_items)] #[allow(clippy::match_single_binding)] + #[allow(unexpected_cfgs)] pub const fn vsib(&self) -> Option { #[cfg_attr(feature = "cargo-fmt", rustfmt::skip)] match self.code() { @@ -2829,6 +2833,7 @@ impl Instruction { /// ``` #[must_use] #[allow(clippy::missing_inline_in_public_items)] + #[allow(unexpected_cfgs)] pub fn stack_pointer_increment(&self) -> i32 { #[cfg_attr(feature = "cargo-fmt", rustfmt::skip)] #[allow(clippy::match_single_binding)] @@ -2948,6 +2953,7 @@ impl Instruction { /// ``` #[must_use] #[allow(clippy::missing_inline_in_public_items)] + #[allow(unexpected_cfgs)] pub fn fpu_stack_increment_info(&self) -> FpuStackIncrementInfo { #[cfg_attr(feature = "cargo-fmt", rustfmt::skip)] #[allow(clippy::match_single_binding)]