danvics/oxipng
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix new clippy lints

Browse source
This commit is contained in:
Andrew 2025-04-25 08:27:17 +12:00
parent a44ba5f88b
commit ef7b5eeba5
3 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/headers.rs
View file

@ -269,7 +269,7 @@ pub fn extract_icc(iccp: &Chunk) -> Option<Vec<u8>> {
Ok(icc) => Some(icc), Ok(icc) => Some(icc),
Err(e) => { Err(e) => {
// Log the error so we can know if the buffer size needs to be adjusted // Log the error so we can know if the buffer size needs to be adjusted
warn!("Failed to decompress icc: {}", e); warn!("Failed to decompress icc: {e}");
None None
} }
} }

18
src/lib.rs
View file

@ -183,7 +183,7 @@ impl RawImage {
/// Perform optimization on the input file using the options provided /// Perform optimization on the input file using the options provided
pub fn optimize(input: &InFile, output: &OutFile, opts: &Options) -> PngResult<()> { pub fn optimize(input: &InFile, output: &OutFile, opts: &Options) -> PngResult<()> {
// Read in the file and try to decode as PNG. // Read in the file and try to decode as PNG.
info!("Processing: {}", input); info!("Processing: {input}");
let deadline = Arc::new(Deadline::new(opts.timeout)); let deadline = Arc::new(Deadline::new(opts.timeout));
@ -207,7 +207,7 @@ pub fn optimize(input: &InFile, output: &OutFile, opts: &Options) -> PngResult<(
)) ))
}) })
.map(Some)?; .map(Some)?;
trace!("preserving metadata: {:?}", opt_metadata_preserved); trace!("preserving metadata: {opt_metadata_preserved:?}");
} else { } else {
opt_metadata_preserved = None; opt_metadata_preserved = None;
} }
@ -236,7 +236,7 @@ pub fn optimize(input: &InFile, output: &OutFile, opts: &Options) -> PngResult<(
(OutFile::Path { path, .. }, InFile::Path(ref input_path)) (OutFile::Path { path, .. }, InFile::Path(ref input_path))
if path.as_ref().map_or(true, |p| p == input_path) => if path.as_ref().map_or(true, |p| p == input_path) =>
{ {
info!("{}: Could not optimize further, no change written", input); info!("{input}: Could not optimize further, no change written");
return Ok(()); return Ok(());
} }
_ => { _ => {
@ -261,7 +261,7 @@ pub fn optimize(input: &InFile, output: &OutFile, opts: &Options) -> PngResult<(
match (output, input) { match (output, input) {
(OutFile::None, _) => { (OutFile::None, _) => {
info!("{}: Running in pretend mode, no output", savings); info!("{savings}: Running in pretend mode, no output");
} }
(&OutFile::StdOut, _) | (&OutFile::Path { path: None, .. }, &InFile::StdIn) => { (&OutFile::StdOut, _) | (&OutFile::Path { path: None, .. }, &InFile::StdIn) => {
let mut buffer = BufWriter::new(stdout()); let mut buffer = BufWriter::new(stdout());
@ -346,8 +346,8 @@ fn optimize_png(
raw.ihdr.width, raw.ihdr.height raw.ihdr.width, raw.ihdr.height
); );
report_format(" ", &raw); report_format(" ", &raw);
debug!(" IDAT size = {} bytes", idat_original_size); debug!(" IDAT size = {idat_original_size} bytes");
debug!(" File size = {} bytes", file_original_size); debug!(" File size = {file_original_size} bytes");
let mut opts = opts.to_owned(); let mut opts = opts.to_owned();
preprocess_chunks(&mut png.aux_chunks, &mut opts); preprocess_chunks(&mut png.aux_chunks, &mut opts);
@ -681,11 +681,7 @@ fn copy_times(_: &Metadata, _: &Path) -> PngResult<()> {
fn copy_times(input_path_meta: &Metadata, out_path: &Path) -> PngResult<()> { fn copy_times(input_path_meta: &Metadata, out_path: &Path) -> PngResult<()> {
let atime = filetime::FileTime::from_last_access_time(input_path_meta); let atime = filetime::FileTime::from_last_access_time(input_path_meta);
let mtime = filetime::FileTime::from_last_modification_time(input_path_meta); let mtime = filetime::FileTime::from_last_modification_time(input_path_meta);
trace!( trace!("attempting to set file times: atime: {atime:?}, mtime: {mtime:?}");
"attempting to set file times: atime: {:?}, mtime: {:?}",
atime,
mtime
);
filetime::set_file_times(out_path, atime, mtime).map_err(|err_io| { filetime::set_file_times(out_path, atime, mtime).map_err(|err_io| {
PngError::new(&format!( PngError::new(&format!(
"unable to set file times on {out_path:?}: {err_io}" "unable to set file times on {out_path:?}: {err_io}"

2
src/main.rs
View file

@ -47,7 +47,7 @@ fn main() -> ExitCode {
let (out_file, out_dir, opts) = match parse_opts_into_struct(&matches) { let (out_file, out_dir, opts) = match parse_opts_into_struct(&matches) {
Ok(x) => x, Ok(x) => x,
Err(x) => { Err(x) => {
error!("{}", x); error!("{x}");
return ExitCode::FAILURE; return ExitCode::FAILURE;
} }
}; };