chore: Bump indicatif from 0.15.0 to 0.16.0

Bumps [indicatif](https://github.com/mitsuhiko/indicatif) from 0.15.0 to 0.16.0.
- [Release notes](https://github.com/mitsuhiko/indicatif/releases)
- [Commits](https://github.com/mitsuhiko/indicatif/commits)

Signed-off-by: dependabot[bot] <support@github.com>
This commit is contained in:
dependabot[bot] 2021-05-03 08:44:15 +00:00 committed by Mike Welsh
parent 185a4f5b8f
commit 860f26ef7d
5 changed files with 23 additions and 17 deletions

8
Cargo.lock generated
View File

@ -1636,9 +1636,9 @@ dependencies = [
[[package]] [[package]]
name = "indicatif" name = "indicatif"
version = "0.15.0" version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7baab56125e25686df467fe470785512329883aab42696d661247aca2a2896e4" checksum = "507cf157a0dab3c837bef6e2086466255d9de4a6b1af69e62b62c54cd52f6062"
dependencies = [ dependencies = [
"console", "console",
"lazy_static", "lazy_static",
@ -2362,9 +2362,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 = "objc" name = "objc"

View File

@ -15,7 +15,7 @@ log = "0.4"
futures = "0.3.14" futures = "0.3.14"
path-slash = "0.1.4" path-slash = "0.1.4"
walkdir = "2.3.2" walkdir = "2.3.2"
indicatif = "0.15" indicatif = "0.16"
[features] [features]
avm_debug = ["ruffle_core/avm_debug"] avm_debug = ["ruffle_core/avm_debug"]

View File

@ -125,7 +125,7 @@ fn take_screenshot(
for i in 0..totalframes { for i in 0..totalframes {
if let Some(progress) = &progress { if let Some(progress) = &progress {
progress.set_message(&format!( progress.set_message(format!(
"{} frame {}", "{} frame {}",
swf_path.file_stem().unwrap().to_string_lossy(), swf_path.file_stem().unwrap().to_string_lossy(),
i i
@ -182,13 +182,13 @@ fn find_files(root: &Path, with_progress: bool) -> Vec<DirEntry> {
if f_name.ends_with(".swf") { if f_name.ends_with(".swf") {
results.push(entry); results.push(entry);
if let Some(progress) = &progress { if let Some(progress) = &progress {
progress.set_message(&format!("Searching for swf files... {}", results.len())); progress.set_message(format!("Searching for swf files... {}", results.len()));
} }
} }
} }
if let Some(progress) = &progress { if let Some(progress) = &progress {
progress.finish_with_message(&format!("Found {} swf files to export", results.len())); progress.finish_with_message(format!("Found {} swf files to export", results.len()));
} }
results results
@ -232,7 +232,7 @@ fn capture_single_swf(descriptors: Descriptors, opt: &Opt) -> Result<(), Box<dyn
)?; )?;
if let Some(progress) = &progress { if let Some(progress) = &progress {
progress.set_message(&opt.swf.file_stem().unwrap().to_string_lossy()); progress.set_message(opt.swf.file_stem().unwrap().to_string_lossy().into_owned());
} }
if frames.len() == 1 { if frames.len() == 1 {
@ -261,7 +261,7 @@ fn capture_single_swf(descriptors: Descriptors, opt: &Opt) -> Result<(), Box<dyn
}; };
if let Some(progress) = progress { if let Some(progress) = progress {
progress.finish_with_message(&message); progress.finish_with_message(message);
} else { } else {
println!("{}", message); println!("{}", message);
} }
@ -300,7 +300,13 @@ fn capture_multiple_swfs(mut descriptors: Descriptors, opt: &Opt) -> Result<(),
descriptors = new_descriptors; descriptors = new_descriptors;
if let Some(progress) = &progress { if let Some(progress) = &progress {
progress.set_message(&file.path().file_stem().unwrap().to_string_lossy()); progress.set_message(
file.path()
.file_stem()
.unwrap()
.to_string_lossy()
.into_owned(),
);
} }
let mut relative_path = file let mut relative_path = file
@ -346,7 +352,7 @@ fn capture_multiple_swfs(mut descriptors: Descriptors, opt: &Opt) -> Result<(),
}; };
if let Some(progress) = progress { if let Some(progress) = progress {
progress.finish_with_message(&message); progress.finish_with_message(message);
} else { } else {
println!("{}", message); println!("{}", message);
} }

View File

@ -13,5 +13,5 @@ log = "0.4"
walkdir = "2.3.2" walkdir = "2.3.2"
serde = { version = "1.0", features = ["derive"] } serde = { version = "1.0", features = ["derive"] }
csv = "1.1" csv = "1.1"
indicatif = "0.15" indicatif = "0.16"
path-slash = "0.1.4" path-slash = "0.1.4"

View File

@ -44,11 +44,11 @@ fn find_files(root: &Path, ignore: &[String]) -> Vec<DirEntry> {
if f_name.ends_with(".swf") && !ignore.iter().any(|x| x == &f_name) { if f_name.ends_with(".swf") && !ignore.iter().any(|x| x == &f_name) {
results.push(entry); results.push(entry);
progress.set_message(&format!("Searching for swf files... {}", results.len())); progress.set_message(format!("Searching for swf files... {}", results.len()));
} }
} }
progress.finish_with_message(&format!("Found {} swf files to scan", results.len())); progress.finish_with_message(format!("Found {} swf files to scan", results.len()));
results results
} }
@ -115,7 +115,7 @@ fn main() -> Result<(), std::io::Error> {
.unwrap_or_else(|_| file.path()) .unwrap_or_else(|_| file.path())
.to_slash_lossy(); .to_slash_lossy();
progress.inc(1); progress.inc(1);
progress.set_message(&name); progress.set_message(name.clone());
let result = scan_file(file, name); let result = scan_file(file, name);
if result.error.is_none() { if result.error.is_none() {
@ -127,7 +127,7 @@ fn main() -> Result<(), std::io::Error> {
writer.serialize(result)?; writer.serialize(result)?;
} }
progress.finish_with_message(&format!( progress.finish_with_message(format!(
"Scanned {} swf files. {} successfully parsed, {} encountered errors", "Scanned {} swf files. {} successfully parsed, {} encountered errors",
total, good, bad total, good, bad
)); ));