Przeglądaj źródła

data-url: clean up clippy warnings

Dirkjan Ochtman 6 lat temu
rodzic
commit
0877793edc
2 zmienionych plików z 13 dodań i 6 usunięć
  1. 8 5
      data-url/src/forgiving_base64.rs
  2. 5 1
      data-url/src/lib.rs

+ 8 - 5
data-url/src/forgiving_base64.rs

@@ -38,7 +38,10 @@ impl From<DecodeError<Impossible>> for InvalidBase64 {
 pub fn decode_to_vec(input: &[u8]) -> Result<Vec<u8>, InvalidBase64> {
     let mut v = Vec::new();
     {
-        let mut decoder = Decoder::new(|bytes| Ok(v.extend_from_slice(bytes)));
+        let mut decoder = Decoder::new(|bytes| {
+            v.extend_from_slice(bytes);
+            Ok(())
+        });
         decoder.feed(input)?;
         decoder.finish()?;
     }
@@ -86,10 +89,10 @@ where
                     continue;
                 }
 
-                Err(InvalidBase64Details::UnexpectedSymbol(byte))?
+                return Err(InvalidBase64Details::UnexpectedSymbol(byte).into());
             }
             if self.padding_symbols > 0 {
-                Err(InvalidBase64Details::AlphabetSymbolAfterPadding)?
+                return Err(InvalidBase64Details::AlphabetSymbolAfterPadding.into());
             }
             self.bit_buffer <<= 6;
             self.bit_buffer |= value as u32;
@@ -130,8 +133,8 @@ where
                 let byte_buffer = [(self.bit_buffer >> 10) as u8, (self.bit_buffer >> 2) as u8];
                 (self.write_bytes)(&byte_buffer).map_err(DecodeError::WriteError)?;
             }
-            (6, _) => Err(InvalidBase64Details::LoneAlphabetSymbol)?,
-            _ => Err(InvalidBase64Details::Padding)?,
+            (6, _) => return Err(InvalidBase64Details::LoneAlphabetSymbol.into()),
+            _ => return Err(InvalidBase64Details::Padding.into()),
         }
         Ok(())
     }

+ 5 - 1
data-url/src/lib.rs

@@ -87,7 +87,10 @@ impl<'a> DataUrl<'a> {
         &self,
     ) -> Result<(Vec<u8>, Option<FragmentIdentifier<'a>>), forgiving_base64::InvalidBase64> {
         let mut body = Vec::new();
-        let fragment = self.decode(|bytes| Ok(body.extend_from_slice(bytes)))?;
+        let fragment = self.decode(|bytes| {
+            body.extend_from_slice(bytes);
+            Ok(())
+        })?;
         Ok((body, fragment))
     }
 }
@@ -213,6 +216,7 @@ fn parse_header(from_colon_to_comma: &str) -> (mime::Mime, bool) {
 }
 
 /// None: no base64 suffix
+#[allow(clippy::skip_while_next)]
 fn remove_base64_suffix(s: &str) -> Option<&str> {
     let mut bytes = s.bytes();
     {