upgrade dependencies, lints

This commit is contained in:
phiresky 2020-04-08 12:47:42 +02:00
parent 9f11906151
commit 32c3431837
4 changed files with 699 additions and 751 deletions

1400
Cargo.lock generated

File diff suppressed because it is too large Load Diff

View File

@ -15,33 +15,33 @@ exclude = [
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies] [dependencies]
tree_magic = { package = "tree_magic_fork", version="0.2" } tree_magic = { package = "tree_magic_fork", version = "0.2.2" }
regex = "1.1.6" regex = "1.3.6"
rkv = "0.9.6" rkv = "0.10.4"
cachedir = "0.1.1" cachedir = "0.1.1"
path-clean = "0.1.0" path-clean = "0.1.0"
bincode = "1.1.4" bincode = "1.2.1"
serde = { version = "1.0.92", features = ["derive"] } serde = { version = "1.0.106", features = ["derive"] }
zstd = "0.4.24" zstd = "0.5.1"
lazy_static = "1.3.0" lazy_static = "1.4.0"
serde_json = "1.0.39" serde_json = "1.0.51"
failure = "0.1.5" failure = "0.1.7"
zip = "0.5.2" zip = "0.5.5"
crossbeam = "0.7.1" crossbeam = "0.7.3"
clap = { version="2.33.0", features=["wrap_help"] } clap = { version = "2.33.0", features = ["wrap_help"] }
log = "0.4.6" log = "0.4.8"
env_logger = "0.6.1" env_logger = "0.7.1"
xz2 = "0.1.6" xz2 = "0.1.6"
flate2 = "1.0.7" flate2 = "1.0.14"
bzip2 = "0.3.3" bzip2 = "0.3.3"
tar = "0.4.26" tar = "0.4.26"
chrono = "0.4.6" chrono = "0.4.11"
encoding_rs = "0.8.17" encoding_rs = "0.8.22"
encoding_rs_io = "0.1.6" encoding_rs_io = "0.1.7"
rusqlite = { version = "0", features=["vtab", "bundled"] } rusqlite = { version = "0.21.0", features = ["vtab", "bundled"] }
size_format = "1.0.2" size_format = "1.0.2"
structopt = "0.2.16" structopt = "0.3.12"
paste = "0.1.5" paste = "0.1.10"
tempfile = "3.0.8" tempfile = "3.1.0"
glob = "0.3.0" glob = "0.3.0"
exitfailure = "0.5.1" exitfailure = "0.5.1"

View File

@ -86,7 +86,7 @@ impl FileAdapter for FFmpegAdapter {
return Err(format_err!("ffprobe failed: {:?}", probe.status)); return Err(format_err!("ffprobe failed: {:?}", probe.status));
} }
let p: FFprobeOutput = serde_json::from_slice(&probe.stdout)?; let p: FFprobeOutput = serde_json::from_slice(&probe.stdout)?;
(p.streams.iter().count() > 0) p.streams.iter().count() > 0
}; };
{ {
// extract file metadata (especially chapter names in a greppable format) // extract file metadata (especially chapter names in a greppable format)

View File

@ -98,10 +98,10 @@ pub fn adapter_matcher<T: AsRef<str>>(
v.extend(fa); v.extend(fa);
v.extend(fb); v.extend(fb);
v.sort_by_key(|e| { v.sort_by_key(|e| {
(adapter_names adapter_names
.iter() .iter()
.position(|r| r == &e.0.metadata().name) .position(|r| r == &e.0.metadata().name)
.expect("impossib7")) .expect("impossib7")
}); });
eprintln!( eprintln!(
"Warning: found multiple adapters for {}:", "Warning: found multiple adapters for {}:",