diff --git a/Cargo.lock b/Cargo.lock index 30a01f4..f7e8b85 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -197,9 +197,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.77" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9f73505338f7d905b19d18738976aae232eb46b8efc15554ffc56deb5d9ebe4" +checksum = "a20104e2335ce8a659d6dd92a51a767a0c062599c73b343fd152cb401e828c3d" dependencies = [ "jobserver", ] @@ -987,9 +987,9 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.23.1" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59df7c4e19c950e6e0e868dcc0a300b09a9b88e9ec55bd879ca819087a77355d" +checksum = "1788965e61b367cd03a62950836d5cd41560c3577d90e40e0819373194d1661c" dependencies = [ "http", "hyper", @@ -1107,9 +1107,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.5.1" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f88c5561171189e69df9d98bcf18fd5f9558300f7ea7b801eb8a0fd748bd8745" +checksum = "11b0d96e660696543b251e58030cf9787df56da39dab19ad60eae7353040917e" [[package]] name = "itertools" @@ -2211,9 +2211,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.22.0" +version = "1.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d76ce4a75fb488c605c54bf610f221cea8b0dafb53333c1a67e8ee199dcd2ae3" +checksum = "eab6d665857cc6ca78d6e80303a02cea7a7851e85dfbd77cbdc09bd129f1ef46" dependencies = [ "autocfg", "bytes", @@ -2223,7 +2223,7 @@ dependencies = [ "num_cpus", "pin-project-lite", "socket2", - "winapi", + "windows-sys", ] [[package]] @@ -2294,9 +2294,9 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" [[package]] name = "typenum" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" +checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" [[package]] name = "unicode-bidi" @@ -2483,9 +2483,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.22.5" +version = "0.22.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368bfe657969fb01238bb756d351dcade285e0f6fcbd36dcb23359a5169975be" +checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" dependencies = [ "webpki", ] diff --git a/src/backend/cache.rs b/src/backend/cache.rs index fccb5cf..78a20c2 100644 --- a/src/backend/cache.rs +++ b/src/backend/cache.rs @@ -225,7 +225,7 @@ impl Cache { let mut file = fs::OpenOptions::new() .create(true) .write(true) - .open(&filename)?; + .open(filename)?; file.write_all(&buf)?; Ok(()) } diff --git a/src/backend/local.rs b/src/backend/local.rs index 8c945e6..1128eca 100644 --- a/src/backend/local.rs +++ b/src/backend/local.rs @@ -125,7 +125,7 @@ impl WriteBackend for LocalBackend { let mut file = fs::OpenOptions::new() .create(true) .write(true) - .open(&filename)?; + .open(filename)?; file.set_len(buf.len().try_into()?)?; file.write_all(&buf)?; file.sync_all()?; @@ -146,12 +146,12 @@ impl LocalBackend { } pub fn remove_file(&self, filename: impl AsRef) -> Result<()> { - Ok(fs::remove_file(&filename)?) + Ok(fs::remove_file(filename)?) } pub fn create_dir(&self, item: impl AsRef) -> Result<()> { let dirname = self.path.join(item); - fs::create_dir_all(&dirname)?; + fs::create_dir_all(dirname)?; Ok(()) } @@ -161,7 +161,7 @@ impl LocalBackend { set_file_mtime(&filename, mtime)?; } if let Some(atime) = meta.atime.map(|t| FileTime::from_system_time(t.into())) { - set_file_atime(&filename, atime)?; + set_file_atime(filename, atime)?; } Ok(()) } @@ -203,7 +203,7 @@ impl LocalBackend { if let Some(mode) = meta.mode() { let mode = map_mode_from_go(*mode); - std::fs::set_permissions(&filename, fs::Permissions::from_mode(mode))?; + std::fs::set_permissions(filename, fs::Permissions::from_mode(mode))?; } Ok(()) } @@ -249,7 +249,7 @@ impl LocalBackend { pub fn read_at(&self, item: impl AsRef, offset: u64, length: u64) -> Result { let filename = self.path.join(item); - let mut file = File::open(&filename)?; + let mut file = File::open(filename)?; file.seek(SeekFrom::Start(offset))?; let mut vec = vec![0; length.try_into()?]; file.read_exact(&mut vec)?; @@ -275,7 +275,7 @@ impl LocalBackend { let file = fs::OpenOptions::new() .create(true) .write(true) - .open(&filename)?; + .open(filename)?; file.write_all_at(data, offset)?; Ok(()) } diff --git a/src/commands/check.rs b/src/commands/check.rs index 99a821b..0d8e5d4 100644 --- a/src/commands/check.rs +++ b/src/commands/check.rs @@ -140,7 +140,7 @@ fn check_cache_files( return Ok(()); } - let total_size = files.iter().map(|(_, size)| *size as u64).sum(); + let total_size = files.values().map(|size| *size as u64).sum(); p.set_length(total_size); files.into_par_iter() diff --git a/src/commands/prune.rs b/src/commands/prune.rs index 6fea832..0bf33b8 100644 --- a/src/commands/prune.rs +++ b/src/commands/prune.rs @@ -874,8 +874,7 @@ impl Pruner { if !self.existing_packs.is_empty() { if opts.instant_delete { let p = progress_counter("removing unindexed packs..."); - let existing_packs: Vec<_> = - self.existing_packs.into_iter().map(|(id, _)| id).collect(); + let existing_packs: Vec<_> = self.existing_packs.into_keys().collect(); be.delete_list(FileType::Pack, true, existing_packs, p)?; } else { info!("marking not needed unindexed pack files for deletion..."); diff --git a/src/main.rs b/src/main.rs index 433fbb4..9afc258 100644 --- a/src/main.rs +++ b/src/main.rs @@ -4,7 +4,6 @@ // trivial_casts?? #![warn( bad_style, - const_err, dead_code, improper_ctypes, missing_copy_implementations,