From 35c509b6c625fb052e09968636df7d41928d3c42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Mikrut?= Date: Sat, 3 Jun 2023 21:48:18 +0200 Subject: [PATCH] CD --- Cargo.lock | 47 ++++++++++--------- czkawka_cli/Cargo.toml | 2 +- czkawka_core/Cargo.toml | 2 +- czkawka_core/src/similar_images.rs | 2 +- czkawka_gui/Cargo.toml | 4 +- .../connect_things/connect_popovers_select.rs | 1 - 6 files changed, 30 insertions(+), 28 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index bbd598a..e7c3269 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -148,12 +148,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" -[[package]] -name = "base64" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" - [[package]] name = "base64" version = "0.21.2" @@ -333,9 +327,9 @@ dependencies = [ [[package]] name = "cfg-expr" -version = "0.15.1" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8790cf1286da485c72cf5fc7aeba308438800036ec67d89425924c4807268c9" +checksum = "e70d3ad08698a0568b0562f22710fe6bfc1f4a61a367c77d0398c562eadd453a" dependencies = [ "smallvec", "target-lexicon", @@ -374,9 +368,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.3.0" +version = "4.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93aae7a4192245f70fe75dd9157fc7b4a5bf53e88d30bd4396f7d8f9284d5acc" +checksum = "b4ed2379f8603fa2b7509891660e802b88c70a79a6427a70abb5968054de2c28" dependencies = [ "clap_builder", "clap_derive", @@ -385,9 +379,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.3.0" +version = "4.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f423e341edefb78c9caba2d9c7f7687d0e72e89df3ce3394554754393ac3990" +checksum = "72394f3339a76daf211e57d4bcb374410f3965dcc606dd0e03738c7888766980" dependencies = [ "anstream", "anstyle", @@ -398,9 +392,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.3.0" +version = "4.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "191d9573962933b4027f932c600cd252ce27a8ad5979418fe78e43c07996f27b" +checksum = "59e9ef9a08ee1c0e1f2e162121665ac45ac3783b0f897db7244ae75ad9a8f65b" dependencies = [ "heck", "proc-macro2", @@ -492,7 +486,7 @@ dependencies = [ "autocfg", "cfg-if", "crossbeam-utils", - "memoffset", + "memoffset 0.8.0", "scopeguard", ] @@ -807,11 +801,11 @@ dependencies = [ [[package]] name = "field-offset" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3cf3a800ff6e860c863ca6d4b16fd999db8b752819c1606884047b73e468535" +checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f" dependencies = [ - "memoffset", + "memoffset 0.9.0", "rustc_version", ] @@ -1515,11 +1509,11 @@ dependencies = [ [[package]] name = "image_hasher" -version = "1.1.2" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a465709ca502270eba7ae8129c6a680f5668748d7edafa85da0f8ceae596bb2b" +checksum = "8f9e64a8c472ea9f81ac448e3b488fd82dcdfce6434cf880882bf36bfb5c268a" dependencies = [ - "base64 0.13.1", + "base64", "image", "rustdct 0.7.1", "serde", @@ -1781,7 +1775,7 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0cb2b21027aa98f860de475b3ee8b10f36df689121b5752efeb7a64bec1f4d45" dependencies = [ - "base64 0.21.2", + "base64", "byteorder", "flate2", "lofty_attr", @@ -1862,6 +1856,15 @@ dependencies = [ "autocfg", ] +[[package]] +name = "memoffset" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +dependencies = [ + "autocfg", +] + [[package]] name = "mime" version = "0.3.17" diff --git a/czkawka_cli/Cargo.toml b/czkawka_cli/Cargo.toml index 57a0f0e..608bc49 100644 --- a/czkawka_cli/Cargo.toml +++ b/czkawka_cli/Cargo.toml @@ -13,7 +13,7 @@ repository = "https://github.com/qarmin/czkawka" clap = { version = "4.3", features = ["derive"] } # For enum types -image_hasher = "1.1" +image_hasher = "1.2" [dependencies.czkawka_core] path = "../czkawka_core" diff --git a/czkawka_core/Cargo.toml b/czkawka_core/Cargo.toml index 83c8952..2659fcc 100644 --- a/czkawka_core/Cargo.toml +++ b/czkawka_core/Cargo.toml @@ -19,7 +19,7 @@ crossbeam-channel = "0.5" directories-next = "2.0" # Needed by similar images -image_hasher = "1.1" +image_hasher = "1.2" bk-tree = "0.5" image = "0.24" hamming = "0.1" diff --git a/czkawka_core/src/similar_images.rs b/czkawka_core/src/similar_images.rs index 29dcdcb..0e969bd 100644 --- a/czkawka_core/src/similar_images.rs +++ b/czkawka_core/src/similar_images.rs @@ -737,7 +737,7 @@ impl SimilarImages { for (child_hash, (parent_hash, similarity)) in hashes_similarity { let mut vec_fe = all_hashed_images.get(&child_hash).unwrap().clone(); - for mut fe in &mut vec_fe { + for fe in &mut vec_fe { fe.similarity = similarity; } collected_similar_images.get_mut(&parent_hash).unwrap().append(&mut vec_fe); diff --git a/czkawka_gui/Cargo.toml b/czkawka_gui/Cargo.toml index 9980822..64f4245 100644 --- a/czkawka_gui/Cargo.toml +++ b/czkawka_gui/Cargo.toml @@ -35,12 +35,12 @@ image = "0.24" regex = "1.8" # To get image_hasher types -image_hasher = "1.1" +image_hasher = "1.2" # Move files to trash trash = "3.0" -# For moving files(why std::fs doesn't have such features) +# For moving files(why std::fs doesn't have such features?) fs_extra = "1.3" # Language diff --git a/czkawka_gui/src/connect_things/connect_popovers_select.rs b/czkawka_gui/src/connect_things/connect_popovers_select.rs index 280bd08..4168180 100644 --- a/czkawka_gui/src/connect_things/connect_popovers_select.rs +++ b/czkawka_gui/src/connect_things/connect_popovers_select.rs @@ -311,7 +311,6 @@ fn popover_custom_select_unselect( { let check_button_path = check_button_path.clone(); let check_button_name = check_button_name.clone(); - let check_button_rust_regex = check_button_rust_regex.clone(); let entry_path = entry_path.clone(); let entry_name = entry_name.clone(); let entry_rust_regex = entry_rust_regex.clone();