From 4029f7b5474e9713a2aa591b1862e27e05d5d31b Mon Sep 17 00:00:00 2001 From: Ashley Wulber Date: Fri, 21 Mar 2025 14:15:34 -0400 Subject: [PATCH] chore: update libcosmic --- Cargo.lock | 211 ++++++++++++------ cosmic-settings/Cargo.toml | 28 +-- cosmic-settings/src/main.rs | 2 +- .../src/pages/networking/vpn/mod.rs | 2 +- cosmic-settings/src/pages/networking/wifi.rs | 2 +- page/Cargo.toml | 2 +- rust-toolchain.toml | 2 +- 7 files changed, 158 insertions(+), 91 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 89ce809..4704510 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1022,7 +1022,7 @@ dependencies = [ "cached_proc_macro_types", "hashbrown 0.14.5", "once_cell", - "thiserror 2.0.11", + "thiserror 2.0.12", "web-time", ] @@ -1147,9 +1147,9 @@ checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" [[package]] name = "chrono" -version = "0.4.39" +version = "0.4.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825" +checksum = "1a7964611d71df112cb1730f2ee67324fcf4d0fc6606acbbe9bfe06df124637c" dependencies = [ "android-tzdata", "iana-time-zone", @@ -1157,7 +1157,7 @@ dependencies = [ "num-traits", "serde", "wasm-bindgen", - "windows-targets 0.52.6", + "windows-link", ] [[package]] @@ -1334,7 +1334,7 @@ version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a5f405d474b9d05e0a093d3120e77e9bf26461b57a84b40aa2a221ac5617fb6" dependencies = [ - "csscolorparser", + "csscolorparser 0.6.2", ] [[package]] @@ -1519,18 +1519,18 @@ dependencies = [ [[package]] name = "cosmic-config" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#91eae67dd59c70283590253d5a98688093017ebe" +source = "git+https://github.com/pop-os/libcosmic#cb682be3c887bcbf591309d350bac4d4710e104b" dependencies = [ "atomicwrites", "cosmic-config-derive", "cosmic-settings-daemon", - "dirs", + "dirs 6.0.0", "futures-util", "iced_futures", "known-folders", - "notify", + "notify 8.0.0", "once_cell", - "ron 0.9.0-alpha.1", + "ron 0.9.0", "serde", "tokio", "tracing", @@ -1541,7 +1541,7 @@ dependencies = [ [[package]] name = "cosmic-config-derive" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#91eae67dd59c70283590253d5a98688093017ebe" +source = "git+https://github.com/pop-os/libcosmic#cb682be3c887bcbf591309d350bac4d4710e104b" dependencies = [ "quote", "syn 1.0.109", @@ -1566,7 +1566,7 @@ name = "cosmic-freedesktop-icons" version = "0.3.0" source = "git+https://github.com/pop-os/freedesktop-icons#98f78d49022c893be2e974e95d95aaea963a6833" dependencies = [ - "dirs", + "dirs 5.0.1", "ini_core", "once_cell", "thiserror 1.0.69", @@ -1632,7 +1632,7 @@ dependencies = [ "futures-lite 2.6.0", "indexmap 2.7.1", "tachyonix", - "thiserror 2.0.11", + "thiserror 2.0.12", "tokio", "tracing", "wayland-client", @@ -1646,7 +1646,7 @@ source = "git+https://github.com/pop-os/cosmic-randr#4ad6fed387b84228067b96b1e9c dependencies = [ "kdl", "slotmap", - "thiserror 2.0.11", + "thiserror 2.0.12", "tokio", ] @@ -1681,7 +1681,7 @@ dependencies = [ "cosmic-settings-wallpaper", "derivative", "derive_setters", - "dirs", + "dirs 5.0.1", "downcast-rs", "eyre", "fixed_decimal", @@ -1702,7 +1702,7 @@ dependencies = [ "locale1", "locales-rs", "mime 0.3.17", - "notify", + "notify 6.1.1", "once_cell", "regex", "ron 0.8.1", @@ -1734,7 +1734,7 @@ version = "0.1.0" source = "git+https://github.com/pop-os/cosmic-settings-daemon#e2aa1056900d6f8c9c7555c0401aa7c99281eb06" dependencies = [ "cosmic-config", - "ron 0.9.0-alpha.1", + "ron 0.9.0", "serde", "serde_with", "thiserror 1.0.69", @@ -1808,7 +1808,7 @@ dependencies = [ "cosmic-config", "cosmic-freedesktop-icons", "cosmic-randr-shell", - "dirs", + "dirs 5.0.1", "eyre", "fast_image_resize", "futures-lite 2.6.0", @@ -1845,18 +1845,18 @@ dependencies = [ [[package]] name = "cosmic-theme" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#91eae67dd59c70283590253d5a98688093017ebe" +source = "git+https://github.com/pop-os/libcosmic#cb682be3c887bcbf591309d350bac4d4710e104b" dependencies = [ "almost", "cosmic-config", - "csscolorparser", - "dirs", + "csscolorparser 0.7.0", + "dirs 6.0.0", "lazy_static", "palette", - "ron 0.9.0-alpha.1", + "ron 0.9.0", "serde", "serde_json", - "thiserror 1.0.69", + "thiserror 2.0.12", ] [[package]] @@ -1938,6 +1938,15 @@ name = "csscolorparser" version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eb2a7d3066da2de787b7f032c736763eb7ae5d355f81a68bab2675a96008b0bf" +dependencies = [ + "phf", +] + +[[package]] +name = "csscolorparser" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46f9a16a848a7fb95dd47ce387ac1ee9a6df879ba784b815537fcd388a1a8288" dependencies = [ "phf", "serde", @@ -2146,7 +2155,16 @@ version = "5.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" dependencies = [ - "dirs-sys", + "dirs-sys 0.4.1", +] + +[[package]] +name = "dirs" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3e8aa94d75141228480295a7d0e7feb620b1a5ad9f12bc40be62411e38cce4e" +dependencies = [ + "dirs-sys 0.5.0", ] [[package]] @@ -2157,10 +2175,22 @@ checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" dependencies = [ "libc", "option-ext", - "redox_users", + "redox_users 0.4.6", "windows-sys 0.48.0", ] +[[package]] +name = "dirs-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e01a3366d27ee9890022452ee61b2b63a67e6f13f58900b651ff5665f0bb1fab" +dependencies = [ + "libc", + "option-ext", + "redox_users 0.5.0", + "windows-sys 0.59.0", +] + [[package]] name = "dispatch" version = "0.2.0" @@ -2304,7 +2334,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -2641,7 +2671,7 @@ dependencies = [ "log", "memchr", "strsim 0.11.1", - "thiserror 2.0.11", + "thiserror 2.0.12", "xdg", ] @@ -3189,7 +3219,7 @@ dependencies = [ [[package]] name = "iced" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#91eae67dd59c70283590253d5a98688093017ebe" +source = "git+https://github.com/pop-os/libcosmic#cb682be3c887bcbf591309d350bac4d4710e104b" dependencies = [ "dnd", "iced_accessibility", @@ -3207,7 +3237,7 @@ dependencies = [ [[package]] name = "iced_accessibility" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#91eae67dd59c70283590253d5a98688093017ebe" +source = "git+https://github.com/pop-os/libcosmic#cb682be3c887bcbf591309d350bac4d4710e104b" dependencies = [ "accesskit", "accesskit_winit", @@ -3216,7 +3246,7 @@ dependencies = [ [[package]] name = "iced_core" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#91eae67dd59c70283590253d5a98688093017ebe" +source = "git+https://github.com/pop-os/libcosmic#cb682be3c887bcbf591309d350bac4d4710e104b" dependencies = [ "bitflags 2.8.0", "bytes", @@ -3241,7 +3271,7 @@ dependencies = [ [[package]] name = "iced_futures" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#91eae67dd59c70283590253d5a98688093017ebe" +source = "git+https://github.com/pop-os/libcosmic#cb682be3c887bcbf591309d350bac4d4710e104b" dependencies = [ "futures", "iced_core", @@ -3267,7 +3297,7 @@ dependencies = [ [[package]] name = "iced_graphics" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#91eae67dd59c70283590253d5a98688093017ebe" +source = "git+https://github.com/pop-os/libcosmic#cb682be3c887bcbf591309d350bac4d4710e104b" dependencies = [ "bitflags 2.8.0", "bytemuck", @@ -3289,7 +3319,7 @@ dependencies = [ [[package]] name = "iced_renderer" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#91eae67dd59c70283590253d5a98688093017ebe" +source = "git+https://github.com/pop-os/libcosmic#cb682be3c887bcbf591309d350bac4d4710e104b" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -3301,7 +3331,7 @@ dependencies = [ [[package]] name = "iced_runtime" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#91eae67dd59c70283590253d5a98688093017ebe" +source = "git+https://github.com/pop-os/libcosmic#cb682be3c887bcbf591309d350bac4d4710e104b" dependencies = [ "bytes", "cosmic-client-toolkit", @@ -3317,7 +3347,7 @@ dependencies = [ [[package]] name = "iced_tiny_skia" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#91eae67dd59c70283590253d5a98688093017ebe" +source = "git+https://github.com/pop-os/libcosmic#cb682be3c887bcbf591309d350bac4d4710e104b" dependencies = [ "bytemuck", "cosmic-text", @@ -3333,7 +3363,7 @@ dependencies = [ [[package]] name = "iced_wgpu" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#91eae67dd59c70283590253d5a98688093017ebe" +source = "git+https://github.com/pop-os/libcosmic#cb682be3c887bcbf591309d350bac4d4710e104b" dependencies = [ "as-raw-xcb-connection", "bitflags 2.8.0", @@ -3364,7 +3394,7 @@ dependencies = [ [[package]] name = "iced_widget" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#91eae67dd59c70283590253d5a98688093017ebe" +source = "git+https://github.com/pop-os/libcosmic#cb682be3c887bcbf591309d350bac4d4710e104b" dependencies = [ "cosmic-client-toolkit", "dnd", @@ -3383,7 +3413,7 @@ dependencies = [ [[package]] name = "iced_winit" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#91eae67dd59c70283590253d5a98688093017ebe" +source = "git+https://github.com/pop-os/libcosmic#cb682be3c887bcbf591309d350bac4d4710e104b" dependencies = [ "cosmic-client-toolkit", "dnd", @@ -3942,6 +3972,17 @@ dependencies = [ "libc", ] +[[package]] +name = "inotify" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f37dccff2791ab604f9babef0ba14fbe0be30bd368dc541e2b08d07c8aa908f3" +dependencies = [ + "bitflags 2.8.0", + "inotify-sys", + "libc", +] + [[package]] name = "inotify-sys" version = "0.1.5" @@ -4389,7 +4430,7 @@ checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" [[package]] name = "libcosmic" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#91eae67dd59c70283590253d5a98688093017ebe" +source = "git+https://github.com/pop-os/libcosmic#cb682be3c887bcbf591309d350bac4d4710e104b" dependencies = [ "apply", "ashpd 0.9.2", @@ -4401,6 +4442,7 @@ dependencies = [ "cosmic-theme", "css-color", "derive_setters", + "futures", "iced", "iced_accessibility", "iced_core", @@ -4415,11 +4457,11 @@ dependencies = [ "lazy_static", "palette", "rfd", - "ron 0.8.1", + "ron 0.9.0", "serde", "slotmap", "taffy", - "thiserror 1.0.69", + "thiserror 2.0.12", "tokio", "tracing", "unicode-segmentation", @@ -4583,12 +4625,12 @@ dependencies = [ [[package]] name = "locales-rs" version = "0.1.0" -source = "git+https://github.com/AerynOS/locales-rs#4ebab71f5b6bc60a5e2c55207a26812a666817f5" +source = "git+https://github.com/AerynOS/locales-rs#6fbbefdb807b7cabf2ee29cf3b5b927971f966f1" dependencies = [ "fs-err", "serde", "serde_json", - "thiserror 2.0.11", + "thiserror 2.0.12", ] [[package]] @@ -4853,6 +4895,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd" dependencies = [ "libc", + "log", "wasi 0.11.0+wasi-snapshot-preview1", "windows-sys 0.52.0", ] @@ -4991,7 +5034,7 @@ dependencies = [ "crossbeam-channel", "filetime", "fsevent-sys", - "inotify", + "inotify 0.9.6", "kqueue", "libc", "log", @@ -5000,6 +5043,31 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "notify" +version = "8.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fee8403b3d66ac7b26aee6e40a897d85dc5ce26f44da36b8b73e987cc52e943" +dependencies = [ + "bitflags 2.8.0", + "filetime", + "fsevent-sys", + "inotify 0.11.0", + "kqueue", + "libc", + "log", + "mio 1.0.3", + "notify-types", + "walkdir", + "windows-sys 0.59.0", +] + +[[package]] +name = "notify-types" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e0826a989adedc2a244799e823aece04662b66609d96af8dff7ac6df9a8925d" + [[package]] name = "ntapi" version = "0.4.1" @@ -5395,9 +5463,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.20.3" +version = "1.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "945462a4b81e43c4e3ba96bd7b49d834c6f61198356aa858733bc4acf3cbe62e" +checksum = "d75b0bedcc4fe52caa0e03d9f1151a323e4aa5e2d78ba3580400cd3c9e2bc4bc" [[package]] name = "option-ext" @@ -6086,6 +6154,17 @@ dependencies = [ "thiserror 1.0.69", ] +[[package]] +name = "redox_users" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd6f9d3d47bdd2ad6945c5015a226ec6155d0bcdfd8f7cd29f86b71f8de99d2b" +dependencies = [ + "getrandom 0.2.15", + "libredox", + "thiserror 2.0.12", +] + [[package]] name = "regex" version = "1.11.1" @@ -6245,9 +6324,9 @@ dependencies = [ [[package]] name = "ron" -version = "0.9.0-alpha.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7644a2a539ff7fa991c8f4652373cd722d387e39229415103243914249730836" +checksum = "63f3aa105dea217ef30d89581b65a4d527a19afc95ef5750be3890e8d3c5b837" dependencies = [ "base64 0.22.1", "bitflags 2.8.0", @@ -6354,7 +6433,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys 0.4.15", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -6453,9 +6532,9 @@ checksum = "c2fdfc24bc566f839a2da4c4295b82db7d25a24253867d5c64355abb5799bdbe" [[package]] name = "serde" -version = "1.0.218" +version = "1.0.219" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8dfc9d19bdbf6d17e22319da49161d5d0108e4188e8b680aef6299eed22df60" +checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" dependencies = [ "serde_derive", ] @@ -6474,9 +6553,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.218" +version = "1.0.219" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f09503e191f4e797cb8aac08e9a4a4695c5edf6a2e70e376d961ddd5c969f82b" +checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" dependencies = [ "proc-macro2", "quote", @@ -6485,9 +6564,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.139" +version = "1.0.140" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44f86c3acccc9c65b153fe1b85a3be07fe5515274ec9f0653b4a0875731c72a6" +checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373" dependencies = [ "indexmap 2.7.1", "itoa", @@ -6988,7 +7067,7 @@ dependencies = [ "getrandom 0.3.1", "once_cell", "rustix 0.38.44", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -7011,11 +7090,11 @@ dependencies = [ [[package]] name = "thiserror" -version = "2.0.11" +version = "2.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d452f284b73e6d76dd36758a0c8684b1d5be31f92b89d07fd5822175732206fc" +checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708" dependencies = [ - "thiserror-impl 2.0.11", + "thiserror-impl 2.0.12", ] [[package]] @@ -7031,9 +7110,9 @@ dependencies = [ [[package]] name = "thiserror-impl" -version = "2.0.11" +version = "2.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26afc1baea8a989337eeb52b6e72a039780ce45c3edfcc9c5b9d112feeb173c2" +checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d" dependencies = [ "proc-macro2", "quote", @@ -7166,9 +7245,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.43.0" +version = "1.44.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d61fa4ffa3de412bfea335c6ecff681de2b609ba3c77ef3e00e521813a9ed9e" +checksum = "f382da615b842244d4b8738c82ed1275e6c5dd90c459a30941cd07080b06c91a" dependencies = [ "backtrace", "bytes", @@ -7985,7 +8064,7 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.59.0", ] [[package]] @@ -8125,6 +8204,12 @@ dependencies = [ "syn 2.0.98", ] +[[package]] +name = "windows-link" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76840935b766e1b0a05c0066835fb9ec80071d4c09a16f6bd5f7e655e3c14c38" + [[package]] name = "windows-result" version = "0.1.2" diff --git a/cosmic-settings/Cargo.toml b/cosmic-settings/Cargo.toml index 0840bd1..f9fdc72 100644 --- a/cosmic-settings/Cargo.toml +++ b/cosmic-settings/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "cosmic-settings" version = "0.1.0" -edition = "2021" +edition = "2024" license = "GPL-3.0-only" [dependencies] @@ -136,11 +136,7 @@ page-accessibility = [ "dep:cosmic-settings-config", "dep:sctk", ] -page-about = [ - "dep:cosmic-settings-system", - "dep:hostname1-zbus", - "dep:zbus", -] +page-about = ["dep:cosmic-settings-system", "dep:hostname1-zbus", "dep:zbus"] page-bluetooth = [ "dep:bluez-zbus", "dep:zbus", @@ -162,19 +158,9 @@ page-networking = [ "dep:zbus", ] page-power = ["dep:upower_dbus", "dep:zbus"] -page-region = [ - "gettext", - "dep:locales-rs", - "dep:locale1", - "dep:zbus", -] +page-region = ["gettext", "dep:locales-rs", "dep:locale1", "dep:zbus"] page-sound = ["dep:cosmic-settings-subscriptions"] -page-users = [ - "xdg-portal", - "dep:accounts-zbus", - "dep:zbus", - "dep:zbus_polkit", -] +page-users = ["xdg-portal", "dep:accounts-zbus", "dep:zbus", "dep:zbus_polkit"] page-window-management = ["dep:cosmic-settings-config"] page-workspaces = ["dep:cosmic-comp-config"] @@ -184,10 +170,6 @@ ashpd = ["dep:ashpd"] dbus-config = ["libcosmic/dbus-config", "cosmic-config/dbus"] single-instance = ["libcosmic/single-instance"] test = [] -wayland = [ - "libcosmic/wayland", - "dep:cosmic-panel-config", - "dep:cosmic-randr" -] +wayland = ["libcosmic/wayland", "dep:cosmic-panel-config", "dep:cosmic-randr"] wgpu = ["libcosmic/wgpu"] xdg-portal = ["ashpd", "libcosmic/xdg-portal"] diff --git a/cosmic-settings/src/main.rs b/cosmic-settings/src/main.rs index 87d2861..ad9bae3 100644 --- a/cosmic-settings/src/main.rs +++ b/cosmic-settings/src/main.rs @@ -155,7 +155,7 @@ pub fn main() -> color_eyre::Result<()> { color_eyre::install()?; if std::env::var("RUST_SPANTRACE").is_err() { - std::env::set_var("RUST_SPANTRACE", "0"); + unsafe { std::env::set_var("RUST_SPANTRACE", "0") }; } init_logger(); diff --git a/cosmic-settings/src/pages/networking/vpn/mod.rs b/cosmic-settings/src/pages/networking/vpn/mod.rs index 3d173f9..e61757d 100644 --- a/cosmic-settings/src/pages/networking/vpn/mod.rs +++ b/cosmic-settings/src/pages/networking/vpn/mod.rs @@ -463,7 +463,7 @@ impl Page { if let Some(settings) = self.known_connections.get(&uuid) { let settings = match settings { - ConnectionSettings::Vpn(ref settings) => settings, + ConnectionSettings::Vpn(settings) => settings, ConnectionSettings::Wireguard { id } => { let connection_name = id.clone(); return cosmic::task::future(async move { diff --git a/cosmic-settings/src/pages/networking/wifi.rs b/cosmic-settings/src/pages/networking/wifi.rs index dd3347c..534e985 100644 --- a/cosmic-settings/src/pages/networking/wifi.rs +++ b/cosmic-settings/src/pages/networking/wifi.rs @@ -715,7 +715,7 @@ fn devices_view() -> Section { fn is_connected(state: &NetworkManagerState, network: &AccessPoint) -> bool { state.active_conns.iter().any(|active| { - if let ActiveConnectionInfo::WiFi { ref name, .. } = active { + if let ActiveConnectionInfo::WiFi { name, .. } = active { *name == network.ssid.as_ref() } else { false diff --git a/page/Cargo.toml b/page/Cargo.toml index 53e213d..d1e77f2 100644 --- a/page/Cargo.toml +++ b/page/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "cosmic-settings-page" version = "0.1.0" -edition = "2021" +edition = "2024" [dependencies] derive_setters = "0.1.6" diff --git a/rust-toolchain.toml b/rust-toolchain.toml index d0ead5e..35e9b96 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,3 +1,3 @@ [toolchain] -channel = "stable" +channel = "1.85.1" components = ["clippy", "rustfmt"]