Clippy auto fixes

Author: ZeWaka

src/dmi.rs

@@ -94,14 +94,10 @@ impl RawDmi {
 			}
 		}
 		if chunk_ihdr == None {
-			return Err(error::DmiError::Generic(format!(
-				"Failed to load DMI. Buffer end reached without finding an IHDR chunk."
-			)));
+			return Err(error::DmiError::Generic("Failed to load DMI. Buffer end reached without finding an IHDR chunk.".to_string()));
 		};
-		if chunks_idat.len() == 0 {
-			return Err(error::DmiError::Generic(format!(
-				"Failed to load DMI. Buffer end reached without finding an IDAT chunk."
-			)));
+		if chunks_idat.is_empty() {
+			return Err(error::DmiError::Generic("Failed to load DMI. Buffer end reached without finding an IDAT chunk.".to_string()));
 		}
 		let other_chunks = match other_chunks.len() {
 			0 => None,

src/dmi/chunk.rs

@@ -52,7 +52,7 @@ impl RawGenericChunk {
 			)));
 		};
 
-		let data: Vec<u8> = chunk_bytes[8..(chunk_length - 4)].iter().cloned().collect();
+		let data: Vec<u8> = chunk_bytes[8..(chunk_length - 4)].to_vec();
 
 		let crc = [
 			chunk_bytes[chunk_length - 4],

src/dmi/icon.rs

@@ -1,7 +1,7 @@
 use super::error;
 use super::ztxt;
 use super::RawDmi;
-use image;
+
 use image::imageops;
 use image::GenericImageView;
 use std::collections::HashMap;
@@ -21,9 +21,7 @@ impl Icon {
 		let chunk_ztxt = match &raw_dmi.chunk_ztxt {
 			Some(chunk) => chunk.clone(),
 			None => {
-				return Err(error::DmiError::Generic(format!(
-					"Error loading icon: no zTXt chunk found."
-				)))
+				return Err(error::DmiError::Generic("Error loading icon: no zTXt chunk found.".to_string()))
 			}
 		};
 		let decompressed_text = chunk_ztxt.data.decode()?;
@@ -41,9 +39,7 @@ impl Icon {
 		let current_line = match decompressed_text.next() {
 			Some(thing) => thing,
 			None => {
-				return Err(error::DmiError::Generic(format!(
-					"Error loading icon: no version header found."
-				)))
+				return Err(error::DmiError::Generic("Error loading icon: no version header found.".to_string()))
 			}
 		};
 		let split_version: Vec<&str> = current_line.split_terminator(" = ").collect();
@@ -58,9 +54,7 @@ impl Icon {
 		let current_line = match decompressed_text.next() {
 			Some(thing) => thing,
 			None => {
-				return Err(error::DmiError::Generic(format!(
-					"Error loading icon: no width found."
-				)))
+				return Err(error::DmiError::Generic("Error loading icon: no width found.".to_string()))
 			}
 		};
 		let split_version: Vec<&str> = current_line.split_terminator(" = ").collect();
@@ -75,9 +69,7 @@ impl Icon {
 		let current_line = match decompressed_text.next() {
 			Some(thing) => thing,
 			None => {
-				return Err(error::DmiError::Generic(format!(
-					"Error loading icon: no height found."
-				)))
+				return Err(error::DmiError::Generic("Error loading icon: no height found.".to_string()))
 			}
 		};
 		let split_version: Vec<&str> = current_line.split_terminator(" = ").collect();
@@ -118,9 +110,7 @@ impl Icon {
 		let mut current_line = match decompressed_text.next() {
 			Some(thing) => thing,
 			None => {
-				return Err(error::DmiError::Generic(format!(
-					"Error loading icon: no DMI trailer nor states found."
-				)))
+				return Err(error::DmiError::Generic("Error loading icon: no DMI trailer nor states found.".to_string()))
 			}
 		};
 
@@ -151,7 +141,7 @@ impl Icon {
 					)))
 				}
 				2 => String::new(), //Only the quotes, empty name otherwise.
-				length @ _ => String::from_utf8(name[1..(length - 1)].to_vec())?, //Hacky way to trim. Blame the cool methods being nightly experimental.
+				length => String::from_utf8(name[1..(length - 1)].to_vec())?, //Hacky way to trim. Blame the cool methods being nightly experimental.
 			};
 
 			let mut dirs = None;
@@ -167,9 +157,7 @@ impl Icon {
 				current_line = match decompressed_text.next() {
 					Some(thing) => thing,
 					None => {
-						return Err(error::DmiError::Generic(format!(
-							"Error loading icon: no DMI trailer found."
-						)))
+						return Err(error::DmiError::Generic("Error loading icon: no DMI trailer found.".to_string()))
 					}
 				};
 
@@ -189,7 +177,7 @@ impl Icon {
 					"\tframes" => frames = Some(split_version[1].parse::<u32>()?),
 					"\tdelay" => {
 						let mut delay_vector = vec![];
-						let text_delays = split_version[1].split_terminator(",");
+						let text_delays = split_version[1].split_terminator(',');
 						for text_entry in text_delays {
 							delay_vector.push(text_entry.parse::<f32>()?);
 						}
@@ -199,7 +187,7 @@ impl Icon {
 					"\trewind" => rewind = Some(split_version[1].parse::<u32>()?),
 					"\tmovement" => movement = Some(split_version[1].parse::<u32>()?),
 					"\thotspot" => {
-						let text_coordinates: Vec<&str> = split_version[1].split_terminator(",").collect();
+						let text_coordinates: Vec<&str> = split_version[1].split_terminator(',').collect();
 						if text_coordinates.len() != 3 {
 							return Err(error::DmiError::Generic(format!(
 								"Error loading icon: improper hotspot found: {:#?}",
@@ -362,7 +350,7 @@ impl Icon {
 
 		new_dmi.chunk_ztxt = Some(new_ztxt);
 
-		Ok(new_dmi.save(&mut writter)?)
+		new_dmi.save(&mut writter)
 	}
 }
 

src/dmi/iend.rs

@@ -128,7 +128,7 @@ impl Default for RawIendChunk {
 impl TryFrom<chunk::RawGenericChunk> for RawIendChunk {
 	type Error = error::DmiError;
 	fn try_from(raw_generic_chunk: chunk::RawGenericChunk) -> Result<Self, Self::Error> {
-		if raw_generic_chunk.data.len() > 0 {
+		if !raw_generic_chunk.data.is_empty() {
 			return Err(error::DmiError::Generic(format!(
 				"Failed to convert RawGenericChunk into RawIendChunk. Non-empty data field. Chunk: {:#?}.",
 				raw_generic_chunk

src/dmi/ztxt.rs

@@ -1,8 +1,8 @@
 use super::chunk;
 use super::crc;
 use super::error;
-use deflate;
-use inflate;
+
+
 use std::convert::TryFrom;
 use std::fmt;
 use std::io::prelude::*;

src/tests.rs

@@ -8,6 +8,6 @@ fn load_dmi() {
 	let mut path = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
 	path.push("tests/load_test.dmi");
 	let path = Path::new(&path);
-	let file = File::open(&path).expect(&format!("No lights dmi: {:?}", path));
+	let file = File::open(&path).unwrap_or_else(|_| panic!("No lights dmi: {:?}", path));
 	let _lights_icon = icon::Icon::load(&file).expect("Unable to load lights dmi");
 }