Upgrade indicatif

Summary: Upgrade to indicatif 0.16 and remove this as an exposed dep in the third-party repo.

Reviewed By: aigoncharov

Differential Revision: D36591356

fbshipit-source-id: e3e3d67f8522b94861b34422606b85afbebf669b
This commit is contained in:
Pascal Hartig
2022-05-23 04:55:24 -07:00
committed by Facebook GitHub Bot
parent e639055fc4
commit ed454d876d
3 changed files with 8 additions and 16 deletions

16
packer/Cargo.lock generated
View File

@@ -118,9 +118,7 @@ dependencies = [
"encode_unicode", "encode_unicode",
"libc", "libc",
"once_cell", "once_cell",
"regex",
"terminal_size", "terminal_size",
"unicode-width",
"winapi", "winapi",
] ]
@@ -366,9 +364,9 @@ dependencies = [
[[package]] [[package]]
name = "indicatif" name = "indicatif"
version = "0.15.0" version = "0.16.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7baab56125e25686df467fe470785512329883aab42696d661247aca2a2896e4" checksum = "2d207dc617c7a380ab07ff572a6e52fa202a2a8f355860ac9c38e23f8196be1b"
dependencies = [ dependencies = [
"console", "console",
"lazy_static", "lazy_static",
@@ -447,9 +445,9 @@ dependencies = [
[[package]] [[package]]
name = "number_prefix" name = "number_prefix"
version = "0.3.0" version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "17b02fc0ff9a9e4b35b3342880f48e896ebf69f2967921fe8646bf5b7125956a" checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
[[package]] [[package]]
name = "once_cell" name = "once_cell"
@@ -800,12 +798,6 @@ version = "1.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987"
[[package]]
name = "unicode-width"
version = "0.1.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973"
[[package]] [[package]]
name = "unicode-xid" name = "unicode-xid"
version = "0.2.2" version = "0.2.2"

View File

@@ -20,7 +20,7 @@ sha2 = "0.10.2"
data-encoding = "^2" data-encoding = "^2"
serde_json = "^1" serde_json = "^1"
rayon = "^1.5" rayon = "^1.5"
indicatif = "^0.15" indicatif = "^0.16"
xz2 = "0.1.6" xz2 = "0.1.6"
ignore = "0.4.18" ignore = "0.4.18"

View File

@@ -108,7 +108,7 @@ fn pack(
output_directory: &std::path::Path, output_directory: &std::path::Path,
) -> Result<Vec<(PackType, path::PathBuf)>> { ) -> Result<Vec<(PackType, path::PathBuf)>> {
let pb = default_progress_bar(pack_list.0.len() as u64 * 2 - 1); let pb = default_progress_bar(pack_list.0.len() as u64 * 2 - 1);
pb.set_prefix(&format!( pb.set_prefix(format!(
"{:width$}", "{:width$}",
"Packing archives", "Packing archives",
width = PROGRESS_PREFIX_LEN width = PROGRESS_PREFIX_LEN
@@ -262,7 +262,7 @@ fn compress_paths(
archive_paths: &[(PackType, path::PathBuf)], archive_paths: &[(PackType, path::PathBuf)],
) -> Result<Vec<(PackType, path::PathBuf)>> { ) -> Result<Vec<(PackType, path::PathBuf)>> {
let pb = default_progress_bar(archive_paths.len() as u64 - 1); let pb = default_progress_bar(archive_paths.len() as u64 - 1);
pb.set_prefix(&format!( pb.set_prefix(format!(
"{:width$}", "{:width$}",
"Compressing archives", "Compressing archives",
width = PROGRESS_PREFIX_LEN width = PROGRESS_PREFIX_LEN
@@ -329,7 +329,7 @@ fn gen_manifest_files(
) -> Result<BTreeMap<PackType, PackFile>> { ) -> Result<BTreeMap<PackType, PackFile>> {
use std::iter; use std::iter;
let pb = default_progress_bar((archive_paths.len() as u64 - 1) * 2); let pb = default_progress_bar((archive_paths.len() as u64 - 1) * 2);
pb.set_prefix(&format!( pb.set_prefix(format!(
"{:width$}", "{:width$}",
"Computing manifest", "Computing manifest",
width = PROGRESS_PREFIX_LEN width = PROGRESS_PREFIX_LEN