From e467fc73665dac68420214c397817bb06236da9e Mon Sep 17 00:00:00 2001 From: w1nst0n Date: Sat, 18 Mar 2023 19:55:49 +0100 Subject: [PATCH] chore: update dependencies catch up with all the breaking changes of Iced main branch --- Cargo.lock | 415 ++++++++++++++--------------- src/gui/mod.rs | 2 +- src/gui/style.rs | 10 +- src/gui/views/about.rs | 9 +- src/gui/views/list.rs | 14 +- src/gui/views/settings.rs | 8 +- src/gui/widgets/navigation_menu.rs | 2 +- src/gui/widgets/package_row.rs | 6 +- 8 files changed, 220 insertions(+), 246 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f14a328..e0cd7cc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -147,9 +147,9 @@ checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" [[package]] name = "bytemuck" -version = "1.13.0" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c041d3eab048880cb0b86b256447da3f18859a163c3b8d8893f4e6368abe6393" +checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea" dependencies = [ "bytemuck_derive", ] @@ -162,7 +162,7 @@ checksum = "1aca418a974d83d40a0c1f0c5cba6ff4bc28d8df099109ca459a2118d40b6322" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -213,9 +213,9 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.23" +version = "0.4.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f" +checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b" dependencies = [ "iana-time-zone", "js-sys", @@ -294,9 +294,9 @@ dependencies = [ [[package]] name = "cocoa-foundation" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ade49b65d560ca58c403a479bb396592b155c0185eada742ee323d1d68d6318" +checksum = "931d3837c286f56e3c58423ce4eba12d08db2374461a785c86f672b08b5650d6" dependencies = [ "bitflags", "block", @@ -398,9 +398,9 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521" +checksum = "cf2b3e8478797446514c91ef04bafcb59faba183e621ad488df88983cc14128c" dependencies = [ "cfg-if", "crossbeam-utils", @@ -408,9 +408,9 @@ dependencies = [ [[package]] name = "crossbeam-deque" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc" +checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" dependencies = [ "cfg-if", "crossbeam-epoch", @@ -419,22 +419,22 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.13" +version = "0.9.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01a9af1f4c2ef74bb8aa1f7e19706bc72d03598c8a570bb5de72243c7a9d9d5a" +checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695" dependencies = [ "autocfg", "cfg-if", "crossbeam-utils", - "memoffset 0.7.1", + "memoffset 0.8.0", "scopeguard", ] [[package]] name = "crossbeam-utils" -version = "0.8.14" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f" +checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" dependencies = [ "cfg-if", ] @@ -470,9 +470,9 @@ checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35" [[package]] name = "cxx" -version = "1.0.89" +version = "1.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc831ee6a32dd495436e317595e639a587aa9907bef96fe6e6abc290ab6204e9" +checksum = "a9c00419335c41018365ddf7e4d5f1c12ee3659ddcf3e01974650ba1de73d038" dependencies = [ "cc", "cxxbridge-flags", @@ -482,9 +482,9 @@ dependencies = [ [[package]] name = "cxx-build" -version = "1.0.89" +version = "1.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94331d54f1b1a8895cd81049f7eaaaef9d05a7dcb4d1fd08bf3ff0806246789d" +checksum = "fb8307ad413a98fff033c8545ecf133e3257747b3bae935e7602aab8aa92d4ca" dependencies = [ "cc", "codespan-reporting", @@ -492,24 +492,24 @@ dependencies = [ "proc-macro2", "quote", "scratch", - "syn", + "syn 2.0.0", ] [[package]] name = "cxxbridge-flags" -version = "1.0.89" +version = "1.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48dcd35ba14ca9b40d6e4b4b39961f23d835dbb8eed74565ded361d93e1feb8a" +checksum = "edc52e2eb08915cb12596d29d55f0b5384f00d697a646dbd269b6ecb0fbd9d31" [[package]] name = "cxxbridge-macro" -version = "1.0.89" +version = "1.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81bbeb29798b407ccd82a3324ade1a7286e0d29851475990b612670f6f5124d2" +checksum = "631569015d0d8d54e6c241733f944042623ab6df7bc3be7466874b05fcdb1c5f" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.0", ] [[package]] @@ -544,7 +544,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn", + "syn 1.0.109", ] [[package]] @@ -555,7 +555,7 @@ checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" dependencies = [ "darling_core", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -648,7 +648,7 @@ checksum = "0f2f4de457d974f548d2c2a16f709ebd81013579e543bd1a9b19ced88132c2cf" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -692,14 +692,14 @@ dependencies = [ [[package]] name = "filetime" -version = "0.2.19" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e884668cd0c7480504233e951174ddc3b382f7c2666e3b7310b5c4e7b0c37f9" +checksum = "8a3de6e8d11b22ff9edc6d916f890800597d60f8b2da1caf2955c274638d6412" dependencies = [ "cfg-if", "libc", "redox_syscall", - "windows-sys 0.42.0", + "windows-sys 0.45.0", ] [[package]] @@ -754,7 +754,7 @@ checksum = "c8469d0d40519bc608ec6863f1cc88f3f1deee15913f2f3b3e573d81ed38cccc" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -802,9 +802,9 @@ dependencies = [ [[package]] name = "futures" -version = "0.3.26" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13e2792b0ff0340399d58445b88fd9770e3489eff258a4cbc1523418f12abf84" +checksum = "531ac96c6ff5fd7c62263c5e3c67a603af4fcaee2e1a0ae5565ba3a11e69e549" dependencies = [ "futures-channel", "futures-core", @@ -817,9 +817,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.26" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e5317663a9089767a1ec00a487df42e0ca174b61b4483213ac24448e4664df5" +checksum = "164713a5a0dcc3e7b4b1ed7d3b433cabc18025386f9339346e8daf15963cf7ac" dependencies = [ "futures-core", "futures-sink", @@ -827,15 +827,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.26" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec90ff4d0fe1f57d600049061dc6bb68ed03c7d2fbd697274c41805dcb3f8608" +checksum = "86d7a0c1aa76363dac491de0ee99faf6941128376f1cf96f07db7603b7de69dd" [[package]] name = "futures-executor" -version = "0.3.26" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8de0a35a6ab97ec8869e32a2473f4b1324459e14c29275d14b10cb1fd19b50e" +checksum = "1997dd9df74cdac935c76252744c1ed5794fac083242ea4fe77ef3ed60ba0f83" dependencies = [ "futures-core", "futures-task", @@ -845,38 +845,38 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.26" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfb8371b6fb2aeb2d280374607aeabfc99d95c72edfe51692e42d3d7f0d08531" +checksum = "89d422fa3cbe3b40dca574ab087abb5bc98258ea57eea3fd6f1fa7162c778b91" [[package]] name = "futures-macro" -version = "0.3.26" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95a73af87da33b5acf53acfebdc339fe592ecf5357ac7c0a7734ab9d8c876a70" +checksum = "3eb14ed937631bd8b8b8977f2c198443447a8355b6e3ca599f38c975e5a963b6" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "futures-sink" -version = "0.3.26" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f310820bb3e8cfd46c80db4d7fb8353e15dfff853a127158425f31e0be6c8364" +checksum = "ec93083a4aecafb2a80a885c9de1f0ccae9dbd32c2bb54b0c3a65690e0b8d2f2" [[package]] name = "futures-task" -version = "0.3.26" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf79a1bf610b10f42aea489289c5a2c478a786509693b80cd39c44ccd936366" +checksum = "fd65540d33b37b16542a0438c12e6aeead10d4ac5d05bd3f805b8f35ab592879" [[package]] name = "futures-util" -version = "0.3.26" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c1d6de3acfef38d2be4b1f543f553131788603495be83da675e180c8d6b7bd1" +checksum = "3ef6b17e481503ec85211fed8f39d1970f128935ca1f814cd32ac4a6842e84ab" dependencies = [ "futures-channel", "futures-core", @@ -979,7 +979,7 @@ dependencies = [ "once_cell", "osmesa-sys", "parking_lot 0.12.1", - "raw-window-handle 0.5.0", + "raw-window-handle 0.5.1", "wayland-client", "wayland-egl", "winapi", @@ -1023,13 +1023,12 @@ dependencies = [ [[package]] name = "glyph_brush" -version = "0.7.5" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac02497410cdb5062cc056a33f2e1e19ff69fbf26a4be9a02bf29d6e17ea105b" +checksum = "4edefd123f28a0b1d41ec4a489c2b43020b369180800977801611084f342978d" dependencies = [ "glyph_brush_draw_cache", "glyph_brush_layout", - "log", "ordered-float", "rustc-hash", "twox-hash", @@ -1168,8 +1167,8 @@ dependencies = [ [[package]] name = "iced" -version = "0.7.0" -source = "git+https://github.com/iced-rs/iced.git#98a717383acf71d7939d7cc90d350743487f0380" +version = "0.8.0" +source = "git+https://github.com/iced-rs/iced.git#d7fffaa801423ae989fa7693f5b1cb424194e1ff" dependencies = [ "iced_core", "iced_futures", @@ -1184,8 +1183,8 @@ dependencies = [ [[package]] name = "iced_core" -version = "0.7.0" -source = "git+https://github.com/iced-rs/iced.git#98a717383acf71d7939d7cc90d350743487f0380" +version = "0.8.1" +source = "git+https://github.com/iced-rs/iced.git#d7fffaa801423ae989fa7693f5b1cb424194e1ff" dependencies = [ "bitflags", "instant", @@ -1194,8 +1193,8 @@ dependencies = [ [[package]] name = "iced_futures" -version = "0.5.1" -source = "git+https://github.com/iced-rs/iced.git#98a717383acf71d7939d7cc90d350743487f0380" +version = "0.6.0" +source = "git+https://github.com/iced-rs/iced.git#d7fffaa801423ae989fa7693f5b1cb424194e1ff" dependencies = [ "futures", "log", @@ -1205,8 +1204,8 @@ dependencies = [ [[package]] name = "iced_glow" -version = "0.6.0" -source = "git+https://github.com/iced-rs/iced.git#98a717383acf71d7939d7cc90d350743487f0380" +version = "0.7.0" +source = "git+https://github.com/iced-rs/iced.git#d7fffaa801423ae989fa7693f5b1cb424194e1ff" dependencies = [ "bytemuck", "euclid", @@ -1220,8 +1219,8 @@ dependencies = [ [[package]] name = "iced_glutin" -version = "0.6.0" -source = "git+https://github.com/iced-rs/iced.git#98a717383acf71d7939d7cc90d350743487f0380" +version = "0.7.0" +source = "git+https://github.com/iced-rs/iced.git#d7fffaa801423ae989fa7693f5b1cb424194e1ff" dependencies = [ "glutin", "iced_graphics", @@ -1232,8 +1231,8 @@ dependencies = [ [[package]] name = "iced_graphics" -version = "0.6.0" -source = "git+https://github.com/iced-rs/iced.git#98a717383acf71d7939d7cc90d350743487f0380" +version = "0.7.0" +source = "git+https://github.com/iced-rs/iced.git#d7fffaa801423ae989fa7693f5b1cb424194e1ff" dependencies = [ "bitflags", "bytemuck", @@ -1241,14 +1240,14 @@ dependencies = [ "iced_native", "iced_style", "log", - "raw-window-handle 0.5.0", + "raw-window-handle 0.5.1", "thiserror", ] [[package]] name = "iced_native" -version = "0.8.0" -source = "git+https://github.com/iced-rs/iced.git#98a717383acf71d7939d7cc90d350743487f0380" +version = "0.9.1" +source = "git+https://github.com/iced-rs/iced.git#d7fffaa801423ae989fa7693f5b1cb424194e1ff" dependencies = [ "iced_core", "iced_futures", @@ -1260,8 +1259,8 @@ dependencies = [ [[package]] name = "iced_style" -version = "0.6.0" -source = "git+https://github.com/iced-rs/iced.git#98a717383acf71d7939d7cc90d350743487f0380" +version = "0.7.0" +source = "git+https://github.com/iced-rs/iced.git#d7fffaa801423ae989fa7693f5b1cb424194e1ff" dependencies = [ "iced_core", "once_cell", @@ -1270,8 +1269,8 @@ dependencies = [ [[package]] name = "iced_wgpu" -version = "0.8.0" -source = "git+https://github.com/iced-rs/iced.git#98a717383acf71d7939d7cc90d350743487f0380" +version = "0.9.0" +source = "git+https://github.com/iced-rs/iced.git#d7fffaa801423ae989fa7693f5b1cb424194e1ff" dependencies = [ "bitflags", "bytemuck", @@ -1283,15 +1282,15 @@ dependencies = [ "iced_graphics", "iced_native", "log", - "raw-window-handle 0.5.0", + "raw-window-handle 0.5.1", "wgpu", "wgpu_glyph", ] [[package]] name = "iced_winit" -version = "0.7.0" -source = "git+https://github.com/iced-rs/iced.git#98a717383acf71d7939d7cc90d350743487f0380" +version = "0.8.0" +source = "git+https://github.com/iced-rs/iced.git#d7fffaa801423ae989fa7693f5b1cb424194e1ff" dependencies = [ "iced_futures", "iced_graphics", @@ -1344,9 +1343,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.5" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440" +checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" [[package]] name = "jni-sys" @@ -1388,9 +1387,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.139" +version = "0.2.140" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" +checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c" [[package]] name = "libloading" @@ -1453,9 +1452,9 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "memmap2" -version = "0.5.8" +version = "0.5.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b182332558b18d807c4ce1ca8ca983b34c3ee32765e47b3f0f69b90355cc1dc" +checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327" dependencies = [ "libc", ] @@ -1471,9 +1470,9 @@ dependencies = [ [[package]] name = "memoffset" -version = "0.7.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" dependencies = [ "autocfg", ] @@ -1509,14 +1508,14 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de" +checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" dependencies = [ "libc", "log", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.42.0", + "windows-sys 0.45.0", ] [[package]] @@ -1549,7 +1548,7 @@ dependencies = [ "jni-sys", "ndk-sys", "num_enum", - "raw-window-handle 0.5.0", + "raw-window-handle 0.5.1", "thiserror", ] @@ -1585,7 +1584,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -1645,15 +1644,6 @@ dependencies = [ "minimal-lexical", ] -[[package]] -name = "nom8" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae01545c9c7fc4486ab7debaf2aad7003ac19431791868fb2e8066df97fad2f8" -dependencies = [ - "memchr", -] - [[package]] name = "num-integer" version = "0.1.45" @@ -1685,23 +1675,23 @@ dependencies = [ [[package]] name = "num_enum" -version = "0.5.9" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d829733185c1ca374f17e52b762f24f535ec625d2cc1f070e34c8a9068f341b" +checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" dependencies = [ "num_enum_derive", ] [[package]] name = "num_enum_derive" -version = "0.5.9" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2be1598bf1c313dcdd12092e3f1920f463462525a21b7b4e11b4168353d0123e" +checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -1745,9 +1735,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.17.0" +version = "1.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66" +checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" [[package]] name = "ordered-float" @@ -1797,7 +1787,7 @@ dependencies = [ "find-crate", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -1884,7 +1874,7 @@ dependencies = [ "phf_shared", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -1934,19 +1924,19 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "proc-macro-crate" -version = "1.3.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66618389e4ec1c7afe67d51a9bf34ff9236480f8d51e7489b7d5ab0303c13f34" +checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" dependencies = [ "once_cell", - "toml_edit 0.18.1", + "toml_edit", ] [[package]] name = "proc-macro2" -version = "1.0.50" +version = "1.0.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ef7d57beacfaf2d8aee5937dab7b7f28de3cb8b1828479bb5de2a7106f2bae2" +checksum = "1d0e1ae9e836cc3beddd63db0df682593d7e2d3d891ae8c9083d2113e1744224" dependencies = [ "unicode-ident", ] @@ -1959,9 +1949,9 @@ checksum = "74605f360ce573babfe43964cbe520294dcb081afbf8c108fc6e23036b4da2df" [[package]] name = "quote" -version = "1.0.23" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" +checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" dependencies = [ "proc-macro2", ] @@ -1998,9 +1988,9 @@ dependencies = [ [[package]] name = "range-alloc" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63e935c45e09cc6dcf00d2f0b2d630a58f4095320223d47fc68918722f0538b6" +checksum = "9c8a99fddc9f0ba0a85884b8d14e3592853e787d581ca1816c91349b10e4eeab" [[package]] name = "raw-window-handle" @@ -2023,18 +2013,15 @@ dependencies = [ [[package]] name = "raw-window-handle" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed7e3d950b66e19e0c372f3fa3fbbcf85b1746b571f74e0c2af6042a5c93420a" -dependencies = [ - "cty", -] +checksum = "4f851a03551ceefd30132e447f07f96cb7011d6b658374f3aed847333adb5559" [[package]] name = "rayon" -version = "1.6.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db3a213adf02b3bcfd2d3846bb41cb22857d131789e01df434fb7e7bc0759b7" +checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" dependencies = [ "either", "rayon-core", @@ -2042,9 +2029,9 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.10.2" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "356a0625f1954f730c0201cdab48611198dc6ce21f4acff55089b5a78e6e835b" +checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" dependencies = [ "crossbeam-channel", "crossbeam-deque", @@ -2139,9 +2126,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde" +checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" [[package]] name = "safe_arch" @@ -2166,9 +2153,9 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] name = "scratch" -version = "1.0.3" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddccb15bcce173023b3fedd9436f882a0739b8dfb45e4f6b6002bee5929f61b2" +checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1" [[package]] name = "sct" @@ -2194,29 +2181,29 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.152" +version = "1.0.157" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" +checksum = "707de5fcf5df2b5788fca98dd7eab490bc2fd9b7ef1404defc462833b83f25ca" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.152" +version = "1.0.157" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" +checksum = "78997f4555c22a7971214540c4a661291970619afd56de19f77e0de86296e1e5" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.0", ] [[package]] name = "serde_json" -version = "1.0.91" +version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883" +checksum = "1c533a59c9d8a93a09c6ab31f0fd5e5f4dd1b8fc9434804029839884765d04ea" dependencies = [ "itoa", "ryu", @@ -2271,9 +2258,9 @@ checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" [[package]] name = "slab" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" +checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" dependencies = [ "autocfg", ] @@ -2369,7 +2356,7 @@ dependencies = [ "memchr", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -2392,9 +2379,20 @@ checksum = "8fb1df15f412ee2e9dfc1c504260fa695c1c3f10fe9f4a6ee2d2184d7d6450e2" [[package]] name = "syn" -version = "1.0.107" +version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cff13bb1732bccfe3b246f3fdb09edfd51c01d6f5299b7ccd9457c2e4e37774" dependencies = [ "proc-macro2", "quote", @@ -2423,22 +2421,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.38" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0" +checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.38" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f" +checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.0", ] [[package]] @@ -2503,22 +2501,16 @@ dependencies = [ [[package]] name = "toml" -version = "0.7.1" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "772c1426ab886e7362aedf4abc9c0d1348a979517efedfc25862944d10137af0" +checksum = "b403acf6f2bb0859c93c7f0d967cb4a75a7ac552100f9322faf64dc047669b21" dependencies = [ "serde", "serde_spanned", - "toml_datetime 0.6.1", - "toml_edit 0.19.1", + "toml_datetime", + "toml_edit", ] -[[package]] -name = "toml_datetime" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4553f467ac8e3d374bc9a177a26801e5d0f9b211aa1673fb137a403afd1c9cf5" - [[package]] name = "toml_datetime" version = "0.6.1" @@ -2530,26 +2522,15 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.18.1" +version = "0.19.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56c59d8dd7d0dcbc6428bf7aa2f0e823e26e43b3c9aca15bbc9475d23e5fa12b" +checksum = "dc18466501acd8ac6a3f615dd29a3438f8ca6bb3b19537138b3106e575621274" dependencies = [ "indexmap", - "nom8", - "toml_datetime 0.5.1", -] - -[[package]] -name = "toml_edit" -version = "0.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90a238ee2e6ede22fb95350acc78e21dc40da00bb66c0334bde83de4ed89424e" -dependencies = [ - "indexmap", - "nom8", "serde", "serde_spanned", - "toml_datetime 0.6.1", + "toml_datetime", + "winnow", ] [[package]] @@ -2586,21 +2567,21 @@ dependencies = [ "serde_json", "static_init", "tar", - "toml 0.7.1", + "toml 0.7.3", "ureq", ] [[package]] name = "unicode-bidi" -version = "0.3.10" +version = "0.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54675592c1dbefd78cbd98db9bacd89886e1ca50692a0692baefffdeb92dd58" +checksum = "7d502c968c6a838ead8e69b2ee18ec708802f99db92a0d156705ec9ef801993b" [[package]] name = "unicode-ident" -version = "1.0.6" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" +checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" [[package]] name = "unicode-normalization" @@ -2709,7 +2690,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn", + "syn 1.0.109", "wasm-bindgen-shared", ] @@ -2743,7 +2724,7 @@ checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -2892,7 +2873,7 @@ dependencies = [ "log", "naga", "parking_lot 0.12.1", - "raw-window-handle 0.5.0", + "raw-window-handle 0.5.1", "smallvec", "static_assertions", "wasm-bindgen", @@ -2919,7 +2900,7 @@ dependencies = [ "naga", "parking_lot 0.12.1", "profiling", - "raw-window-handle 0.5.0", + "raw-window-handle 0.5.1", "smallvec", "thiserror", "web-sys", @@ -2956,7 +2937,7 @@ dependencies = [ "parking_lot 0.12.1", "profiling", "range-alloc", - "raw-window-handle 0.5.0", + "raw-window-handle 0.5.1", "renderdoc-sys", "smallvec", "thiserror", @@ -3054,21 +3035,6 @@ dependencies = [ "windows_x86_64_msvc 0.36.1", ] -[[package]] -name = "windows-sys" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" -dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc 0.42.1", - "windows_i686_gnu 0.42.1", - "windows_i686_msvc 0.42.1", - "windows_x86_64_gnu 0.42.1", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc 0.42.1", -] - [[package]] name = "windows-sys" version = "0.45.0" @@ -3080,24 +3046,24 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" dependencies = [ "windows_aarch64_gnullvm", - "windows_aarch64_msvc 0.42.1", - "windows_i686_gnu 0.42.1", - "windows_i686_msvc 0.42.1", - "windows_x86_64_gnu 0.42.1", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", "windows_x86_64_gnullvm", - "windows_x86_64_msvc 0.42.1", + "windows_x86_64_msvc 0.42.2", ] [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" [[package]] name = "windows_aarch64_msvc" @@ -3107,9 +3073,9 @@ checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" [[package]] name = "windows_aarch64_msvc" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" [[package]] name = "windows_i686_gnu" @@ -3119,9 +3085,9 @@ checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" [[package]] name = "windows_i686_gnu" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" [[package]] name = "windows_i686_msvc" @@ -3131,9 +3097,9 @@ checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" [[package]] name = "windows_i686_msvc" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" [[package]] name = "windows_x86_64_gnu" @@ -3143,15 +3109,15 @@ checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" [[package]] name = "windows_x86_64_gnu" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" [[package]] name = "windows_x86_64_msvc" @@ -3161,9 +3127,9 @@ checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" [[package]] name = "windows_x86_64_msvc" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" [[package]] name = "winit" @@ -3186,7 +3152,7 @@ dependencies = [ "parking_lot 0.12.1", "percent-encoding", "raw-window-handle 0.4.3", - "raw-window-handle 0.5.0", + "raw-window-handle 0.5.1", "sctk-adwaita", "smithay-client-toolkit", "wasm-bindgen", @@ -3197,6 +3163,15 @@ dependencies = [ "x11-dl", ] +[[package]] +name = "winnow" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23d020b441f92996c80d94ae9166e8501e59c7bb56121189dc9eab3bd8216966" +dependencies = [ + "memchr", +] + [[package]] name = "wio" version = "0.2.2" diff --git a/src/gui/mod.rs b/src/gui/mod.rs index 91ec30a..6140740 100644 --- a/src/gui/mod.rs +++ b/src/gui/mod.rs @@ -360,7 +360,7 @@ impl UadGui { decorations: true, ..iced::window::Settings::default() }, - default_text_size: 17, + default_text_size: 17.0, ..Settings::default() }) } diff --git a/src/gui/style.rs b/src/gui/style.rs index ef06e19..d007047 100644 --- a/src/gui/style.rs +++ b/src/gui/style.rs @@ -244,7 +244,7 @@ impl checkbox::StyleSheet for Theme { match style { CheckBox::PackageEnabled => checkbox::Appearance { background: Background::Color(self.palette().base.background), - checkmark_color: self.palette().bright.primary, + icon_color: self.palette().bright.primary, border_radius: 5.0, border_width: 1.0, border_color: self.palette().base.background, @@ -255,7 +255,7 @@ impl checkbox::StyleSheet for Theme { a: 0.55, ..self.palette().base.background }), - checkmark_color: self.palette().bright.primary, + icon_color: self.palette().bright.primary, border_radius: 5.0, border_width: 1.0, border_color: self.palette().normal.primary, @@ -263,7 +263,7 @@ impl checkbox::StyleSheet for Theme { }, CheckBox::SettingsEnabled => checkbox::Appearance { background: Background::Color(self.palette().base.background), - checkmark_color: self.palette().bright.primary, + icon_color: self.palette().bright.primary, border_radius: 5.0, border_width: 1.0, border_color: self.palette().bright.primary, @@ -271,7 +271,7 @@ impl checkbox::StyleSheet for Theme { }, CheckBox::SettingsDisabled => checkbox::Appearance { background: Background::Color(self.palette().base.foreground), - checkmark_color: self.palette().bright.primary, + icon_color: self.palette().bright.primary, border_radius: 5.0, border_width: 1.0, border_color: self.palette().normal.primary, @@ -283,7 +283,7 @@ impl checkbox::StyleSheet for Theme { fn hovered(&self, style: &Self::Style, is_checked: bool) -> checkbox::Appearance { let from_appearance = || checkbox::Appearance { background: Background::Color(self.palette().base.foreground), - checkmark_color: self.palette().bright.primary, + icon_color: self.palette().bright.primary, border_radius: 5.0, border_width: 2.0, border_color: self.palette().bright.primary, diff --git a/src/gui/views/about.rs b/src/gui/views/about.rs index 3cc1421..b685d0b 100644 --- a/src/gui/views/about.rs +++ b/src/gui/views/about.rs @@ -38,8 +38,7 @@ impl About { .style(style::Container::Frame); let date = last_modified_date(CACHE_DIR.join("uad_lists.json")); - let uad_list_text = - text(format!("Documentation: v{}", date.format("%Y%m%d"))).width(Length::Units(250)); + let uad_list_text = text(format!("Documentation: v{}", date.format("%Y%m%d"))).width(250); let last_update_text = text(update_state.uad_list.to_string()); let uad_lists_btn = button("Update") .on_press(Message::UpdateUadLists) @@ -54,7 +53,7 @@ impl About { #[cfg(feature = "self-update")] let uad_version_text = - text(format!("UAD version: v{}", env!("CARGO_PKG_VERSION"))).width(Length::Units(250)); + text(format!("UAD version: v{}", env!("CARGO_PKG_VERSION"))).width(250); #[cfg(feature = "self-update")] let self_update_text = match &update_state.self_update.latest_release { @@ -81,12 +80,12 @@ impl About { let self_update_row = row![uad_version_text, self_update_btn, last_self_update_text,] .align_items(Alignment::Center) .spacing(10) - .width(iced::Length::Units(550)); + .width(550); let uad_list_row = row![uad_list_text, uad_lists_btn, last_update_text,] .align_items(Alignment::Center) .spacing(10) - .width(iced::Length::Units(550)); + .width(550); #[cfg(feature = "self-update")] let update_column = column![uad_list_row, self_update_row] diff --git a/src/gui/views/list.rs b/src/gui/views/list.rs index b8522d8..ff03a53 100644 --- a/src/gui/views/list.rs +++ b/src/gui/views/list.rs @@ -317,7 +317,7 @@ impl List { self.selected_user, Message::UserSelected, ) - .width(Length::Units(85)); + .width(85); let divider = Space::new(Length::Fill, Length::Shrink); @@ -510,7 +510,7 @@ impl List { tooltip( text("\u{EA0C}") .font(ICONS) - .width(Length::Units(17)) + .width(17) .horizontal_alignment(alignment::Horizontal::Center) .style(style::Text::Commentary) .size(17), @@ -569,12 +569,12 @@ impl List { self.phone_packages[selection.0][selection.1] .removal )] - .width(Length::Units(100)), + .width(100), row![text( self.phone_packages[selection.0][selection.1] .uad_list )] - .width(Length::Units(60)), + .width(60), row![text( self.phone_packages[selection.0][selection.1] .name @@ -600,7 +600,7 @@ impl List { _ => text("Impossible") .style(style::Text::Danger), },] - .width(Length::Units(60)), + .width(60), ] .width(Length::Fill) .spacing(20), @@ -662,7 +662,7 @@ impl List { .align_items(Alignment::Center) }, ) - .width(Length::Units(800)) + .width(800) .height(Length::Shrink) .max_height(700) .style(style::Container::Background) @@ -837,7 +837,7 @@ fn recap<'a>( ) .padding(10) .width(Length::Fill) - .height(Length::Units(45)) + .height(45) .style(style::Container::Frame) .into() } diff --git a/src/gui/views/settings.rs b/src/gui/views/settings.rs index 296595f..d796038 100644 --- a/src/gui/views/settings.rs +++ b/src/gui/views/settings.rs @@ -274,7 +274,7 @@ impl Settings { "https://github.com/0x192/universal-android-debloater/wiki/FAQ#\ why-is-the-disable-mode-setting-not-available-for-my-device", ))) - .height(Length::Units(22)) + .height(22) .style(style::Button::Unavailable); // Disabling package without root isn't really possible before Android Oreo (8.0) @@ -326,18 +326,18 @@ impl Settings { .padding(5) .on_press(Message::BackupDevice) .style(style::Button::Primary) - .width(Length::Units(77)); + .width(77); let restore_btn = |enabled| { if enabled { button(text("Restore").horizontal_alignment(alignment::Horizontal::Center)) .padding(5) .on_press(Message::RestoreDevice) - .width(Length::Units(77)) + .width(77) } else { button(text("No backup").horizontal_alignment(alignment::Horizontal::Center)) .padding(5) - .width(Length::Units(77)) + .width(77) } }; diff --git a/src/gui/widgets/navigation_menu.rs b/src/gui/widgets/navigation_menu.rs index 7e28d42..c13354a 100644 --- a/src/gui/widgets/navigation_menu.rs +++ b/src/gui/widgets/navigation_menu.rs @@ -21,7 +21,7 @@ pub fn nav_menu<'a>( let apps_refresh_btn = button( Text::new("\u{E900}") .font(ICONS) - .width(Length::Units(17)) + .width(17) .horizontal_alignment(alignment::Horizontal::Center) .size(17), ) diff --git a/src/gui/widgets/package_row.rs b/src/gui/widgets/package_row.rs index 29367ec..9a83398 100644 --- a/src/gui/widgets/package_row.rs +++ b/src/gui/widgets/package_row.rs @@ -92,7 +92,7 @@ impl PackageRow { action_btn = button( text(action_text) .horizontal_alignment(alignment::Horizontal::Center) - .width(Length::Units(100)), + .width(100), ) .on_press(Message::ActionPressed); } else { @@ -102,7 +102,7 @@ impl PackageRow { action_btn = button( text(action_text) .horizontal_alignment(alignment::Horizontal::Center) - .width(Length::Units(100)), + .width(100), ); } @@ -123,7 +123,7 @@ impl PackageRow { }) .width(Length::Fill) .on_press(Message::PackagePressed), - Space::with_width(Length::Units(15)) + Space::with_width(15) ] .align_items(Alignment::Center) .into()