[Rust] Fix misc clippy lints and warnings

These are introduced after changing to Rust 1.91.1

Author: emesare

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(),

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 {

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(),

plugins/idb_import/src/types.rs

@@ -630,7 +630,7 @@ pub fn translate_til_types(
     arch: CoreArchitecture,
     til: &TILSection,
     progress: impl Fn(usize, usize) -> Result<(), ()>,
-) -> Result<Vec<TranslatesIDBType>> {
+) -> Result<Vec<TranslatesIDBType<'_>>> {
     let total = til.symbols.len() + til.types.len();
     let mut types = Vec::with_capacity(total);
     let mut types_by_ord = HashMap::with_capacity(total);

plugins/warp/src/cache/type_reference.rs

@@ -39,7 +39,7 @@ pub fn cached_type_reference(
     }
 }
 
-pub fn cached_type_references(view: &BinaryView) -> Option<Ref<ViewID, TypeRefCache>> {
+pub fn cached_type_references(view: &BinaryView) -> Option<Ref<'_, ViewID, TypeRefCache>> {
     let view_id = ViewID::from(view);
     let type_ref_cache = TYPE_REF_CACHE.get_or_init(Default::default);
     type_ref_cache.get(&view_id)

plugins/warp/src/convert/types.rs

@@ -281,7 +281,7 @@ pub fn to_bn_calling_convention<A: BNArchitecture>(
 
 // Always pass the architecture unless you know what you're doing!
 pub fn to_bn_type<A: BNArchitecture + Copy>(arch: Option<A>, ty: &Type) -> BNRef<BNType> {
-    let bits_to_bytes = |val: u64| (val / 8);
+    let bits_to_bytes = |val: u64| val / 8;
     let addr_size = arch.map(|a| a.address_size()).unwrap_or(8) as u64;
     match &ty.class {
         TypeClass::Void => BNType::void(),

plugins/warp/src/lib.rs

@@ -254,7 +254,7 @@ pub fn basic_block_guid<M: FunctionMutability>(
 pub fn filtered_instructions_at<M: FunctionMutability>(
     il: &LowLevelILFunction<M, NonSSA>,
     addr: u64,
-) -> Vec<LowLevelILInstruction<M, NonSSA>> {
+) -> Vec<LowLevelILInstruction<'_, M, NonSSA>> {
     il.instructions_at(addr)
         .into_iter()
         .enumerate()

plugins/warp/src/plugin.rs

@@ -19,7 +19,6 @@ use log::LevelFilter;
 
 mod commit;
 mod create;
-mod debug;
 mod ffi;
 mod file;
 mod function;
@@ -29,6 +28,9 @@ mod render_layer;
 mod settings;
 mod workflow;
 
+#[cfg(debug_assertions)]
+mod debug;
+
 fn load_bundled_signatures() {
     let global_bn_settings = Settings::new();
     let plugin_settings =

rust/src/base_detection.rs

@@ -1,8 +1,9 @@
 use binaryninjacore_sys::*;
-use std::ffi::{c_char, CStr};
+use std::ffi::CStr;
 
 use crate::architecture::CoreArchitecture;
 use crate::rc::{Array, CoreArrayProvider, CoreArrayProviderInner};
+use crate::string::IntoCStr;
 use std::num::NonZeroU32;
 use std::ptr::NonNull;
 
@@ -11,7 +12,7 @@ pub type BaseAddressDetectionConfidence = BNBaseAddressDetectionConfidence;
 pub type BaseAddressDetectionPOIType = BNBaseAddressDetectionPOIType;
 
 /// This is the architecture name used to use the architecture auto-detection feature.
-const BASE_ADDRESS_AUTO_DETECTION_ARCH: &CStr = c"auto detect";
+const BASE_ADDRESS_AUTO_DETECTION_ARCH: &str = "auto detect";
 
 pub enum BaseAddressDetectionAnalysis {
     Basic,
@@ -149,34 +150,34 @@ impl Drop for BaseAddressDetection {
     }
 }
 
-/// Build the initial analysis.
-///
-/// * `analysis` - analysis mode
-/// * `min_strlen` - minimum length of a string to be considered a point-of-interest
-/// * `alignment` - byte boundary to align the base address to while brute-forcing
-/// * `low_boundary` - lower boundary of the base address range to test
-/// * `high_boundary` - upper boundary of the base address range to test
-/// * `poi_analysis` - specifies types of points-of-interest to use for analysis
-/// * `max_pointers` - maximum number of candidate pointers to collect per pointer cluster
+/// Builds the initial analysis settings for base address detection.
 pub struct BaseAddressDetectionSettings {
     arch: Option<CoreArchitecture>,
+    /// Analysis mode to use
     analysis: BaseAddressDetectionAnalysis,
+    /// Minimum length of a string to be considered a point-of-interest
     min_string_len: u32,
+    /// Byte boundary to align the base address to while brute-forcing
     alignment: NonZeroU32,
+    /// Lower boundary of the base address range to test
     lower_boundary: u64,
+    /// Upper boundary of the base address range to test
     upper_boundary: u64,
+    /// Specifies types of points-of-interest to use for analysis
     poi_analysis: BaseAddressDetectionPOISetting,
+    /// Maximum number of candidate pointers to collect per pointer cluster
     max_pointers: u32,
 }
 
 impl BaseAddressDetectionSettings {
     pub(crate) fn into_raw(value: &Self) -> BNBaseAddressDetectionSettings {
         let arch_name = value
             .arch
-            .map(|a| a.name().as_ptr())
-            .unwrap_or(BASE_ADDRESS_AUTO_DETECTION_ARCH.as_ptr() as *const u8);
+            .map(|a| a.name())
+            .unwrap_or(BASE_ADDRESS_AUTO_DETECTION_ARCH.to_string());
+        let c_arch_name = arch_name.to_cstr();
         BNBaseAddressDetectionSettings {
-            Architecture: arch_name as *const c_char,
+            Architecture: c_arch_name.into_raw(),
             Analysis: value.analysis.as_raw().as_ptr(),
             MinStrlen: value.min_string_len,
             Alignment: value.alignment.get(),
@@ -207,6 +208,9 @@ impl BaseAddressDetectionSettings {
         self
     }
 
+    /// Specify the lower boundary of the base address range to test.
+    ///
+    /// NOTE: The passed `value` **must** be less than the upper boundary.
     pub fn low_boundary(mut self, value: u64) -> Self {
         assert!(
             self.upper_boundary >= value,
@@ -216,6 +220,9 @@ impl BaseAddressDetectionSettings {
         self
     }
 
+    /// Specify the upper boundary of the base address range to test.
+    ///
+    /// NOTE: The passed `value` **must** be greater than the lower boundary.
     pub fn high_boundary(mut self, value: u64) -> Self {
         assert!(
             self.lower_boundary <= value,
@@ -230,6 +237,9 @@ impl BaseAddressDetectionSettings {
         self
     }
 
+    /// Specify the maximum number of candidate pointers to collect per pointer cluster.
+    ///
+    /// NOTE: The passed `value` **must** be at least 2.
     pub fn max_pointers(mut self, value: u32) -> Self {
         assert!(value > 2, "max pointers must be at least 2");
         self.max_pointers = value;

rust/src/binary_view.rs

@@ -1392,7 +1392,7 @@ pub trait BinaryViewExt: BinaryViewBase {
         for address in addresses {
             let funcs = self.functions_at(address);
             for func in funcs.into_iter() {
-                if func.start() == address && plat.map_or(true, |p| p == func.platform().as_ref()) {
+                if func.start() == address && plat.is_none_or(|p| p == func.platform().as_ref()) {
                     functions.push(func.clone());
                 }
             }