diff --git a/Cargo.lock b/Cargo.lock index ba3e75b57..737229aeb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3482,7 +3482,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a56d757972c98b346a9b766e3f02746cde6dd1cd1d1d563472929fdd74bec4d" dependencies = [ "anyhow", - "itertools 0.14.0", + "itertools 0.13.0", "proc-macro2", "quote", "syn 2.0.103", @@ -4182,7 +4182,7 @@ dependencies = [ [[package]] name = "rustic_backend" version = "0.5.2" -source = "git+https://github.com/rustic-rs/rustic_core.git#5cccb63a0a6082a8ed344fcf0869968211fbccb2" +source = "git+https://github.com/rustic-rs/rustic_core.git#64d052d5e3094a79b2ba165a977de67c2275bbc5" dependencies = [ "aho-corasick", "backon", @@ -4221,7 +4221,7 @@ checksum = "fbcebf2228827bc4b61cb54dfd84cf43aacf06ca2dfe4c014b136a0e32b876e2" [[package]] name = "rustic_core" version = "0.7.3" -source = "git+https://github.com/rustic-rs/rustic_core.git#5cccb63a0a6082a8ed344fcf0869968211fbccb2" +source = "git+https://github.com/rustic-rs/rustic_core.git#64d052d5e3094a79b2ba165a977de67c2275bbc5" dependencies = [ "aes256ctr_poly1305aes", "binrw", @@ -4276,7 +4276,7 @@ dependencies = [ [[package]] name = "rustic_testing" version = "0.3.2" -source = "git+https://github.com/rustic-rs/rustic_core.git#5cccb63a0a6082a8ed344fcf0869968211fbccb2" +source = "git+https://github.com/rustic-rs/rustic_core.git#64d052d5e3094a79b2ba165a977de67c2275bbc5" dependencies = [ "aho-corasick", "anyhow", @@ -5855,7 +5855,7 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.48.0", ] [[package]] diff --git a/src/commands/config.rs b/src/commands/config.rs index 038fb004b..63c3f2f40 100644 --- a/src/commands/config.rs +++ b/src/commands/config.rs @@ -31,7 +31,7 @@ impl ConfigCmd { let changed = config .repository - .run_open(|repo| Ok(repo.apply_config(&self.config_opts)?))?; + .run_open(|mut repo| Ok(repo.apply_config(&self.config_opts)?))?; if changed { println!("saved new config"); diff --git a/src/commands/diff.rs b/src/commands/diff.rs index 7d3b43845..96122c8cf 100644 --- a/src/commands/diff.rs +++ b/src/commands/diff.rs @@ -238,8 +238,8 @@ fn identical_content_local
( for id in node.content.iter().flatten() { let ie = repo.get_index_entry(id)?; - let length = ie.data_length(); - if !id.blob_matches_reader(length as usize, &mut open_file) { + let length: u64 = ie.data_length().into(); + if !id.blob_matches_reader(length, &mut open_file) { return Ok(false); } }