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

Apply clippy::redundant_closure_for_method_calls

Browse source
This commit is contained in:
Luracasmus 2025-11-22 19:33:04 +01:00 committed by Alejandro González
parent 3d9d5eab2b
commit 06ce65c714
No known key found for this signature in database
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/lib.rs
View file

@ -28,7 +28,7 @@ mod rayon;
use std::{ use std::{
fs::{File, Metadata}, fs::{File, Metadata},
io::{BufWriter, Read, Write, stdin, stdout}, io::{BufWriter, Read, Write, stdin, stdout},
path::Path, path::{Path, PathBuf},
sync::{ sync::{
Arc, Arc,
atomic::{AtomicBool, Ordering}, atomic::{AtomicBool, Ordering},
@ -275,7 +275,7 @@ pub fn optimize(input: &InFile, output: &OutFile, opts: &Options) -> PngResult<(
(OutFile::Path { path, .. }, _) => { (OutFile::Path { path, .. }, _) => {
let output_path = path let output_path = path
.as_ref() .as_ref()
.map(|p| p.as_path()) .map(PathBuf::as_path)
.unwrap_or_else(|| input.path().unwrap()); .unwrap_or_else(|| input.path().unwrap());
let out_file = File::create(output_path) let out_file = File::create(output_path)
.map_err(|err| PngError::WriteFailed(output_path.display().to_string(), err))?; .map_err(|err| PngError::WriteFailed(output_path.display().to_string(), err))?;

9
src/main.rs
View file

@ -19,7 +19,12 @@ mod rayon;
#[cfg(feature = "zopfli")] #[cfg(feature = "zopfli")]
use std::num::NonZeroU64; use std::num::NonZeroU64;
use std::{ use std::{
ffi::OsString, fs::DirBuilder, io::Write, path::PathBuf, process::ExitCode, time::Duration, ffi::{OsStr, OsString},
fs::DirBuilder,
io::Write,
path::PathBuf,
process::ExitCode,
time::Duration,
}; };
use clap::ArgMatches; use clap::ArgMatches;
@ -143,7 +148,7 @@ fn collect_files(
} else { } else {
// Skip non png files if not given on top level // Skip non png files if not given on top level
if !top_level && { if !top_level && {
let extension = input.extension().map(|f| f.to_ascii_lowercase()); let extension = input.extension().map(OsStr::to_ascii_lowercase);
extension != Some(OsString::from("png")) extension != Some(OsString::from("png"))
&& extension != Some(OsString::from("apng")) && extension != Some(OsString::from("apng"))
} { } {