chore: Fix various warnings from RustRover (#1682)

Author: mati865

Cargo.lock

@@ -1101,7 +1101,7 @@ impl ArgumentParser {
         // TODO: This is ad-hoc
         help.push_str(&format!(
             "    {:<31} Read options from a file\n",
-            format!("@<VALUE>"),
+            "@<VALUE>",
         ));
 
         let mut help_to_options: HashMap<&str, Vec<String>> = HashMap::new();

libwild/src/args.rs

@@ -354,7 +354,7 @@ impl platform::Platform for Elf {
         *memory_offsets.get(part_id::EH_FRAME)
     }
 
-    fn finalise_find_required_sections<'data>(groups: &[layout::GroupState<'data, Elf>]) {
+    fn finalise_find_required_sections(groups: &[layout::GroupState<Elf>]) {
         tracing::debug!(target: "metrics", total = groups
             .iter()
             .map(|g| g.common.format_specific.exception_frame_count)
@@ -580,8 +580,8 @@ impl platform::Platform for Elf {
         &[STACK_SEGMENT_DEF]
     }
 
-    fn create_linker_defined_symbols<'data>(
-        symbols: &mut crate::parsing::InternalSymbolsBuilder<'data>,
+    fn create_linker_defined_symbols(
+        symbols: &mut crate::parsing::InternalSymbolsBuilder,
         output_kind: OutputKind,
     ) {
         // The undefined symbol must always be symbol 0.
@@ -1782,7 +1782,7 @@ fn allocate_sysv_hash(
         return Ok(());
     }
 
-    let bucket_count = ((num_defs / 2).max(1)).next_power_of_two() as u32;
+    let bucket_count = (num_defs / 2).max(1).next_power_of_two() as u32;
     // Whereas `num_defs` above is the number of definitions, this is the number of dynamic
     // symbols, which also includes undefined dynamic symbols.
     let num_dynsym = *current_sizes.get(part_id::DYNSYM) / SYMTAB_ENTRY_SIZE;
@@ -2943,7 +2943,7 @@ pub(crate) struct NonAddressableIndexes {
 }
 
 impl platform::NonAddressableIndexes for NonAddressableIndexes {
-    fn new<'data, P: Platform>(symbol_db: &crate::symbol_db::SymbolDb<'data, P>) -> Self {
+    fn new<P: Platform>(symbol_db: &crate::symbol_db::SymbolDb<P>) -> Self {
         Self {
             // Allocate version indexes starting from after the local and global indexes and any
             // versions defined by a version script.

libwild/src/elf.rs

@@ -99,7 +99,7 @@ impl crate::platform::Arch for ElfAArch64 {
         false
     }
 
-    fn tp_offset_start<'data>(layout: &Layout<'data, Elf>) -> u64 {
+    fn tp_offset_start(layout: &Layout<Elf>) -> u64 {
         layout.tls_start_address_aarch64()
     }
 
@@ -278,8 +278,8 @@ impl crate::platform::Arch for ElfAArch64 {
         None
     }
 
-    fn is_symbol_variant_pcs<'data>(
-        object: &<Self::Platform as Platform>::File<'data>,
+    fn is_symbol_variant_pcs(
+        object: &<Self::Platform as Platform>::File<'_>,
         symbol_index: object::SymbolIndex,
     ) -> bool {
         object

libwild/src/elf_aarch64.rs

@@ -81,7 +81,7 @@ impl crate::platform::Arch for ElfLoongArch64 {
         true
     }
 
-    fn tp_offset_start<'data>(layout: &crate::layout::Layout<'data, Elf>) -> u64 {
+    fn tp_offset_start(layout: &crate::layout::Layout<Elf>) -> u64 {
         layout.tls_start_address()
     }
 

libwild/src/elf_loongarch64.rs

@@ -99,7 +99,7 @@ impl crate::platform::Arch for ElfRiscV64 {
         true
     }
 
-    fn tp_offset_start<'data>(layout: &crate::layout::Layout<'data, Elf>) -> u64 {
+    fn tp_offset_start(layout: &crate::layout::Layout<Elf>) -> u64 {
         layout.tls_start_address()
     }
 
@@ -155,8 +155,8 @@ impl crate::platform::Arch for ElfRiscV64 {
         ]
     }
 
-    fn is_symbol_variant_pcs<'data>(
-        object: &<Self::Platform as Platform>::File<'data>,
+    fn is_symbol_variant_pcs(
+        object: &<Self::Platform as Platform>::File<'_>,
         symbol_index: object::SymbolIndex,
     ) -> bool {
         object

libwild/src/elf_riscv64.rs

@@ -3230,8 +3230,7 @@ fn write_epilogue<A: Arch<Platform = Elf>>(
 
     // The actual build-id will be filled in later once all writing has completed. It's important
     // that we fill it with zeros now however, since if we're overwriting an existing file, there
-    // might be other data there and it we don't zero it, then the build ID will be hashing that
-    // data.
+    // might be other data there and we don't zero it, then the build ID will be hashing that data.
     let build_id_buffer = buffers.get_mut(part_id::NOTE_GNU_BUILD_ID);
     build_id_buffer.fill(0);
 

libwild/src/elf_writer.rs

@@ -76,7 +76,7 @@ impl crate::platform::Arch for ElfX86_64 {
         plt_address: u64,
     ) -> crate::error::Result {
         plt_entry.copy_from_slice(PLT_ENTRY_TEMPLATE);
-        let offset: i32 = ((got_address.wrapping_sub(plt_address + 0xb)) as i64)
+        let offset: i32 = (got_address.wrapping_sub(plt_address + 0xb) as i64)
             .try_into()
             .map_err(|_| error!("PLT is more than 2GiB away from GOT"))?;
         plt_entry[7..11].copy_from_slice(&offset.to_le_bytes());
@@ -91,7 +91,7 @@ impl crate::platform::Arch for ElfX86_64 {
         false
     }
 
-    fn tp_offset_start<'data>(layout: &crate::layout::Layout<'data, Elf>) -> u64 {
+    fn tp_offset_start(layout: &crate::layout::Layout<Elf>) -> u64 {
         layout.tls_end_address()
     }
 
@@ -164,9 +164,9 @@ impl crate::platform::Arch for ElfX86_64 {
 
         match relocation_kind {
             object::elf::R_X86_64_REX_GOTPCRELX | object::elf::R_X86_64_CODE_4_GOTPCRELX
-                if ((relocation_kind == object::elf::R_X86_64_CODE_4_GOTPCRELX
+                if (relocation_kind == object::elf::R_X86_64_CODE_4_GOTPCRELX
                     && (offset >= 4 && section_bytes[offset - 4] == 0xd5))
-                    || offset >= 3) =>
+                    || offset >= 3 =>
             {
                 let b1 = section_bytes[offset - 2];
                 let rex = section_bytes[offset - 3];

libwild/src/elf_x86_64.rs

@@ -421,7 +421,7 @@ pub(crate) fn split_buffers_by_alignment<'out, 'data, P: Platform>(
     )
 }
 
-fn write_layout<'data, P: Platform>(layout: &Layout<'data, P>) -> Result {
+fn write_layout<P: Platform>(layout: &Layout<P>) -> Result {
     let layout_path = linker_layout::layout_path(&layout.args().output);
     write_layout_to(layout, &layout_path)
         .with_context(|| format!("Failed to write layout to `{}`", layout_path.display()))

libwild/src/file_writer.rs

@@ -225,7 +225,7 @@ fn determine_max_files_per_group(args: &Args) -> usize {
 }
 
 /// Compute the total number of symbols in the supplied objects.
-fn count_symbols<'data, P: Platform>(objects: &[Box<ParsedInputObject<'data, P>>]) -> usize {
+fn count_symbols<P: Platform>(objects: &[Box<ParsedInputObject<P>>]) -> usize {
     verbose_timing_phase!("Count symbols");
 
     objects.iter().map(|o| o.num_symbols()).sum::<usize>()