From 2f11b33255144558f4a987aaec8a7c48782f1744 Mon Sep 17 00:00:00 2001 From: Sebastian Ziebell Date: Mon, 2 Aug 2021 10:19:52 +0200 Subject: [PATCH 1/2] Fix clippy warnings --- src/dep/cratesio.rs | 2 +- src/dep/rust_std.rs | 4 ++-- src/dep/rustc.rs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/dep/cratesio.rs b/src/dep/cratesio.rs index 9ec8163b..0bc63a2b 100644 --- a/src/dep/cratesio.rs +++ b/src/dep/cratesio.rs @@ -18,7 +18,7 @@ impl<'p> Path<'p> { let mut components = path.components(); let mut registry_prefix = PathBuf::new(); - while let Some(component) = components.next() { + for component in &mut components { registry_prefix.push(component.as_os_str()); if let Component::Normal(component) = component { diff --git a/src/dep/rust_std.rs b/src/dep/rust_std.rs index 509eb218..23489810 100644 --- a/src/dep/rust_std.rs +++ b/src/dep/rust_std.rs @@ -25,7 +25,7 @@ impl<'p> Path<'p> { let mut components = path.components(); let mut rustup_prefix = PathBuf::new(); - while let Some(component) = components.next() { + for component in &mut components { rustup_prefix.push(component); if let Component::Normal(component) = component { @@ -39,7 +39,7 @@ impl<'p> Path<'p> { Toolchain::from_str(super::get_component_normal(components.next()?)?.to_str()?); let mut rust_std_prefix = PathBuf::new(); - while let Some(component) = components.next() { + for component in &mut components { rust_std_prefix.push(component); if let Component::Normal(component) = component { diff --git a/src/dep/rustc.rs b/src/dep/rustc.rs index 5181bca4..2e3ce5ce 100644 --- a/src/dep/rustc.rs +++ b/src/dep/rustc.rs @@ -19,7 +19,7 @@ impl<'p> Path<'p> { let mut components = path.components(); let mut rustc_prefix = PathBuf::new(); - while let Some(component) = components.next() { + for component in &mut components { rustc_prefix.push(component); if let Component::Normal(component) = component { From 06fb520cb58925af70b3417baf83d136ce93b567 Mon Sep 17 00:00:00 2001 From: Sebastian Ziebell Date: Mon, 2 Aug 2021 10:39:31 +0200 Subject: [PATCH 2/2] Fix clippy warnings --- src/backtrace/mod.rs | 2 +- src/main.rs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/backtrace/mod.rs b/src/backtrace/mod.rs index 89bd9099..3423c116 100644 --- a/src/backtrace/mod.rs +++ b/src/backtrace/mod.rs @@ -37,7 +37,7 @@ pub(crate) fn print( || contains_exception; if print_backtrace && settings.max_backtrace_len > 0 { - pp::backtrace(&frames, &settings); + pp::backtrace(&frames, settings); if unwind.corrupted { log::warn!("call stack was corrupted; unwinding could not be completed"); diff --git a/src/main.rs b/src/main.rs index 6e7f4bb1..003d8658 100644 --- a/src/main.rs +++ b/src/main.rs @@ -97,7 +97,7 @@ fn run_target_program(elf_path: &Path, chip_name: &str, opts: &cli::Opts) -> any let outcome = backtrace::print( &mut core, - &elf, + elf, &target_info.active_ram_region, &backtrace_settings, )?; @@ -242,7 +242,7 @@ fn decode_and_print_defmt_logs( opts: &cli::Opts, ) -> Result<(), anyhow::Error> { loop { - match table.decode(&buffer) { + match table.decode(buffer) { Ok((frame, consumed)) => { // NOTE(`[]` indexing) all indices in `table` have already been verified to exist in // the `locations` map