diff --git a/Cargo.lock b/Cargo.lock index f28b4fe770c..1f54dd9168e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1935,7 +1935,7 @@ dependencies = [ "gix-hash", "gix-imara-diff", "gix-object", - "hashbrown 0.15.5", + "hashbrown 0.17.0", ] [[package]] @@ -4908,9 +4908,9 @@ checksum = "7b2093cf4c8eb1e67749a6762251bc9cd836b6fc171623bd0a9d324d37af2417" [[package]] name = "tar" -version = "0.4.45" +version = "0.4.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22692a6476a21fa75fdfc11d452fda482af402c008cdbaf3476414e122040973" +checksum = "3f6221d9a6003c78398e3b239969f352578258df48c8eb051caadae0015bc840" dependencies = [ "filetime", "libc", diff --git a/gitoxide-core/src/repository/fetch.rs b/gitoxide-core/src/repository/fetch.rs index f6e7319cee8..00a2efdc772 100644 --- a/gitoxide-core/src/repository/fetch.rs +++ b/gitoxide-core/src/repository/fetch.rs @@ -93,9 +93,7 @@ pub(crate) mod function { if negotiation_info { print_negotiate_info(&mut out, negotiate.as_ref())?; } - if let Some((negotiate, path)) = - open_negotiation_graph.and_then(|path| negotiate.as_ref().map(|n| (n, path))) - { + if let Some((negotiate, path)) = negotiate.as_ref().zip(open_negotiation_graph) { render_graph(&repo, &negotiate.graph, &path, progress)?; } Ok::<_, anyhow::Error>(()) diff --git a/gix-archive/Cargo.toml b/gix-archive/Cargo.toml index c40824ade94..43118fe2650 100644 --- a/gix-archive/Cargo.toml +++ b/gix-archive/Cargo.toml @@ -42,7 +42,7 @@ rawzip = { version = "0.4.3", optional = true } gix-error = { version = "^0.2.4", path = "../gix-error" } bstr = { version = "1.12.0", default-features = false } -tar = { version = "0.4.38", optional = true } +tar = { version = "0.4.46", optional = true } document-features = { version = "0.2.0", optional = true } diff --git a/gix/src/clone/fetch/util.rs b/gix/src/clone/fetch/util.rs index 9fb42c42dee..c9e0cda7841 100644 --- a/gix/src/clone/fetch/util.rs +++ b/gix/src/clone/fetch/util.rs @@ -197,11 +197,7 @@ pub(super) fn find_custom_refname<'a>( let filtered_items: Vec<_> = ref_map .mappings .iter() - .filter_map(|m| { - m.remote - .as_name() - .and_then(|name| m.remote.as_id().map(|id| (name, id))) - }) + .filter_map(|m| m.remote.as_name().zip(m.remote.as_id())) .map(|(full_ref_name, target)| gix_refspec::match_group::Item { full_ref_name, target, diff --git a/gix/src/repository/config/transport.rs b/gix/src/repository/config/transport.rs index 63810932261..888ecfb412f 100644 --- a/gix/src/repository/config/transport.rs +++ b/gix/src/repository/config/transport.rs @@ -388,7 +388,7 @@ impl crate::Repository { trusted_only, lenient, ) - .map(|max| min.and_then(|min| max.map(|max| (min, max)))) + .map(|max| min.zip(max)) })?; if let Some((min, max)) = min_max { let v = opts.ssl_version.get_or_insert(SslVersionRangeInclusive { diff --git a/tests/tools/Cargo.toml b/tests/tools/Cargo.toml index 6713783df25..97b44e8d649 100644 --- a/tests/tools/Cargo.toml +++ b/tests/tools/Cargo.toml @@ -42,7 +42,7 @@ fs_extra = "1.2.0" parking_lot = { version = "0.12.4" } is_ci = "1.1.1" io-close = "0.3.7" -tar = { version = "0.4.38", default-features = false } +tar = { version = "0.4.46", default-features = false } xz2 = { version = "0.1.6", optional = true } document-features = { version = "0.2.1", optional = true }