Merge pull request #148 from kpcyrd/base64

Replace base64 crate with data-encoding
kpcyrd · Nov 11, 2024 · e024e74 · e024e74
2 parents a1c706c + 7b6c1af
commit e024e74
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 16 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/tools/Cargo.toml b/tools/Cargo.toml
@@ -41,4 +41,4 @@ regex = "1.5.6"
 url = "2.2.2"
 
 [dev-dependencies]
-base64 = "0.13.0"
+data-encoding = "2"
diff --git a/tools/src/decompress.rs b/tools/src/decompress.rs
@@ -44,6 +44,7 @@ pub fn stream<'a>(comp: CompressedWith, bytes: &'a [u8]) -> Result<Box<dyn Read
 #[cfg(test)]
 mod tests {
     use super::*;
+    use data_encoding::BASE64;
 
     #[test]
     fn detect_no_compression() {
@@ -62,14 +63,14 @@ mod tests {
 
     #[test]
     fn detect_gzip_compression() {
-        let bytes = base64::decode("H4sIAAAAAAAAA8vPSMzkAgCKUC0+BQAAAA==").unwrap();
+        let bytes = BASE64.decode(b"H4sIAAAAAAAAA8vPSMzkAgCKUC0+BQAAAA==").unwrap();
         let comp = detect_compression(&bytes);
         assert_eq!(comp, CompressedWith::Gzip);
     }
 
     #[test]
     fn decompress_gzip_compression() {
-        let bytes = base64::decode("H4sIAAAAAAAAA8vPSMzkAgCKUC0+BQAAAA==").unwrap();
+        let bytes = BASE64.decode(b"H4sIAAAAAAAAA8vPSMzkAgCKUC0+BQAAAA==").unwrap();
         let comp = detect_compression(&bytes);
         assert_eq!(comp, CompressedWith::Gzip);
 
@@ -80,14 +81,14 @@ mod tests {
 
     #[test]
     fn detect_bzip2_compression() {
-        let bytes = base64::decode("QlpoOTFBWSZTWZ+CN7sAAAJBAAAQIGCgADDNAMGmwHF3JFOFCQn4I3uw").unwrap();
+        let bytes = BASE64.decode(b"QlpoOTFBWSZTWZ+CN7sAAAJBAAAQIGCgADDNAMGmwHF3JFOFCQn4I3uw").unwrap();
         let comp = detect_compression(&bytes);
         assert_eq!(comp, CompressedWith::Bzip2);
     }
 
     #[test]
     fn decompress_bzip2_compression() {
-        let bytes = base64::decode("QlpoOTFBWSZTWZ+CN7sAAAJBAAAQIGCgADDNAMGmwHF3JFOFCQn4I3uw").unwrap();
+        let bytes = BASE64.decode(b"QlpoOTFBWSZTWZ+CN7sAAAJBAAAQIGCgADDNAMGmwHF3JFOFCQn4I3uw").unwrap();
         let comp = detect_compression(&bytes);
         assert_eq!(comp, CompressedWith::Bzip2);
 
@@ -98,14 +99,14 @@ mod tests {
 
     #[test]
     fn detect_xz_compression() {
-        let bytes = base64::decode("/Td6WFoAAATm1rRGAgAhARYAAAB0L+WjAQAEb2hhaQoAAAAACyuekVbXbHMAAR0FuC2Arx+2830BAAAAAARZWg==").unwrap();
+        let bytes = BASE64.decode(b"/Td6WFoAAATm1rRGAgAhARYAAAB0L+WjAQAEb2hhaQoAAAAACyuekVbXbHMAAR0FuC2Arx+2830BAAAAAARZWg==").unwrap();
         let comp = detect_compression(&bytes);
         assert_eq!(comp, CompressedWith::Xz);
     }
 
     #[test]
     fn decompress_xz_compression() {
-        let bytes = base64::decode("/Td6WFoAAATm1rRGAgAhARYAAAB0L+WjAQAEb2hhaQoAAAAACyuekVbXbHMAAR0FuC2Arx+2830BAAAAAARZWg==").unwrap();
+        let bytes = BASE64.decode(b"/Td6WFoAAATm1rRGAgAhARYAAAB0L+WjAQAEb2hhaQoAAAAACyuekVbXbHMAAR0FuC2Arx+2830BAAAAAARZWg==").unwrap();
         let comp = detect_compression(&bytes);
         assert_eq!(comp, CompressedWith::Xz);
 
@@ -116,14 +117,14 @@ mod tests {
 
     #[test]
     fn detect_zstd_compression() {
-        let bytes = base64::decode("KLUv/QRYKQAAb2hhaQpnBE++").unwrap();
+        let bytes = BASE64.decode(b"KLUv/QRYKQAAb2hhaQpnBE++").unwrap();
         let comp = detect_compression(&bytes);
         assert_eq!(comp, CompressedWith::Zstd);
     }
 
     #[test]
     fn decompress_zstd_compression() {
-        let bytes = base64::decode("KLUv/QRYKQAAb2hhaQpnBE++").unwrap();
+        let bytes = BASE64.decode(b"KLUv/QRYKQAAb2hhaQpnBE++").unwrap();
         let comp = detect_compression(&bytes);
         assert_eq!(comp, CompressedWith::Zstd);