Skip to content

show: fix Clippy issues, skip FTUP #184

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
orangecms merged 1 commit into from
Nov 27, 2025
Merged

show: fix Clippy issues, skip FTUP #184

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 14 additions & 15 deletions src/show.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use intel_fw::{
fit::Fit,
ifd::{FlashMasterV1, FlashMasterV2, IFD},
me::{Generation, ME},
part::{gen2::Gen2Partition, gen3::Gen3Partition, partitions::Partitions},
part::{fpt::FTUP, gen2::Gen2Partition, gen3::Gen3Partition, partitions::Partitions},
};

fn print_gen2_dir(dir: &Gen2Dir) {
Expand Down Expand Up @@ -73,24 +73,23 @@ fn print_me(me: &ME) {
println!("Partitions and directories:");
println!();
for p in parts {
match p {
Gen2Partition::Dir(dir) => {
print_gen2_dir(&dir.dir);
}
_ => {}
if let Gen2Partition::Dir(dir) = p {
print_gen2_dir(&dir.dir);
}
}
}
Partitions::Gen3(parts) => {
println!("Partitions and directories:");
println!();
for p in parts {
match p {
Gen3Partition::Dir(dir) => {
let d = &dir.cpd;
println!("{d}");
if let Gen3Partition::Dir(dir) = p {
let d = &dir.cpd;
if d.name == FTUP {
// FTUP contains NFTP and potentially WCOD and LOCL.
// Skip it to avoid redundant printing.
continue;
}
_ => {}
println!("{d}");
}
}
}
Expand Down Expand Up @@ -148,18 +147,18 @@ pub fn show(fw: &Firmware, verbose: bool) {
match &fw.ifd {
Ok(ifd) => {
let ver = get_ifd_ver(&fw.me);
print_ifd(&ifd, ver);
print_ifd(ifd, ver);
}
Err(e) => warn!("Could not parse IFD: {e:?}"),
}
if let Some(me_res) = &fw.me {
match me_res {
Ok(me) => {
if let Ok(ifd) = &fw.ifd {
print_me_soft_config(&me, &ifd);
print_me_soft_config(me, ifd);
println!();
}
print_me(&me);
print_me(me);
}
Err(e) => error!("ME firmware could not be parsed: {e:?}"),
}
Expand All @@ -168,7 +167,7 @@ pub fn show(fw: &Firmware, verbose: bool) {
}
println!();
match &fw.fit {
Ok(fit) => print_fit(&fit),
Ok(fit) => print_fit(fit),
Err(e) => warn!("Could not parse FIT: {e:?}"),
}
println!();
Expand Down