From 38b56e67b8902d566c55a8eab77abe314cec3d57 Mon Sep 17 00:00:00 2001 From: Hatter Jiang Date: Sat, 20 Aug 2022 22:12:51 +0800 Subject: [PATCH] feat: v0.1.4 opt error processing --- Cargo.lock | 26 +++++--------------------- Cargo.toml | 6 +++--- src/main.rs | 4 ++-- 3 files changed, 10 insertions(+), 26 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2a67268..12da30f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -116,14 +116,13 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "indicatif" -version = "0.13.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8572bccfb0665e70b7faf44ee28841b8e0823450cd4ad562a76b5a3c4bf48487" +checksum = "fcc42b206e70d86ec03285b123e65a5458c92027d1fb2ae3555878b8113b3ddf" dependencies = [ "console", - "lazy_static", "number_prefix", - "regex", + "unicode-width", ] [[package]] @@ -185,9 +184,9 @@ dependencies = [ [[package]] name = "number_prefix" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17b02fc0ff9a9e4b35b3342880f48e896ebf69f2967921fe8646bf5b7125956a" +checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" [[package]] name = "once_cell" @@ -316,21 +315,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "regex" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b" -dependencies = [ - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.6.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" - [[package]] name = "rust-crypto" version = "0.2.36" diff --git a/Cargo.toml b/Cargo.toml index d402afe..151d238 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,8 +14,8 @@ license = "MIT" argparse = "0.2.2" libsm = "0.5.0" rust-crypto = "0.2.36" -hex = "0.4.0" -indicatif = "0.13.0" -rust_util = "0.6.3" +hex = "0.4.3" +indicatif = "0.17.0" +rust_util = "0.6.41" diff --git a/src/main.rs b/src/main.rs index 983e03a..671e6ce 100644 --- a/src/main.rs +++ b/src/main.rs @@ -147,7 +147,7 @@ fn read_file_full(file_name: &str) -> XResult> { let mut ret: Vec = Vec::with_capacity(file_len as usize); let pb = ProgressBar::new(file_len); - pb.set_style(ProgressStyle::default_bar().template(PB_TEMPLATE).progress_chars(PB_PROGRESS)); + pb.set_style(ProgressStyle::default_bar().template(PB_TEMPLATE)?.progress_chars(PB_PROGRESS)); let mut read = 0_u64; loop { @@ -173,7 +173,7 @@ fn calc_file_digest(digest: &mut dyn Digest, file_name: &str) -> XResult let mut processed = 0_u64; let pb = ProgressBar::new(file_len); - pb.set_style(ProgressStyle::default_bar().template(PB_TEMPLATE).progress_chars(PB_PROGRESS)); + pb.set_style(ProgressStyle::default_bar().template(PB_TEMPLATE)?.progress_chars(PB_PROGRESS)); loop { let len = match f.read(&mut buf) {