diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index c9b971c..3f6471d 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -130,7 +130,7 @@ jobs: linux-gui: strategy: matrix: - toolchain: [ stable, 1.53.0 ] + toolchain: [ stable, 1.56.0 ] type: [ release ] runs-on: ubuntu-20.04 steps: diff --git a/Cargo.lock b/Cargo.lock index ce8ead6..6f4a585 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -25,9 +25,9 @@ dependencies = [ [[package]] name = "alsa" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75c4da790adcb2ce5e758c064b4f3ec17a30349f9961d3e5e6c9688b052a9e18" +checksum = "5915f52fe2cf65e83924d037b6c5290b7cee097c6b5c8700746e6168a343fd6b" dependencies = [ "alsa-sys", "bitflags", @@ -56,9 +56,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.52" +version = "1.0.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84450d0b4a8bd1ba4144ce8ce718fbc5d071358b1e5384bace6536b3d1f2d5b3" +checksum = "94a45b455c14666b85fc40a019e8ab9eb75e3a124e05494f5397122bc9eb06e0" [[package]] name = "arrayref" @@ -80,9 +80,9 @@ checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" [[package]] name = "atk" -version = "0.14.0" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a83b21d2aa75e464db56225e1bda2dd5993311ba1095acaa8fa03d1ae67026ba" +checksum = "2c3d816ce6f0e2909a96830d6911c2aff044370b1ef92d7f267b43bae5addedd" dependencies = [ "atk-sys", "bitflags", @@ -92,9 +92,9 @@ dependencies = [ [[package]] name = "atk-sys" -version = "0.14.0" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "badcf670157c84bb8b1cf6b5f70b650fed78da2033c9eed84c4e49b11cbe83ea" +checksum = "58aeb089fb698e06db8089971c7ee317ab9644bade33383f63631437b03aafb6" dependencies = [ "glib-sys", "gobject-sys", @@ -205,9 +205,9 @@ dependencies = [ [[package]] name = "blake3" -version = "1.3.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "882e99e4a0cb2ae6cb6e442102e8e6b7131718d94110e64c3e6a34ea9b106f37" +checksum = "a08e53fc5a564bb15bfe6fae56bd71522205f1f91893f9c0116edad6496c183f" dependencies = [ "arrayref", "arrayvec 0.7.2", @@ -288,9 +288,9 @@ dependencies = [ [[package]] name = "cairo-rs" -version = "0.14.9" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33b5725979db0c586d98abad2193cdb612dd40ef95cd26bd99851bf93b3cb482" +checksum = "b869e97a87170f96762f9f178eae8c461147e722ba21dd8814105bf5716bf14a" dependencies = [ "bitflags", "cairo-sys-rs", @@ -301,9 +301,9 @@ dependencies = [ [[package]] name = "cairo-sys-rs" -version = "0.14.9" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b448b876970834fda82ba3aeaccadbd760206b75388fc5c1b02f1e343b697570" +checksum = "3c55d429bef56ac9172d25fecb85dc8068307d17acd74b377866b7a1ef25d3c8" dependencies = [ "glib-sys", "libc", @@ -336,9 +336,9 @@ dependencies = [ [[package]] name = "cfg-expr" -version = "0.8.1" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b412e83326147c2bb881f8b40edfbf9905b9b8abaebd0e47ca190ba62fda8f0e" +checksum = "3431df59f28accaf4cb4eed4a9acc66bea3f3c3753aa6cdc2f024174ef232af7" dependencies = [ "smallvec", ] @@ -440,18 +440,18 @@ dependencies = [ [[package]] name = "coreaudio-sys" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b7e3347be6a09b46aba228d6608386739fb70beff4f61e07422da87b0bb31fa" +checksum = "ca4679a59dbd8c15f064c012dfe8c1163b9453224238b59bb9328c142b8b248b" dependencies = [ "bindgen", ] [[package]] name = "cpal" -version = "0.13.4" +version = "0.13.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98f45f0a21f617cd2c788889ef710b63f075c949259593ea09c826f1e47a2418" +checksum = "74117836a5124f3629e4b474eed03e479abaf98988b4bb317e29f08cfe0e4116" dependencies = [ "alsa", "core-foundation-sys", @@ -461,8 +461,8 @@ dependencies = [ "lazy_static", "libc", "mach", - "ndk 0.3.0", - "ndk-glue 0.3.0", + "ndk", + "ndk-glue", "nix", "oboe", "parking_lot", @@ -483,9 +483,9 @@ dependencies = [ [[package]] name = "crc32fast" -version = "1.3.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "738c290dfaea84fc1ca15ad9c168d083b05a714e1efddd8edaab678dc28d2836" +checksum = "a2209c310e29876f7f0b2721e7e26b84aff178aa3da5d091f9bfbf47669e60e3" dependencies = [ "cfg-if 1.0.0", ] @@ -570,7 +570,7 @@ dependencies = [ "bincode", "bitflags", "bk-tree", - "blake3 1.3.0", + "blake3 1.3.1", "crc32fast", "crossbeam-channel", "directories-next", @@ -622,38 +622,14 @@ dependencies = [ "winapi", ] -[[package]] -name = "darling" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d706e75d87e35569db781a9b5e2416cff1236a47ed380831f959382ccd5f858" -dependencies = [ - "darling_core 0.10.2", - "darling_macro 0.10.2", -] - [[package]] name = "darling" version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d0d720b8683f8dd83c65155f0530560cba68cd2bf395f6513a483caee57ff7f4" dependencies = [ - "darling_core 0.13.1", - "darling_macro 0.13.1", -] - -[[package]] -name = "darling_core" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0c960ae2da4de88a91b2d920c2a7233b400bc33cb28453a2987822d8392519b" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim 0.9.3", - "syn", + "darling_core", + "darling_macro", ] [[package]] @@ -670,24 +646,13 @@ dependencies = [ "syn", ] -[[package]] -name = "darling_macro" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72" -dependencies = [ - "darling_core 0.10.2", - "quote", - "syn", -] - [[package]] name = "darling_macro" version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72c41b3b7352feb3211a0d743dc5700a4e3b60f51bd2b368892d1e0f9a95f44b" dependencies = [ - "darling_core 0.13.1", + "darling_core", "quote", "syn", ] @@ -773,9 +738,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "779d043b6a0b90cc4c0ed7ee380a6504394cee7efd7db050e3774eee387324b2" +checksum = "c3fcf0cee53519c866c09b5de1f6c56ff9d647101f81c1964fa632e148896cdf" dependencies = [ "instant", ] @@ -971,9 +936,9 @@ dependencies = [ [[package]] name = "gdk" -version = "0.14.3" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9d749dcfc00d8de0d7c3a289e04a04293eb5ba3d8a4e64d64911d481fa9933b" +checksum = "614258e81ec35ed8770e64a0838f3a47f95b398bc51e724d3b3fa09c1ee0f8d5" dependencies = [ "bitflags", "cairo-rs", @@ -987,10 +952,11 @@ dependencies = [ [[package]] name = "gdk-pixbuf" -version = "0.14.0" +version = "0.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "534192cb8f01daeb8fab2c8d4baa8f9aae5b7a39130525779f5c2608e235b10f" +checksum = "73aa2f5de1b45710da90a55863276667dc3a3264aaf6a2aeace62bb015244d49" dependencies = [ + "bitflags", "gdk-pixbuf-sys", "gio", "glib", @@ -999,9 +965,9 @@ dependencies = [ [[package]] name = "gdk-pixbuf-sys" -version = "0.14.0" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f097c0704201fbc8f69c1762dc58c6947c8bb188b8ed0bc7e65259f1894fe590" +checksum = "413424d9818621fa3cfc8a3a915cdb89a7c3c507d56761b4ec83a9a98e587171" dependencies = [ "gio-sys", "glib-sys", @@ -1012,9 +978,9 @@ dependencies = [ [[package]] name = "gdk-sys" -version = "0.14.0" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e091b3d3d6696949ac3b3fb3c62090e5bfd7bd6850bef5c3c5ea701de1b1f1e" +checksum = "32e7a08c1e8f06f4177fb7e51a777b8c1689f743a7bc11ea91d44d2226073a88" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -1060,9 +1026,9 @@ dependencies = [ [[package]] name = "gio" -version = "0.14.8" +version = "0.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711c3632b3ebd095578a9c091418d10fed492da9443f58ebc8f45efbeb215cb0" +checksum = "56f906022fe89505b4e7b6c59a62d4ca3c090904f286cf61f1b245afcb20897d" dependencies = [ "bitflags", "futures-channel", @@ -1077,9 +1043,9 @@ dependencies = [ [[package]] name = "gio-sys" -version = "0.14.0" +version = "0.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0a41df66e57fcc287c4bcf74fc26b884f31901ea9792ec75607289b456f48fa" +checksum = "97225e1b9c7c48ed7fec4377fdc72702965bfbfd3a944b928ccbb5d8ed82ccc9" dependencies = [ "glib-sys", "gobject-sys", @@ -1090,9 +1056,9 @@ dependencies = [ [[package]] name = "glib" -version = "0.14.8" +version = "0.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c515f1e62bf151ef6635f528d05b02c11506de986e43b34a5c920ef0b3796a4" +checksum = "e385b6c17a1add7d0fbc64d38e2e742346d3e8b22e5fa3734e5cdca2be24028d" dependencies = [ "bitflags", "futures-channel", @@ -1105,17 +1071,18 @@ dependencies = [ "libc", "once_cell", "smallvec", + "thiserror", ] [[package]] name = "glib-macros" -version = "0.14.1" +version = "0.15.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aad66361f66796bfc73f530c51ef123970eb895ffba991a234fcf7bea89e518" +checksum = "e58b262ff65ef771003873cea8c10e0fe854f1c508d48d62a4111a1ff163f7d1" dependencies = [ "anyhow", - "heck", - "proc-macro-crate 1.1.0", + "heck 0.4.0", + "proc-macro-crate", "proc-macro-error", "proc-macro2", "quote", @@ -1124,9 +1091,9 @@ dependencies = [ [[package]] name = "glib-sys" -version = "0.14.0" +version = "0.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c1d60554a212445e2a858e42a0e48cece1bd57b311a19a9468f70376cf554ae" +checksum = "0c4f08dd67f74b223fedbbb30e73145b9acd444e67cc4d77d0598659b7eebe7e" dependencies = [ "libc", "system-deps", @@ -1140,9 +1107,9 @@ checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" [[package]] name = "gobject-sys" -version = "0.14.0" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa92cae29759dae34ab5921d73fff5ad54b3d794ab842c117e36cafc7994c3f5" +checksum = "6edb1f0b3e4c08e2a0a490d1082ba9e902cdff8ff07091e85c6caec60d17e2ab" dependencies = [ "glib-sys", "libc", @@ -1151,9 +1118,9 @@ dependencies = [ [[package]] name = "gtk" -version = "0.14.3" +version = "0.15.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eb51122dd3317e9327ec1e4faa151d1fa0d95664cd8fb8dcfacf4d4d29ac70c" +checksum = "c7978eaec05bea63947c801d29a21372f2ed39aec0bf56bf7725d3599094675e" dependencies = [ "atk", "bitflags", @@ -1174,9 +1141,9 @@ dependencies = [ [[package]] name = "gtk-sys" -version = "0.14.0" +version = "0.15.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c14c8d3da0545785a7c5a120345b3abb534010fb8ae0f2ef3f47c027fba303e" +checksum = "d5bc2f0587cba247f60246a0ca11fe25fb733eabc3de12d1965fc07efab87c84" dependencies = [ "atk-sys", "cairo-sys-rs", @@ -1192,13 +1159,12 @@ dependencies = [ [[package]] name = "gtk3-macros" -version = "0.14.0" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21de1da96dc117443fb03c2e270b2d34b7de98d0a79a19bbb689476173745b79" +checksum = "8c891188af69e77a1e8a0b1746fbd03b9b396e7d34d518c5331b15950259f541" dependencies = [ "anyhow", - "heck", - "proc-macro-crate 1.1.0", + "proc-macro-crate", "proc-macro-error", "proc-macro2", "quote", @@ -1226,6 +1192,12 @@ dependencies = [ "unicode-segmentation", ] +[[package]] +name = "heck" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" + [[package]] name = "hermit-abi" version = "0.1.19" @@ -1429,15 +1401,6 @@ dependencies = [ "unic-langid", ] -[[package]] -name = "itertools" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9a9d19fa1e79b6215ff29b9d6880b706147f16e9b1dbb1e4e5947b5b02bc5e3" -dependencies = [ - "either", -] - [[package]] name = "itoa" version = "1.0.1" @@ -1484,9 +1447,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.55" +version = "0.3.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cc9ffccd38c451a86bf13657df244e9c3f37493cce8e5e21e940963777acc84" +checksum = "a38fc24e30fd564ce974c02bf1d337caddff65be6cc4735a1f7eab22a7440f04" dependencies = [ "wasm-bindgen", ] @@ -1516,9 +1479,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.112" +version = "0.2.116" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b03d17f364a3a042d5e5d46b053bbbf82c92c9430c592dd4c064dc6ee997125" +checksum = "565dbd88872dbe4cc8a46e527f26483c1d1f7afa6b884a3bd6cd893d4f98da74" [[package]] name = "libloading" @@ -1551,9 +1514,9 @@ dependencies = [ [[package]] name = "lock_api" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712a4d093c9976e24e7dbca41db895dabcbac38eb5f4045393d17a95bdfb1109" +checksum = "88943dd7ef4a2e5a4bfa2753aaab3013e34ce2533d1996fb18ef591e315e2b3b" dependencies = [ "scopeguard", ] @@ -1675,18 +1638,6 @@ dependencies = [ "linked-hash-map", ] -[[package]] -name = "ndk" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8794322172319b972f528bf90c6b467be0079f1fa82780ffb431088e741a73ab" -dependencies = [ - "jni-sys", - "ndk-sys 0.2.2", - "num_enum", - "thiserror", -] - [[package]] name = "ndk" version = "0.6.0" @@ -1695,25 +1646,11 @@ checksum = "2032c77e030ddee34a6787a64166008da93f6a352b629261d0fee232b8742dd4" dependencies = [ "bitflags", "jni-sys", - "ndk-sys 0.3.0", + "ndk-sys", "num_enum", "thiserror", ] -[[package]] -name = "ndk-glue" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5caf0c24d51ac1c905c27d4eda4fa0635bbe0de596b8f79235e0b17a4d29385" -dependencies = [ - "lazy_static", - "libc", - "log", - "ndk 0.3.0", - "ndk-macro 0.2.0", - "ndk-sys 0.2.2", -] - [[package]] name = "ndk-glue" version = "0.6.0" @@ -1723,22 +1660,9 @@ dependencies = [ "lazy_static", "libc", "log", - "ndk 0.6.0", - "ndk-macro 0.3.0", - "ndk-sys 0.3.0", -] - -[[package]] -name = "ndk-macro" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05d1c6307dc424d0f65b9b06e94f88248e6305726b14729fd67a5e47b2dc481d" -dependencies = [ - "darling 0.10.2", - "proc-macro-crate 0.1.5", - "proc-macro2", - "quote", - "syn", + "ndk", + "ndk-macro", + "ndk-sys", ] [[package]] @@ -1747,19 +1671,13 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0df7ac00c4672f9d5aece54ee3347520b7e20f158656c7db2e6de01902eb7a6c" dependencies = [ - "darling 0.13.1", - "proc-macro-crate 1.1.0", + "darling", + "proc-macro-crate", "proc-macro2", "quote", "syn", ] -[[package]] -name = "ndk-sys" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1bcdd74c20ad5d95aacd60ef9ba40fdf77f767051040541df557b7a9b2a2121" - [[package]] name = "ndk-sys" version = "0.3.0" @@ -1771,14 +1689,15 @@ dependencies = [ [[package]] name = "nix" -version = "0.20.0" +version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa9b4819da1bc61c0ea48b63b7bc8604064dd43013e7cc325df098d49cd7c18a" +checksum = "9f866317acbd3a240710c63f065ffb1e4fd466259045ccb504130b7f668f35c6" dependencies = [ "bitflags", "cc", "cfg-if 1.0.0", "libc", + "memoffset", ] [[package]] @@ -1887,7 +1806,7 @@ version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0d992b768490d7fe0d8586d9b5745f6c49f557da6d81dc982b1d167ad4edbb21" dependencies = [ - "proc-macro-crate 1.1.0", + "proc-macro-crate", "proc-macro2", "quote", "syn", @@ -1929,8 +1848,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2463c8f2e19b4e0d0710a21f8e4011501ff28db1c95d7a5482a553b2100502d2" dependencies = [ "jni", - "ndk 0.6.0", - "ndk-glue 0.6.0", + "ndk", + "ndk-glue", "num-derive", "num-traits", "oboe-sys", @@ -1978,9 +1897,9 @@ dependencies = [ [[package]] name = "pango" -version = "0.14.8" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "546fd59801e5ca735af82839007edd226fe7d3bb06433ec48072be4439c28581" +checksum = "79211eff430c29cc38c69e0ab54bc78fa1568121ca9737707eee7f92a8417a94" dependencies = [ "bitflags", "glib", @@ -1991,9 +1910,9 @@ dependencies = [ [[package]] name = "pango-sys" -version = "0.14.0" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2367099ca5e761546ba1d501955079f097caa186bb53ce0f718dca99ac1942fe" +checksum = "7022c2fb88cd2d9d55e1a708a8c53a3ae8678234c4a54bf623400aeb7f31fac2" dependencies = [ "glib-sys", "gobject-sys", @@ -2092,15 +2011,6 @@ dependencies = [ "num-integer", ] -[[package]] -name = "proc-macro-crate" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785" -dependencies = [ - "toml", -] - [[package]] name = "proc-macro-crate" version = "1.1.0" @@ -2146,9 +2056,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47aa80447ce4daf1717500037052af176af5d38cc3e571d9ec1c7353fc10c87d" +checksum = "864d3e96a899863136fc6e99f3d7cae289dafe43bf2c5ac19b70df7210c0a145" dependencies = [ "proc-macro2", ] @@ -2438,18 +2348,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.133" +version = "1.0.136" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97565067517b60e2d1ea8b268e59ce036de907ac523ad83a0475da04e818989a" +checksum = "ce31e24b01e1e524df96f1c2fdd054405f8d7376249a5110886fb4b658484789" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.133" +version = "1.0.136" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed201699328568d8d08208fdd080e3ff594e6c422e438b6705905da01005d537" +checksum = "08597e7152fcd306f41838ed3e37be9eaeed2b61c42e2117266a554fab4662f9" dependencies = [ "proc-macro2", "quote", @@ -2458,9 +2368,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.75" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c059c05b48c5c0067d4b4b2b4f0732dd65feb52daf7e0ea09cd87e7dadc1af79" +checksum = "d23c1ba4cf0efd44be32017709280b32d1cea5c3f1275c3b6d9e8bc54f758085" dependencies = [ "itoa", "ryu", @@ -2539,12 +2449,6 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" -[[package]] -name = "strsim" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c" - [[package]] name = "strsim" version = "0.10.0" @@ -2568,31 +2472,13 @@ version = "0.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0" dependencies = [ - "heck", + "heck 0.3.3", "proc-macro-error", "proc-macro2", "quote", "syn", ] -[[package]] -name = "strum" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aaf86bbcfd1fa9670b7a129f64fc0c9fcbbfe4f1bc4210e9e98fe71ffc12cde2" - -[[package]] -name = "strum_macros" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d06aaeeee809dbc59eb4556183dd927df67db1540de5be8d3ec0b6636358a5ec" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "subtle" version = "2.4.1" @@ -2601,9 +2487,9 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "syn" -version = "1.0.85" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a684ac3dcd8913827e18cd09a68384ee66c1de24157e3c556c9ab16d85695fb7" +checksum = "8a65b3f4ffa0092e9887669db0eae07941f023991ab58ea44da8fe8e2d511c6b" dependencies = [ "proc-macro2", "quote", @@ -2612,18 +2498,13 @@ dependencies = [ [[package]] name = "system-deps" -version = "3.2.0" +version = "6.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "480c269f870722b3b08d2f13053ce0c2ab722839f472863c3e2d61ff3a1c2fa6" +checksum = "ad3a97fdef3daf935d929b3e97e5a6a680cd4622e40c2941ca0875d6566416f8" dependencies = [ - "anyhow", "cfg-expr", - "heck", - "itertools", + "heck 0.4.0", "pkg-config", - "strum", - "strum_macros", - "thiserror", "toml", "version-compare", ] @@ -2820,9 +2701,9 @@ checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" [[package]] name = "version-compare" -version = "0.0.11" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c18c859eead79d8b95d09e4678566e8d70105c4e7b251f707a03df32442661b" +checksum = "fe88247b92c1df6b6de80ddc290f3976dbdf2f5f5d3fd049a9fb598c6dd5ca73" [[package]] name = "version_check" @@ -2866,9 +2747,9 @@ checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" [[package]] name = "wasm-bindgen" -version = "0.2.78" +version = "0.2.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "632f73e236b219150ea279196e54e610f5dbafa5d61786303d4da54f84e47fce" +checksum = "25f1af7423d8588a3d840681122e72e6a24ddbcb3f0ec385cac0d12d24256c06" dependencies = [ "cfg-if 1.0.0", "wasm-bindgen-macro", @@ -2876,9 +2757,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.78" +version = "0.2.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a317bf8f9fba2476b4b2c85ef4c4af8ff39c3c7f0cdfeed4f82c34a880aa837b" +checksum = "8b21c0df030f5a177f3cba22e9bc4322695ec43e7257d865302900290bcdedca" dependencies = [ "bumpalo", "lazy_static", @@ -2891,9 +2772,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.78" +version = "0.2.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d56146e7c495528bf6587663bea13a8eb588d39b36b679d83972e1a2dbbdacf9" +checksum = "2f4203d69e40a52ee523b2529a773d5ffc1dc0071801c87b3d270b471b80ed01" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2901,9 +2782,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.78" +version = "0.2.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7803e0eea25835f8abdc585cd3021b3deb11543c6fe226dcd30b228857c5c5ab" +checksum = "bfa8a30d46208db204854cadbb5d4baf5fcf8071ba5bf48190c3e59937962ebc" dependencies = [ "proc-macro2", "quote", @@ -2914,15 +2795,15 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.78" +version = "0.2.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0237232789cf037d5480773fe568aac745bfe2afbc11a863e97901780a6b47cc" +checksum = "3d958d035c4438e28c70e4321a2911302f10135ce78a9c7834c0cab4123d06a2" [[package]] name = "web-sys" -version = "0.3.55" +version = "0.3.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38eb105f1c59d9eaa6b5cdc92b859d85b926e82cb2e0945cd0c9259faa6fe9fb" +checksum = "c060b319f29dd25724f09a2ba1418f142f539b2be99fbf4d2d5a8f7330afb8eb" dependencies = [ "js-sys", "wasm-bindgen", diff --git a/czkawka_cli/Cargo.toml b/czkawka_cli/Cargo.toml index 1dfc767..17b4160 100644 --- a/czkawka_cli/Cargo.toml +++ b/czkawka_cli/Cargo.toml @@ -2,7 +2,7 @@ name = "czkawka_cli" version = "4.0.0" authors = ["Rafał Mikrut "] -edition = "2018" +edition = "2021" description = "CLI frontend of Czkawka" license = "MIT" homepage = "https://github.com/qarmin/czkawka" diff --git a/czkawka_core/Cargo.toml b/czkawka_core/Cargo.toml index 9770bff..9bda505 100644 --- a/czkawka_core/Cargo.toml +++ b/czkawka_core/Cargo.toml @@ -2,7 +2,7 @@ name = "czkawka_core" version = "4.0.0" authors = ["Rafał Mikrut "] -edition = "2018" +edition = "2021" description = "Core of Czkawka app" license = "MIT" homepage = "https://github.com/qarmin/czkawka" diff --git a/czkawka_core/src/similar_images.rs b/czkawka_core/src/similar_images.rs index eaf6aa1..4fb5470 100644 --- a/czkawka_core/src/similar_images.rs +++ b/czkawka_core/src/similar_images.rs @@ -858,8 +858,7 @@ impl SimilarImages { panic!("Found Invalid entries"); } } - // self.similar_vectors = collected_similar_images.into_values().collect(); // TODO use this in Rust 1.54.0 - self.similar_vectors = collected_similar_images.values().cloned().collect(); // 1.53.0 version + self.similar_vectors = collected_similar_images.into_values().collect(); if self.exclude_images_with_same_size { let mut new_vector = Default::default(); diff --git a/czkawka_gui/Cargo.toml b/czkawka_gui/Cargo.toml index 5c9ba17..0262833 100644 --- a/czkawka_gui/Cargo.toml +++ b/czkawka_gui/Cargo.toml @@ -2,7 +2,7 @@ name = "czkawka_gui" version = "4.0.0" authors = ["Rafał Mikrut "] -edition = "2018" +edition = "2021" description = "GTK frontend of Czkawka" license = "MIT" homepage = "https://github.com/qarmin/czkawka" @@ -10,8 +10,8 @@ repository = "https://github.com/qarmin/czkawka" [dependencies] czkawka_core = { path = "../czkawka_core", version = "4.0.0"} -gdk = "0.14.3" -glib = "0.14.8" +gdk = "0.15.2" +glib = "0.15.3" humansize = "1.1.1" chrono = "0.4.19" @@ -53,7 +53,7 @@ once_cell = "1.9.0" winapi = { version = "0.3.9", features = ["combaseapi", "objbase", "shobjidl_core", "windef", "winerror", "wtypesbase", "winuser"] } [dependencies.gtk] -version = "0.14.3" +version = "0.15.3" default-features = false # just in case features = ["v3_24_9"] diff --git a/czkawka_gui/src/connect_things/connect_button_compare.rs b/czkawka_gui/src/connect_things/connect_button_compare.rs index b008e9b..8e0cd9d 100644 --- a/czkawka_gui/src/connect_things/connect_button_compare.rs +++ b/czkawka_gui/src/connect_things/connect_button_compare.rs @@ -132,13 +132,13 @@ pub fn connect_button_compare(gui_data: &GuiData) { let current_group = *shared_current_of_groups.borrow(); let group_number = *shared_numbers_of_groups.borrow(); - let tree_iter = move_iter(&model, shared_current_path.borrow().as_ref().unwrap(), nb_object.column_color.unwrap(), false); + let tree_path = move_iter(&model, shared_current_path.borrow().as_ref().unwrap(), nb_object.column_color.unwrap(), false); populate_groups_at_start( nb_object, &model, shared_current_path.clone(), - tree_iter, + tree_path, &image_compare_left, &image_compare_right, current_group, @@ -368,13 +368,13 @@ fn generate_cache_for_results(vector_with_path: Vec<(String, String, gtk::TreePa let big_path = get_image_path_temporary("roman", 1, "jpg"); let _ = big_thumbnail.save(&big_path); let big_img = gtk::Image::new(); - big_img.set_from_file(big_path); + big_img.set_from_file(Some(big_path)); let small_thumbnail = resize_dynamic_image_dimension(big_thumbnail, (SMALL_PREVIEW_SIZE, SMALL_PREVIEW_SIZE), &FilterType::Triangle); let small_path = get_image_path_temporary("roman", 1, "jpg"); let _ = small_thumbnail.save(&small_path); let small_img = gtk::Image::new(); - small_img.set_from_file(small_path); + small_img.set_from_file(Some(small_path)); cache_all_images.push((full_path, name, big_img, small_img, tree_path)); } @@ -430,6 +430,7 @@ fn get_all_path(model: &TreeModel, current_path: &TreePath, column_color: i32, c /// Moves iterator to previous/next header fn move_iter(model: >k::TreeModel, tree_path: &TreePath, column_color: i32, go_next: bool) -> TreePath { let tree_iter = model.iter(tree_path).unwrap(); + assert_eq!(model.value(&tree_iter, column_color).get::().unwrap(), HEADER_ROW_COLOR); if go_next { @@ -579,8 +580,8 @@ fn get_current_group_and_iter_from_selection(model: &TreeModel, selection: TreeS let selected_records = selection.selected_rows().0; let iter = model.iter_first().unwrap(); // Checking that treeview is not empty should be done before - header_clone = iter.clone(); // if nothing selected, use first group - possible_header = iter.clone(); // if nothing selected, use first group + header_clone = iter; // if nothing selected, use first group + possible_header = iter; // if nothing selected, use first group assert_eq!(model.value(&iter, column_color).get::().unwrap(), HEADER_ROW_COLOR); // First element should be header if !selected_records.is_empty() { @@ -592,11 +593,11 @@ fn get_current_group_and_iter_from_selection(model: &TreeModel, selection: TreeS if model.value(&iter, column_color).get::().unwrap() == HEADER_ROW_COLOR { possible_group += 1; - possible_header = iter.clone(); + possible_header = iter; } if model.path(&iter).unwrap() == first_selected_record { - header_clone = possible_header.clone(); + header_clone = possible_header; current_group = possible_group; } } diff --git a/czkawka_gui/src/connect_things/connect_popovers.rs b/czkawka_gui/src/connect_things/connect_popovers.rs index 3c04f0b..885e51b 100644 --- a/czkawka_gui/src/connect_things/connect_popovers.rs +++ b/czkawka_gui/src/connect_things/connect_popovers.rs @@ -112,7 +112,7 @@ fn popover_all_except_oldest_newest( } break; } - tree_iter_array.push(iter.clone()); + tree_iter_array.push(iter); let modification = model.value(&iter, column_modification_as_secs).get::().unwrap(); let current_file_length = model.value(&iter, column_file_name).get::().unwrap().len(); if except_oldest { @@ -187,7 +187,7 @@ fn popover_one_oldest_newest( } break; } - tree_iter_array.push(iter.clone()); + tree_iter_array.push(iter); let modification = model.value(&iter, column_modification_as_secs).get::().unwrap(); let current_file_length = model.value(&iter, column_file_name).get::().unwrap().len(); if check_oldest { @@ -454,10 +454,10 @@ fn popover_custom_select_unselect( if is_selected { number_of_already_selected_things += 1; } else { - vec_of_iters.push(iter.clone()); + vec_of_iters.push(iter); } } else { - vec_of_iters.push(iter.clone()); + vec_of_iters.push(iter); } } @@ -518,7 +518,7 @@ fn popover_all_except_biggest_smallest( } break; } - tree_iter_array.push(iter.clone()); + tree_iter_array.push(iter); let size_as_bytes = model.value(&iter, column_size_as_bytes).get::().unwrap(); // If dimension exists, then needs to be checked images diff --git a/czkawka_gui/src/connect_things/connect_settings.rs b/czkawka_gui/src/connect_things/connect_settings.rs index cfe4bd7..89a9521 100644 --- a/czkawka_gui/src/connect_things/connect_settings.rs +++ b/czkawka_gui/src/connect_things/connect_settings.rs @@ -2,8 +2,9 @@ use std::collections::BTreeMap; use std::default::Default; use directories_next::ProjectDirs; +use gtk::builders::LabelBuilder; use gtk::prelude::*; -use gtk::{LabelBuilder, ResponseType, Window}; +use gtk::{ResponseType, Window}; use image::imageops::FilterType; use img_hash::HashAlg; diff --git a/czkawka_gui/src/help_functions.rs b/czkawka_gui/src/help_functions.rs index c19ce66..515d74a 100644 --- a/czkawka_gui/src/help_functions.rs +++ b/czkawka_gui/src/help_functions.rs @@ -547,7 +547,7 @@ pub fn clean_invalid_headers(model: >k::ListStore, column_color: i32, column_p panic!("First deleted element, should be a header"); // First element should be header }; - next_iter = current_iter.clone(); + next_iter = current_iter; if !model.iter_next(&next_iter) { // There is only single header left (H1 -> END) -> (NOTHING) vec_tree_path_to_delete.push(model.path(¤t_iter).unwrap()); @@ -557,11 +557,11 @@ pub fn clean_invalid_headers(model: >k::ListStore, column_color: i32, column_p if model.value(&next_iter, column_color).get::().unwrap() == HEADER_ROW_COLOR { // There are two headers each others(we remove just first) -> (H1 -> H2) -> (H2) vec_tree_path_to_delete.push(model.path(¤t_iter).unwrap()); - current_iter = next_iter.clone(); + current_iter = next_iter; continue 'main; } - next_next_iter = next_iter.clone(); + next_next_iter = next_iter; if !model.iter_next(&next_next_iter) { // There is only one child of header left, so we remove it with header (H1 -> C1 -> END) -> (NOTHING) vec_tree_path_to_delete.push(model.path(¤t_iter).unwrap()); @@ -573,7 +573,7 @@ pub fn clean_invalid_headers(model: >k::ListStore, column_color: i32, column_p // One child between two headers, we can remove them (H1 -> C1 -> H2) -> (H2) vec_tree_path_to_delete.push(model.path(¤t_iter).unwrap()); vec_tree_path_to_delete.push(model.path(&next_iter).unwrap()); - current_iter = next_next_iter.clone(); + current_iter = next_next_iter; continue 'main; } @@ -584,7 +584,7 @@ pub fn clean_invalid_headers(model: >k::ListStore, column_color: i32, column_p } // Move to next header if model.value(&next_next_iter, column_color).get::().unwrap() == HEADER_ROW_COLOR { - current_iter = next_next_iter.clone(); + current_iter = next_next_iter; continue 'main; } } @@ -600,7 +600,7 @@ pub fn clean_invalid_headers(model: >k::ListStore, column_color: i32, column_p panic!("First deleted element, should be a header"); // First element should be header }; - next_iter = current_iter.clone(); + next_iter = current_iter; if !model.iter_next(&next_iter) { // There is only single header left (H1 -> END) -> (NOTHING) vec_tree_path_to_delete.push(model.path(¤t_iter).unwrap()); @@ -610,11 +610,11 @@ pub fn clean_invalid_headers(model: >k::ListStore, column_color: i32, column_p if model.value(&next_iter, column_color).get::().unwrap() == HEADER_ROW_COLOR { // There are two headers each others(we remove just first) -> (H1 -> H2) -> (H2) vec_tree_path_to_delete.push(model.path(¤t_iter).unwrap()); - current_iter = next_iter.clone(); + current_iter = next_iter; continue 'reference; } - next_next_iter = next_iter.clone(); + next_next_iter = next_iter; if !model.iter_next(&next_next_iter) { // There is only one child of header left, so we remove it with header (H1 -> C1 -> END) -> (NOTHING) break 'reference; @@ -622,7 +622,7 @@ pub fn clean_invalid_headers(model: >k::ListStore, column_color: i32, column_p if model.value(&next_next_iter, column_color).get::().unwrap() == HEADER_ROW_COLOR { // One child between two headers, we can remove them (H1 -> C1 -> H2) -> (H2) - current_iter = next_next_iter.clone(); + current_iter = next_next_iter; continue 'reference; } @@ -633,7 +633,7 @@ pub fn clean_invalid_headers(model: >k::ListStore, column_color: i32, column_p } // Move to next header if model.value(&next_next_iter, column_color).get::().unwrap() == HEADER_ROW_COLOR { - current_iter = next_next_iter.clone(); + current_iter = next_next_iter; continue 'reference; } } diff --git a/czkawka_gui/src/initialize_gui.rs b/czkawka_gui/src/initialize_gui.rs index 7a8f0cc..09e8e1a 100644 --- a/czkawka_gui/src/initialize_gui.rs +++ b/czkawka_gui/src/initialize_gui.rs @@ -783,7 +783,7 @@ fn show_preview( break 'dir; } let string_dir = file_dir.to_string_lossy().to_string(); - image_preview.set_from_file(string_dir); + image_preview.set_from_file(Some(string_dir)); { let mut preview_path = preview_path.borrow_mut(); diff --git a/czkawka_gui/src/opening_selecting_records.rs b/czkawka_gui/src/opening_selecting_records.rs index c0e3b3d..c66fb58 100644 --- a/czkawka_gui/src/opening_selecting_records.rs +++ b/czkawka_gui/src/opening_selecting_records.rs @@ -174,7 +174,7 @@ fn reverse_selection(tree_view: >k::TreeView, column_color: i32, column_select // let current_value = model.value(¤t_iter, column_selection).get::().unwrap(); // model.set_value(¤t_iter, column_selection as u32, &(!current_value).to_value()); - let to_upper_iter = current_iter.clone(); + let to_upper_iter = current_iter; loop { if !model.iter_previous(&to_upper_iter) { break; diff --git a/instructions/Compilation.md b/instructions/Compilation.md index 290ca96..1d7b22d 100644 --- a/instructions/Compilation.md +++ b/instructions/Compilation.md @@ -9,7 +9,7 @@ FFmpeg is not included here, because is not needed to build because it is dynami | Program | Min | What for | |---------|------|-------------------------------------------------------------------------------| -| Rust | 1.53 | Czkawka, aims to support the latest available version of Rust on Ubuntu 20.04 | +| Rust | 1.56 | Czkawka, aims to support the latest available version of Rust on Ubuntu 20.04 | | GTK | 3.24 | Only for the `GTK` backend | #### Debian / Ubuntu