replace usage of ubyte by our own Bytes formatter

This commit is contained in:
João M. Bezerra 2023-09-04 21:15:57 -03:00
parent 693167e933
commit cbd327aad7
5 changed files with 7 additions and 15 deletions

7
Cargo.lock generated
View File

@ -735,7 +735,6 @@ dependencies = [
"tempfile",
"test-strategy",
"time",
"ubyte",
"xz2",
"zip",
"zstd",
@ -1188,12 +1187,6 @@ dependencies = [
"static_assertions",
]
[[package]]
name = "ubyte"
version = "0.10.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c81f0dae7d286ad0d9366d7679a77934cfc3cf3a8d67e82669794412b2368fe6"
[[package]]
name = "unarray"
version = "0.1.4"

View File

@ -30,7 +30,6 @@ snap = "1.1.0"
tar = "0.4.40"
tempfile = "3.8.0"
time = { version = "0.3.28", default-features = false }
ubyte = { version = "0.10.3", default-features = false }
xz2 = "0.1.7"
zip = { version = "0.6.6", default-features = false, features = ["time"] }
zstd = { version = "0.12.4", default-features = false }

View File

@ -10,13 +10,12 @@ use std::{
use fs_err as fs;
use same_file::Handle;
use ubyte::ToByteUnit;
use crate::{
error::FinalError,
info,
list::FileInArchive,
utils::{self, EscapedPathDisplay, FileVisibilityPolicy},
utils::{self, Bytes, EscapedPathDisplay, FileVisibilityPolicy},
warning,
};
@ -41,7 +40,7 @@ pub fn unpack_archive(reader: Box<dyn Read>, output_folder: &Path, quiet: bool)
inaccessible,
"{:?} extracted. ({})",
utils::strip_cur_dir(&output_folder.join(file.path()?)),
file.size().bytes(),
Bytes::new(file.size()),
);
files_unpacked += 1;

View File

@ -14,7 +14,6 @@ use filetime::{set_file_mtime, FileTime};
use fs_err as fs;
use same_file::Handle;
use time::OffsetDateTime;
use ubyte::ToByteUnit;
use zip::{self, read::ZipFile, DateTime, ZipArchive};
use crate::{
@ -22,7 +21,7 @@ use crate::{
info,
list::FileInArchive,
utils::{
self, cd_into_same_dir_as, get_invalid_utf8_paths, pretty_format_list_of_paths, strip_cur_dir,
self, cd_into_same_dir_as, get_invalid_utf8_paths, pretty_format_list_of_paths, strip_cur_dir, Bytes,
EscapedPathDisplay, FileVisibilityPolicy,
},
warning,
@ -74,7 +73,7 @@ where
inaccessible,
"{:?} extracted. ({})",
file_path.display(),
file.size().bytes()
Bytes::new(file.size()),
);
}

View File

@ -10,7 +10,9 @@ mod fs;
mod question;
pub use file_visibility::FileVisibilityPolicy;
pub use formatting::{nice_directory_display, pretty_format_list_of_paths, strip_cur_dir, to_utf, EscapedPathDisplay};
pub use formatting::{
nice_directory_display, pretty_format_list_of_paths, strip_cur_dir, to_utf, Bytes, EscapedPathDisplay,
};
pub use fs::{
cd_into_same_dir_as, clear_path, create_dir_if_non_existent, is_symlink, remove_file_or_dir, try_infer_extension,
};