diff --git a/src/lib/lib.rs b/src/lib/lib.rs index 5874abd..4367266 100644 --- a/src/lib/lib.rs +++ b/src/lib/lib.rs @@ -1,27 +1,22 @@ -use data_encoding::HEXUPPER; -use ring::digest::{Context, Digest, SHA256}; -use std::{fs::{self, File},io::{BufReader, Read},os::unix::fs::PermissionsExt,path::Path}; -use serial_test::serial; pub mod extractors; #[cfg(test)] mod tests { + use std::{io,os::unix::fs::PermissionsExt}; + use serial_test::serial; use super::*; use std::fs; use std::path::PathBuf; use std::path::Path; - use ring::digest::SHA256; + use std::io::Read; use extractors::{ extract_zip, extract_rar, extract_tar, - extract_lzma, - extract_bz2, extract_tbz2, extract_tgz, extract_txz, - extract_gz, extract_7z, // extract_arj, // extract_cab, @@ -343,7 +338,7 @@ fn test_extract_txz() { } fn verify_checksum(checksum_path: &str, testfile_path: &str) -> Result { - let mut checksum_file = File::open(checksum_path).expect("Failed to open checksum file"); + let mut checksum_file = fs::File::open(checksum_path).expect("Failed to open checksum file"); let mut checksum_data = String::new(); checksum_file .read_to_string(&mut checksum_data) @@ -356,9 +351,9 @@ fn verify_checksum(checksum_path: &str, testfile_path: &str) -> Result PathBuf { temp_dir.to_path_buf() } -fn sha256_digest(mut reader: R) -> Result { - let mut context = Context::new(&SHA256); +fn sha256_digest(mut reader: R) -> Result { + let mut context = ring::digest::Context::new(&ring::digest::SHA256); let mut buffer = [0; 1024]; loop { @@ -418,7 +413,7 @@ fn mode_to_chmod(mode: u32) -> u32 { flags } fn check_permissions(filepath: &str, perms: u32) -> Result { - let file = File::open(filepath)?; + let file = fs::File::open(filepath)?; let metadata = file.metadata()?; let permissions = metadata.permissions(); let mode = permissions.mode();