diff --git a/src/lib.rs b/src/lib.rs index 6544ee59..e3bee229 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -253,7 +253,7 @@ pub fn optimize(filepath: &Path, opts: &Options) -> Result<(), String> { pub fn optimize_from_memory(data: &[u8], opts: &Options) -> Result, String> { // Read in the file and try to decode as PNG. 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 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, Stri // Run the optimizer on the decoded PNG. let optimized_output = optimize_png(&mut png, original_size, opts); - match is_fully_optimized(original_size, optimized_output.len(), opts) { - true => { - writeln!(&mut stderr(), "Image already optimized").ok(); - Ok(data.to_vec()) - }, - false => Ok(optimized_output) + if is_fully_optimized(original_size, optimized_output.len(), opts) { + writeln!(&mut stderr(), "Image already optimized").ok(); + Ok(data.to_vec()) + } else { + 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 { - return original_size <= optimized_size && !opts.force && opts.interlace.is_none() + original_size <= optimized_size && !opts.force && opts.interlace.is_none() } diff --git a/src/png.rs b/src/png.rs index 2dbecf1e..d21ea9be 100644 --- a/src/png.rs +++ b/src/png.rs @@ -303,7 +303,7 @@ impl PngData { 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