Fixed clippy warnings and formatting

1 files changed, 14 insertions, 15 deletions

diff --git a/src/lib.rs b/src/lib.rs
index 5a19baf..ae346a1 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -17,14 +17,14 @@ struct EncodeHexIterSlice<'data_lifetime> {
     //bytes to encode as hex
     data: &'data_lifetime [u8],
     //each byte generates 2 hex characters but we only return one at a time
-    next_char : Option<char>
+    next_char: Option<char>,
 }
 
 impl<'data_lifetime> EncodeHexIterSlice<'data_lifetime> {
-    fn new(data : &'data_lifetime [u8]) -> Self {
-        EncodeHexIterSlice{
+    fn new(data: &'data_lifetime [u8]) -> Self {
+        EncodeHexIterSlice {
             data,
-            next_char : None
+            next_char: None,
         }
     }
 }
@@ -36,7 +36,7 @@ impl<'data_lifetime> Iterator for EncodeHexIterSlice<'data_lifetime> {
         if let Some(c) = self.next_char.take() {
             return Some(c);
         }
-        if self.data.len() == 0 {
+        if self.data.is_empty() {
             return None;
         }
 
@@ -91,8 +91,8 @@ fn hex_char_byte_to_value(c: u8) -> Result<u8, HexDecodeError> {
 fn byte_to_hex_char(b: u8) -> char {
     assert!(b <= 15);
     match b {
-        digit if digit < 10 => ('0' as u8 + digit) as char,
-        letter => ('a' as u8 + letter - 10) as char,
+        digit if digit < 10 => (b'0' + digit) as char,
+        letter => (b'a' + letter - 10) as char,
     }
 }
 
@@ -112,9 +112,9 @@ fn append_byte_hex_to_string(byte: u8, string: &mut String) {
 /// //do something
 ///}
 ///```
-pub fn decode_hex_iter<'a, T>(string: &'a T) -> impl Iterator<Item = u8> + 'a
+pub fn decode_hex_iter<T>(string: &T) -> impl Iterator<Item = u8> + '_
 where
-    T: AsRef<[u8]> + ?Sized
+    T: AsRef<[u8]> + ?Sized,
 {
     DecodeHexIterSlice::new(string.as_ref())
 }
@@ -128,8 +128,9 @@ where
 /// //do something with c
 ///}
 ///```
-pub fn encode_hex_iter<'a, T>(data : &'a T) -> impl Iterator<Item = char> + 'a 
-where T: AsRef<[u8]> + ?Sized
+pub fn encode_hex_iter<T>(data: &T) -> impl Iterator<Item = char> + '_
+where
+    T: AsRef<[u8]> + ?Sized,
 {
     EncodeHexIterSlice::new(data.as_ref())
 }
@@ -146,9 +147,8 @@ pub fn decode_hex<T: AsRef<[u8]>>(string: T) -> Result<Vec<u8>, HexDecodeError>
         return Err(HexDecodeError::InvalidByteCount);
     }
     let mut data = Vec::new();
-    let mut index = 0;
     let mut first_digit: u8 = 0;
-    for c in chars.iter() {
+    for (index, c) in chars.iter().enumerate() {
         if index % 2 != 0 {
             let second_digit = hex_char_byte_to_value(*c)?;
             let value = first_digit * 16 + second_digit;
@@ -156,7 +156,6 @@ pub fn decode_hex<T: AsRef<[u8]>>(string: T) -> Result<Vec<u8>, HexDecodeError>
         } else {
             first_digit = hex_char_byte_to_value(*c)?;
         }
-        index += 1;
     }
     Ok(data)
 }
@@ -261,7 +260,7 @@ mod tests {
     #[test]
     fn iter_encode_test() {
         let data = &[0xff, 0xaa, 0x12, 0x45];
-        let string : String = encode_hex_iter(&data).collect();
+        let string: String = encode_hex_iter(&data).collect();
         assert_eq!(string, "ffaa1245");
     }
 }