From 5f9e9063f8ef9a6e4260c17e3349f499edffb12b Mon Sep 17 00:00:00 2001 From: Luke Street Date: Fri, 10 Jul 2026 00:22:48 -0600 Subject: [PATCH] clippy fixes & cargo update --- Cargo.lock | 56 ++++++++++++++--------------- objdiff-cli/src/cmd/diff.rs | 2 +- objdiff-core/src/arch/mips.rs | 4 +-- objdiff-core/src/arch/superh/mod.rs | 8 ++--- objdiff-core/src/bindings/diff.rs | 2 +- objdiff-core/src/bindings/report.rs | 2 +- objdiff-gui/src/views/jobs.rs | 2 +- 7 files changed, 38 insertions(+), 38 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 07c884f..1e3b163 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -664,9 +664,9 @@ checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" [[package]] name = "bytes" -version = "1.12.0" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ae3f5d315924270530207e2a68396c3cc547f6dca3fbdca317cfb1a51edb593" +checksum = "fc652a48c352aef3ea3aed32080501cf3ef6ed5da78602a020c991775b0aff04" [[package]] name = "calloop" @@ -2721,9 +2721,9 @@ dependencies = [ [[package]] name = "inotify" -version = "0.11.3" +version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd854a95a4ac672fed8c054136039fd32c22cf039ff09ead7280afe920486483" +checksum = "153be1941a183ec9ccd095ddbe17a8b8d435ef6c76e9e02451b933c3999af2c8" dependencies = [ "bitflags 2.13.0", "inotify-sys", @@ -3087,9 +3087,9 @@ dependencies = [ [[package]] name = "lru" -version = "0.18.0" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a860605968fce16869fd239cf4237a82f3ac470723415db603b0e8b6c8d4fb9" +checksum = "0b6180140927ee907000b0aa540091f6ea512ead4447c92b8fc35bc72788a5a6" dependencies = [ "hashbrown 0.17.1", ] @@ -3130,9 +3130,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.8.2" +version = "2.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88904434abc2901f197fe8cc55f0445e7ded921dba5911dad2e2b39b48e663c4" +checksum = "cf8baf1c55e62ffcace7a9f06f4bd9cd3f0c4beb022d3b367256b91b87513d98" [[package]] name = "memmap2" @@ -4848,9 +4848,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.12.4" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1292b7759ae1cb9ec195452d1390a074f0cd8541ab7a5a8c31cd6db45d4a6ba" +checksum = "2a0e75113e14dc5acb068cd0786884f214f1312650a3d36d269f5c4f3cdee8a2" dependencies = [ "aho-corasick", "memchr", @@ -4860,9 +4860,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.14" +version = "0.4.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e1dd4122fc1595e8162618945476892eefca7b88c52820e74af6262213cae8f" +checksum = "1f388202e4b80542a0921078cc23b6333bcf1409c1e3f86404cae4766a6131db" dependencies = [ "aho-corasick", "memchr", @@ -7799,9 +7799,9 @@ dependencies = [ [[package]] name = "zbus" -version = "5.16.0" +version = "5.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eee682d202a77e4a9f3b2c2bdf48a7b28af5c08c34ddf66f98c93e5e39464285" +checksum = "a28b97f866896a4be7aefd2b5a8e01bb6773d19a775d54ab28b4d094b9a4480e" dependencies = [ "async-broadcast", "async-executor", @@ -7834,9 +7834,9 @@ dependencies = [ [[package]] name = "zbus_macros" -version = "5.16.0" +version = "5.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adf1bd45a81a103745b1757754762a26e8cd01e4532e4d6c8ec431624b80d1d6" +checksum = "5e05ad887425eecf5e8384dc2406a4a9313eb73468712fc1cdea362eb4fe0469" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -7849,9 +7849,9 @@ dependencies = [ [[package]] name = "zbus_names" -version = "4.3.2" +version = "4.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7074f3e50b894eac91750142016d30d0a89be8e67dbfd9704fb875825760e52d" +checksum = "1039ca249fee9559680f3a9f05b55e0761fee51af4f6c1e7d8c1f31e549721d2" dependencies = [ "serde", "winnow 1.0.3", @@ -7860,18 +7860,18 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.8.53" +version = "0.8.54" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75726053136156d419e285b9b7eddaaea9e3fea6ce32eed44a89901f0bd98de1" +checksum = "b7cbbc0a705a0fd05cc3676525980d2bf5a9bc4adac6d6475209a7887cf59d19" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.8.53" +version = "0.8.54" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4714fd92cf900833d49538023a9b3915155210801d1c1169eba513b2addefd71" +checksum = "e2e817b7b52d0c7358d3246da9d69935ebb18116b2b102b4230dac079b4862f5" dependencies = [ "proc-macro2", "quote", @@ -7961,9 +7961,9 @@ dependencies = [ [[package]] name = "zvariant" -version = "5.12.0" +version = "5.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a192a0bde63360d77a7523c833d4b4ce6070a927e2c53246e4c540b1a3e27be0" +checksum = "7cf057bb00bf5c9ad77abb6147b0ca4818236a1858416e9d988e40d6322fefa7" dependencies = [ "endi", "enumflags2", @@ -7976,9 +7976,9 @@ dependencies = [ [[package]] name = "zvariant_derive" -version = "5.12.0" +version = "5.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bc6cde9c01c511074be97f7ccb6c19d0da89e3f8662e812e999dcfd4638737" +checksum = "8118ca6bda77bfc0ab51d660db0c955f2505eef854c9a449435bccb616933b31" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -7989,9 +7989,9 @@ dependencies = [ [[package]] name = "zvariant_utils" -version = "3.4.0" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e8535915cfa75547e559d8c68e8139909a4aeee076831e4ef7fc59d8172c4d6" +checksum = "90cb9383f9b45290407a1258b202d3f8f01db719eb60b4e4055c6375af4fc7c7" dependencies = [ "proc-macro2", "quote", diff --git a/objdiff-cli/src/cmd/diff.rs b/objdiff-cli/src/cmd/diff.rs index 0b4d7e4..027ac61 100644 --- a/objdiff-cli/src/cmd/diff.rs +++ b/objdiff-cli/src/cmd/diff.rs @@ -99,7 +99,7 @@ pub fn run(args: Args) -> Result<()> { let Some((project_config, project_config_info)) = objdiff_core::config::try_project_config(project.as_ref()) else { - bail!("Project config not found in {}", &project) + bail!("Project config not found in {}", project) }; let project_config = project_config.with_context(|| { format!("Reading project config {}", project_config_info.path.display()) diff --git a/objdiff-core/src/arch/mips.rs b/objdiff-core/src/arch/mips.rs index c5d66dc..72687d9 100644 --- a/objdiff-core/src/arch/mips.rs +++ b/objdiff-core/src/arch/mips.rs @@ -217,8 +217,8 @@ impl Arch for ArchMips { let instruction_flags = self.instruction_flags(diff_config); let mut ops = Vec::::with_capacity(code.len() / 4); let mut cur_addr = address as u32; - for chunk in code.chunks_exact(4) { - let code = self.endianness.read_u32(chunk.try_into()?); + for chunk in code.as_chunks::<4>().0 { + let code = self.endianness.read_u32(*chunk); let instruction = rabbitizer::Instruction::new(code, Vram::new(cur_addr), instruction_flags); let opcode = instruction.opcode() as u16; diff --git a/objdiff-core/src/arch/superh/mod.rs b/objdiff-core/src/arch/superh/mod.rs index fe5ba9c..6dc3735 100644 --- a/objdiff-core/src/arch/superh/mod.rs +++ b/objdiff-core/src/arch/superh/mod.rs @@ -35,8 +35,8 @@ impl Arch for ArchSuperH { let mut ops = Vec::::with_capacity(code.len() / 2); let mut offset = address; - for chunk in code.chunks_exact(2) { - let opcode = u16::from_be_bytes(chunk.try_into().unwrap()); + for chunk in code.as_chunks::<2>().0 { + let opcode = u16::from_be_bytes(*chunk); let mut parts: Vec = vec![]; let resolved: ResolvedInstructionRef = Default::default(); let mut branch_dest: Option = None; @@ -80,8 +80,8 @@ impl Arch for ArchSuperH { let mut data_offsets = BTreeMap::::new(); let mut pos: u64 = 0; - for chunk in symbol_data.chunks_exact(2) { - let opcode = u16::from_be_bytes(chunk.try_into().unwrap()); + for chunk in symbol_data.as_chunks::<2>().0 { + let opcode = u16::from_be_bytes(*chunk); // mov.w if (opcode & 0xf000) == 0x9000 { let target = (opcode as u64 & 0xff) * 2 + 4 + pos; diff --git a/objdiff-core/src/bindings/diff.rs b/objdiff-core/src/bindings/diff.rs index 0dd22b6..a6a4e7a 100644 --- a/objdiff-core/src/bindings/diff.rs +++ b/objdiff-core/src/bindings/diff.rs @@ -1,4 +1,4 @@ -#![allow(clippy::needless_lifetimes)] // Generated serde code +#![allow(clippy::useless_borrows_in_formatting)] // Generated serde code use alloc::{ string::{String, ToString}, diff --git a/objdiff-core/src/bindings/report.rs b/objdiff-core/src/bindings/report.rs index 032252a..6469dd7 100644 --- a/objdiff-core/src/bindings/report.rs +++ b/objdiff-core/src/bindings/report.rs @@ -1,4 +1,4 @@ -#![allow(clippy::needless_lifetimes)] // Generated serde code +#![allow(clippy::useless_borrows_in_formatting)] // Generated serde code use alloc::{ string::{String, ToString}, diff --git a/objdiff-gui/src/views/jobs.rs b/objdiff-gui/src/views/jobs.rs index b829c20..9f2bfb7 100644 --- a/objdiff-gui/src/views/jobs.rs +++ b/objdiff-gui/src/views/jobs.rs @@ -56,7 +56,7 @@ pub fn jobs_ui(ui: &mut egui::Ui, jobs: &mut JobQueue, appearance: &Appearance) ui.label(if status.status.len() > STATUS_LENGTH - 3 { format!("{}…", &status.status[0..STATUS_LENGTH - 3]) } else { - format!("{:width$}", &status.status, width = STATUS_LENGTH) + format!("{:width$}", status.status, width = STATUS_LENGTH) }) .on_hover_text_at_pointer(&status.status) .context_menu(|ui| {