chore: update dependencies

Updates all dependencies other than ICU.
Also prevents the trash and network drive layer container from touching the edge of the window.

Author: git-f0x

Cargo.lock

@@ -14,14 +14,14 @@ icu = { version = "1.5.0", features = [
     "compiled_data",
     "icu_datetime_experimental",
 ] }
-cctk = { git = "https://github.com/pop-os/cosmic-protocols", package = "cosmic-client-toolkit", rev = "178eb0b", optional = true }
+cctk = { git = "https://github.com/pop-os/cosmic-protocols", package = "cosmic-client-toolkit", rev = "6254f50", optional = true }
 cosmic-mime-apps = { git = "https://github.com/pop-os/cosmic-mime-apps.git", optional = true }
 dirs = "6.0.0"
 env_logger = "0.11"
 freedesktop_entry_parser = "1.3"
 futures = "0.3.31"
-gio = { version = "0.20", optional = true }
-glib = { version = "0.20", optional = true }
+gio = { version = "0.21", optional = true }
+glib = { version = "0.21", optional = true }
 glob = "0.3"
 icu_collator = "1.5"
 icu_provider = { version = "1.5", features = ["sync"] }
@@ -30,9 +30,8 @@ image = "0.25"
 libc = "0.2"
 log = "0.4"
 mime_guess = "2"
-notify-debouncer-full = "0.3"
+notify-debouncer-full = "0.6"
 notify-rust = { version = "4", optional = true }
-once_cell = "1.20"
 open = "5.3.2"
 paste = "1.0"
 regex = "1"
@@ -44,40 +43,40 @@ tokio = { version = "1", features = ["process", "sync"] }
 trash = { git = "https://github.com/jackpot51/trash-rs.git", branch = "cosmic" }
 url = "2.5"
 walkdir = "2.5.0"
-wayland-client = { version = "0.31.8", optional = true }
-xdg = { version = "2.5.2", optional = true }
+wayland-client = { version = "0.31.11", optional = true }
+xdg = { version = "3.0", optional = true }
 # https://github.com/ebassi/xdg-mime-rs/pull/31
 xdg-mime = { git = "https://github.com/ellieplayswow/xdg-mime-rs", branch = "feature/get-same-as" }
 # Compression
-bzip2 = { version = "0.5", optional = true }           #TODO: replace with pure Rust crate
-flate2 = "1.0"
-tar = "0.4.43"
-xz2 = { version = "0.1", optional = true }             #TODO: replace with pure Rust crate
-ordermap = { version = "0.5.8", features = ["serde"] }
+bzip2 = { version = "0.6", optional = true }           #TODO: replace with pure Rust crate
+flate2 = "1.1"
+tar = "0.4.44"
+liblzma = { version = "0.4.4", optional = true }       #TODO: replace with pure Rust crate
+ordermap = { version = "0.5.9", features = ["serde"] }
 # Internationalization
-i18n-embed = { version = "0.15", features = [
+i18n-embed = { version = "0.16", features = [
     "fluent-system",
     "desktop-requester",
 ] }
-i18n-embed-fl = "0.9"
+i18n-embed-fl = "0.10"
 rust-embed = "8"
 slotmap = "1.0.7"
 recently-used-xbel = { git = "https://github.com/pop-os/recently-used-xbel.git" }
-zip = "2.2.2"
+zip = "4.6.1"
 uzers = "0.12.1"
 md-5 = "0.10.6"
-png = "0.17.16"
-jxl-oxide = { version = "0.12.2", features = ["image"] }
+png = "0.18"
+jxl-oxide = { version = "0.12.4", features = ["image"] }
 num_cpus = "1.17.0"
 
 # Completion-based IO runtime to enable io_uring / IOCP file IO support.
 [dependencies.compio]
-version = "0.14.0"
+version = "0.15.0"
 default-features = false
 features = ["io", "macros", "polling", "runtime"]
 
 [dependencies.io-uring]
-version = "0.7.6"
+version = "0.7.10"
 default-features = false
 optional = true
 
@@ -96,7 +95,7 @@ default = [
     "notify",
     "wgpu",
     "wayland",
-    "xz2",
+    "liblzma",
 ]
 dbus-config = ["libcosmic/dbus-config"]
 desktop = [
@@ -125,7 +124,7 @@ debug = true
 fork = "0.2"
 
 [target.'cfg(target_os = "linux")'.dependencies]
-procfs = "0.17"
+procfs = "0.18"
 
 [dev-dependencies]
 # cap-std = "3"

Cargo.toml

@@ -44,8 +44,8 @@ use cosmic::{
 };
 use mime_guess::Mime;
 use notify_debouncer_full::{
-    DebouncedEvent, Debouncer, FileIdMap, new_debouncer,
-    notify::{self, RecommendedWatcher, Watcher},
+    DebouncedEvent, Debouncer, RecommendedCache, new_debouncer,
+    notify::{self, RecommendedWatcher},
 };
 use slotmap::Key as SlotMapKey;
 use std::{
@@ -611,7 +611,7 @@ pub enum WindowKind {
 }
 
 pub struct WatcherWrapper {
-    watcher_opt: Option<Debouncer<RecommendedWatcher, FileIdMap>>,
+    watcher_opt: Option<Debouncer<RecommendedWatcher, RecommendedCache>>,
 }
 
 impl Clone for WatcherWrapper {
@@ -673,7 +673,10 @@ pub struct App {
     #[cfg(all(feature = "wayland", feature = "desktop-applet"))]
     surface_names: HashMap<WindowId, String>,
     toasts: widget::toaster::Toasts<Message>,
-    watcher_opt: Option<(Debouncer<RecommendedWatcher, FileIdMap>, HashSet<PathBuf>)>,
+    watcher_opt: Option<(
+        Debouncer<RecommendedWatcher, RecommendedCache>,
+        HashSet<PathBuf>,
+    )>,
     windows: HashMap<window::Id, WindowKind>,
     nav_dnd_hover: Option<(Location, Instant)>,
     tab_dnd_hover: Option<(Entity, Instant)>,
@@ -1583,7 +1586,7 @@ impl App {
             // Unwatch paths no longer used
             for path in old_paths.iter() {
                 if !new_paths.contains(path) {
-                    match watcher.watcher().unwatch(path) {
+                    match watcher.unwatch(path) {
                         Ok(()) => {
                             log::debug!("unwatching {:?}", path);
                         }
@@ -1597,10 +1600,7 @@ impl App {
             // Watch new paths
             for path in new_paths.iter() {
                 if !old_paths.contains(path) {
-                    match watcher
-                        .watcher()
-                        .watch(path, notify::RecursiveMode::NonRecursive)
-                    {
+                    match watcher.watch(path, notify::RecursiveMode::NonRecursive) {
                         Ok(()) => {
                             log::debug!("watching {:?}", path);
                         }
@@ -5983,9 +5983,8 @@ impl Application for App {
                                 .map(|path| [path.join("files"), path])
                                 .flatten();
                             for path in trash_paths {
-                                if let Err(e) = watcher
-                                    .watcher()
-                                    .watch(&path, notify::RecursiveMode::NonRecursive)
+                                if let Err(e) =
+                                    watcher.watch(&path, notify::RecursiveMode::NonRecursive)
                                 {
                                     log::warn!(
                                         "failed to add trash bin `{}` to watcher: {e:?}",
@@ -6055,9 +6054,8 @@ impl Application for App {
 
                     match watcher_res {
                         Ok(mut watcher) => {
-                            if let Err(e) = watcher
-                                .watcher()
-                                .watch(&recents_path, notify::RecursiveMode::NonRecursive)
+                            if let Err(e) =
+                                watcher.watch(&recents_path, notify::RecursiveMode::NonRecursive)
                             {
                                 log::warn!(
                                     "failed to add recents file `{}` to watcher: {}",

src/app.rs

@@ -24,9 +24,9 @@ pub const SUPPORTED_ARCHIVE_TYPES: &[&str] = &[
     "application/x-bzip2",
     #[cfg(feature = "bzip2")]
     "application/x-bzip2-compressed-tar",
-    #[cfg(feature = "xz2")]
+    #[cfg(feature = "liblzma")]
     "application/x-xz",
-    #[cfg(feature = "xz2")]
+    #[cfg(feature = "liblzma")]
     "application/x-xz-compressed-tar",
 ];
 
@@ -83,10 +83,10 @@ pub fn extract(
             .map(tar::Archive::new)
             .and_then(|mut archive| archive.unpack(&new_dir))
             .map_err(OperationError::from_str)?,
-        #[cfg(feature = "xz2")]
+        #[cfg(feature = "liblzma")]
         "application/x-xz" | "application/x-xz-compressed-tar" => OpReader::new(path, controller)
             .map(io::BufReader::new)
-            .map(xz2::read::XzDecoder::new)
+            .map(liblzma::read::XzDecoder::new)
             .map(tar::Archive::new)
             .and_then(|mut archive| archive.unpack(&new_dir))
             .map_err(OperationError::from_str)?,

src/archive.rs

@@ -19,8 +19,8 @@ use cosmic::{
     },
 };
 use notify_debouncer_full::{
-    DebouncedEvent, Debouncer, FileIdMap, new_debouncer,
-    notify::{self, RecommendedWatcher, Watcher},
+    DebouncedEvent, Debouncer, RecommendedCache, new_debouncer,
+    notify::{self, RecommendedWatcher},
 };
 use recently_used_xbel::update_recently_used;
 use std::{
@@ -468,7 +468,7 @@ impl From<AppMessage> for Message {
 pub struct MounterData(MounterKey, MounterItem);
 
 struct WatcherWrapper {
-    watcher_opt: Option<Debouncer<RecommendedWatcher, FileIdMap>>,
+    watcher_opt: Option<Debouncer<RecommendedWatcher, RecommendedCache>>,
 }
 
 impl Clone for WatcherWrapper {
@@ -510,7 +510,10 @@ struct App {
     search_id: widget::Id,
     tab: Tab,
     key_binds: HashMap<KeyBind, Action>,
-    watcher_opt: Option<(Debouncer<RecommendedWatcher, FileIdMap>, HashSet<PathBuf>)>,
+    watcher_opt: Option<(
+        Debouncer<RecommendedWatcher, RecommendedCache>,
+        HashSet<PathBuf>,
+    )>,
     auto_scroll_speed: Option<i16>,
 }
 
@@ -866,7 +869,7 @@ impl App {
             // Unwatch paths no longer used
             for path in old_paths.iter() {
                 if !new_paths.contains(path) {
-                    match watcher.watcher().unwatch(path) {
+                    match watcher.unwatch(path) {
                         Ok(()) => {
                             log::debug!("unwatching {:?}", path);
                         }
@@ -881,10 +884,7 @@ impl App {
             for path in new_paths.iter() {
                 if !old_paths.contains(path) {
                     //TODO: should this be recursive?
-                    match watcher
-                        .watcher()
-                        .watch(path, notify::RecursiveMode::NonRecursive)
-                    {
+                    match watcher.watch(path, notify::RecursiveMode::NonRecursive) {
                         Ok(()) => {
                             log::debug!("watching {:?}", path);
                         }

src/dialog.rs

@@ -1,22 +1,21 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-use std::str::FromStr;
-
 use i18n_embed::{
     DefaultLocalizer, LanguageLoader, Localizer,
     fluent::{FluentLanguageLoader, fluent_language_loader},
 };
 use icu::locid::Locale;
 use icu_collator::{Collator, CollatorOptions, Numeric};
 use icu_provider::DataLocale;
-use once_cell::sync::Lazy;
 use rust_embed::RustEmbed;
+use std::str::FromStr;
+use std::sync::LazyLock;
 
 #[derive(RustEmbed)]
 #[folder = "i18n/"]
 struct Localizations;
 
-pub static LANGUAGE_LOADER: Lazy<FluentLanguageLoader> = Lazy::new(|| {
+pub static LANGUAGE_LOADER: LazyLock<FluentLanguageLoader> = LazyLock::new(|| {
     let loader: FluentLanguageLoader = fluent_language_loader!();
 
     loader
@@ -26,7 +25,7 @@ pub static LANGUAGE_LOADER: Lazy<FluentLanguageLoader> = Lazy::new(|| {
     loader
 });
 
-pub static LANGUAGE_SORTER: Lazy<Collator> = Lazy::new(|| {
+pub static LANGUAGE_SORTER: LazyLock<Collator> = LazyLock::new(|| {
     let mut options = CollatorOptions::new();
     options.numeric = Some(Numeric::On);
 
@@ -41,7 +40,7 @@ pub static LANGUAGE_SORTER: Lazy<Collator> = Lazy::new(|| {
         .expect("Creating a collator from the system's current language, the fallback language, or American English should succeed")
 });
 
-pub static LOCALE: Lazy<Locale> = Lazy::new(|| {
+pub static LOCALE: LazyLock<Locale> = LazyLock::new(|| {
     fn get_local() -> Result<Locale, Box<dyn std::error::Error>> {
         let locale = std::env::var("LC_TIME").or_else(|_| std::env::var("LANG"))?;
 

src/localize.rs

@@ -291,29 +291,22 @@ impl MimeAppCache {
         // https://specifications.freedesktop.org/mime-apps-spec/mime-apps-spec-latest.html
         //TODO: ensure correct lookup order
         let mut mimeapps_paths = Vec::new();
-        match xdg::BaseDirectories::new() {
-            Ok(xdg_dirs) => {
-                for path in xdg_dirs.find_data_files("applications/mimeapps.list") {
-                    mimeapps_paths.push(path);
-                }
-                for desktop in desktops.iter().rev() {
-                    for path in
-                        xdg_dirs.find_data_files(format!("applications/{desktop}-mimeapps.list"))
-                    {
-                        mimeapps_paths.push(path);
-                    }
-                }
-                for path in xdg_dirs.find_config_files("mimeapps.list") {
-                    mimeapps_paths.push(path);
-                }
-                for desktop in desktops.iter().rev() {
-                    for path in xdg_dirs.find_config_files(format!("{desktop}-mimeapps.list")) {
-                        mimeapps_paths.push(path);
-                    }
-                }
+        let xdg_dirs = xdg::BaseDirectories::new();
+
+        for path in xdg_dirs.find_data_files("applications/mimeapps.list") {
+            mimeapps_paths.push(path);
+        }
+        for desktop in desktops.iter().rev() {
+            for path in xdg_dirs.find_data_files(format!("applications/{desktop}-mimeapps.list")) {
+                mimeapps_paths.push(path);
             }
-            Err(err) => {
-                log::warn!("failed to get xdg base directories: {}", err);
+        }
+        for path in xdg_dirs.find_config_files("mimeapps.list") {
+            mimeapps_paths.push(path);
+        }
+        for desktop in desktops.iter().rev() {
+            for path in xdg_dirs.find_config_files(format!("{desktop}-mimeapps.list")) {
+                mimeapps_paths.push(path);
             }
         }
 

src/mime_app.rs

@@ -2,8 +2,12 @@
 
 use cosmic::widget::icon;
 use mime_guess::Mime;
-use once_cell::sync::Lazy;
-use std::{collections::HashMap, fs, path::Path, sync::Mutex};
+use std::{
+    collections::HashMap,
+    fs,
+    path::Path,
+    sync::{LazyLock, Mutex},
+};
 
 pub const FALLBACK_MIME_ICON: &str = "text-x-generic";
 
@@ -48,7 +52,8 @@ impl MimeIconCache {
             .clone()
     }
 }
-static MIME_ICON_CACHE: Lazy<Mutex<MimeIconCache>> = Lazy::new(|| Mutex::new(MimeIconCache::new()));
+static MIME_ICON_CACHE: LazyLock<Mutex<MimeIconCache>> =
+    LazyLock::new(|| Mutex::new(MimeIconCache::new()));
 
 pub fn mime_for_path<P: AsRef<Path>>(
     path: P,

src/mime_icon.rs

@@ -1,6 +1,10 @@
 use cosmic::{Task, iced::Subscription, widget};
-use once_cell::sync::Lazy;
-use std::{collections::BTreeMap, fmt, path::PathBuf, sync::Arc};
+use std::{
+    collections::BTreeMap,
+    fmt,
+    path::PathBuf,
+    sync::{Arc, LazyLock},
+};
 use tokio::sync::mpsc;
 
 use crate::{config::IconSizes, tab};
@@ -125,4 +129,4 @@ pub fn mounters() -> Mounters {
     Mounters::new(mounters)
 }
 
-pub static MOUNTERS: Lazy<Mounters> = Lazy::new(mounters);
+pub static MOUNTERS: LazyLock<Mounters> = LazyLock::new(mounters);