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

Fix new warnings from clippy

Browse source
This commit is contained in:
Joshua Holmer 2016-05-05 13:40:24 -04:00
parent 283589ec8e
commit 042e3e2563
2 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/lib.rs
View file

@ -253,7 +253,7 @@ pub fn optimize(filepath: &Path, opts: &Options) -> Result<(), String> {
pub fn optimize_from_memory(data: &[u8], opts: &Options) -> Result<Vec<u8>, String> { pub fn optimize_from_memory(data: &[u8], opts: &Options) -> Result<Vec<u8>, String> {
// Read in the file and try to decode as PNG. // Read in the file and try to decode as PNG.
if opts.verbosity.is_some() { if opts.verbosity.is_some() {
writeln!(&mut stderr(), "Processing from memory"); writeln!(&mut stderr(), "Processing from memory").ok();
} }
let original_size = data.len() as usize; let original_size = data.len() as usize;
let mut png = match png::PngData::from_slice(&data, opts.fix_errors) { let mut png = match png::PngData::from_slice(&data, opts.fix_errors) {
@ -264,12 +264,11 @@ pub fn optimize_from_memory(data: &[u8], opts: &Options) -> Result<Vec<u8>, Stri
// Run the optimizer on the decoded PNG. // Run the optimizer on the decoded PNG.
let optimized_output = optimize_png(&mut png, original_size, opts); let optimized_output = optimize_png(&mut png, original_size, opts);
match is_fully_optimized(original_size, optimized_output.len(), opts) { if is_fully_optimized(original_size, optimized_output.len(), opts) {
true => { writeln!(&mut stderr(), "Image already optimized").ok();
writeln!(&mut stderr(), "Image already optimized").ok(); Ok(data.to_vec())
Ok(data.to_vec()) } else {
}, Ok(optimized_output)
false => Ok(optimized_output)
} }
} }
@ -541,5 +540,5 @@ fn perform_strip(png: &mut png::PngData, opts: &Options) {
} }
fn is_fully_optimized(original_size: usize, optimized_size: usize, opts: &Options) -> bool { fn is_fully_optimized(original_size: usize, optimized_size: usize, opts: &Options) -> bool {
return original_size <= optimized_size && !opts.force && opts.interlace.is_none() original_size <= optimized_size && !opts.force && opts.interlace.is_none()
} }

2
src/png.rs
View file

@ -303,7 +303,7 @@ impl PngData {
Err(_) => return Err("Failed to read from file".to_owned()), Err(_) => return Err("Failed to read from file".to_owned()),
} }
return PngData::from_slice(&byte_data, fix_errors) PngData::from_slice(&byte_data, fix_errors)
} }
/// Create a new `PngData` struct by reading a slice /// Create a new `PngData` struct by reading a slice