From 6546844ca4274cd11ec2c91da7c6d7b5e8a82d0b Mon Sep 17 00:00:00 2001
From: Mason Reed <mason@vector35.com>
Date: Thu, 4 Dec 2025 15:10:40 -0500
Subject: [Rust] Fix misc clippy lints and warnings

These are introduced after changing to Rust 1.91.1
---
 arch/msp430/src/flag.rs      | 8 ++++----
 arch/riscv/disasm/src/lib.rs | 4 ++--
 arch/riscv/src/lib.rs        | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'arch')

diff --git a/arch/msp430/src/flag.rs b/arch/msp430/src/flag.rs
index 5baca412..698f3b19 100644
--- a/arch/msp430/src/flag.rs
+++ b/arch/msp430/src/flag.rs
@@ -16,7 +16,7 @@ pub enum Flag {
 impl architecture::Flag for Flag {
     type FlagClass = FlagClass;
 
-    fn name(&self) -> Cow<str> {
+    fn name(&self) -> Cow<'_, str> {
         match self {
             Self::C => "c".into(),
             Self::Z => "z".into(),
@@ -62,7 +62,7 @@ impl TryFrom<FlagId> for Flag {
 pub struct FlagClass {}
 
 impl architecture::FlagClass for FlagClass {
-    fn name(&self) -> Cow<str> {
+    fn name(&self) -> Cow<'_, str> {
         unimplemented!()
     }
 
@@ -78,7 +78,7 @@ impl architecture::FlagGroup for FlagGroup {
     type FlagType = Flag;
     type FlagClass = FlagClass;
 
-    fn name(&self) -> Cow<str> {
+    fn name(&self) -> Cow<'_, str> {
         unimplemented!()
     }
 
@@ -107,7 +107,7 @@ impl architecture::FlagWrite for FlagWrite {
     type FlagType = Flag;
     type FlagClass = FlagClass;
 
-    fn name(&self) -> Cow<str> {
+    fn name(&self) -> Cow<'_, str> {
         match self {
             Self::All => "*".into(),
             Self::Nz => "nz".into(),
diff --git a/arch/riscv/disasm/src/lib.rs b/arch/riscv/disasm/src/lib.rs
index 152817c6..c35e76d3 100644
--- a/arch/riscv/disasm/src/lib.rs
+++ b/arch/riscv/disasm/src/lib.rs
@@ -1775,7 +1775,7 @@ pub enum Instr<D: RiscVDisassembler> {
 }
 
 impl<D: RiscVDisassembler> Instr<D> {
-    pub fn mnem(&self) -> Mnem<D> {
+    pub fn mnem(&self) -> Mnem<'_, D> {
         Mnem(self)
     }
 
@@ -2116,7 +2116,7 @@ impl<'a, D: RiscVDisassembler + 'a> Mnem<'a, D> {
         }
     }
 
-    fn suffix(&self) -> Option<Cow<str>> {
+    fn suffix(&self) -> Option<Cow<'_, str>> {
         match self.0 {
             // &Instr::Rv16(_) => None,
             &Instr::Rv32(ref op) | &Instr::Rv16(ref op) => match *op {
diff --git a/arch/riscv/src/lib.rs b/arch/riscv/src/lib.rs
index f59e1ebb..ef9e12e1 100644
--- a/arch/riscv/src/lib.rs
+++ b/arch/riscv/src/lib.rs
@@ -169,7 +169,7 @@ impl<D: RiscVDisassembler> RegisterInfo for Register<D> {
 impl<D: RiscVDisassembler> architecture::Register for Register<D> {
     type InfoType = Self;
 
-    fn name(&self) -> Cow<str> {
+    fn name(&self) -> Cow<'_, str> {
         match self.reg_type() {
             RegType::Integer(id) => match id {
                 0 => "zero".into(),
@@ -393,7 +393,7 @@ impl<D: RiscVDisassembler> From<Intrinsic> for RiscVIntrinsic<D> {
 }
 
 impl<D: RiscVDisassembler> architecture::Intrinsic for RiscVIntrinsic<D> {
-    fn name(&self) -> Cow<str> {
+    fn name(&self) -> Cow<'_, str> {
         match self.id {
             Intrinsic::Uret => "_uret".into(),
             Intrinsic::Sret => "_sret".into(),
-- 
cgit v1.3.1