diff --git a/Cargo.lock b/Cargo.lock index 478231f9..37e83740 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -882,7 +882,6 @@ dependencies = [ "i18n-embed-fl", "itertools", "libcosmic", - "log", "nix 0.28.0", "once_cell", "rand", @@ -933,7 +932,6 @@ dependencies = [ "i18n-embed", "i18n-embed-fl", "libcosmic", - "log", "once_cell", "rust-embed", "tokio", @@ -957,7 +955,6 @@ dependencies = [ "i18n-embed-fl", "itertools", "libcosmic", - "log", "once_cell", "rand", "rust-embed", @@ -1003,7 +1000,6 @@ dependencies = [ "i18n-embed-fl", "itertools", "libcosmic", - "log", "rust-embed", "rust-embed-utils", "slotmap", diff --git a/cosmic-app-list/Cargo.toml b/cosmic-app-list/Cargo.toml index 5285b1fc..ecbd689f 100644 --- a/cosmic-app-list/Cargo.toml +++ b/cosmic-app-list/Cargo.toml @@ -14,7 +14,6 @@ i18n-embed.workspace = true i18n-embed-fl.workspace = true itertools = "0.12.1" libcosmic.workspace = true -log = "0.4" nix.workspace = true once_cell = "1.19" rand = "0.8.5" diff --git a/cosmic-app-list/src/app.rs b/cosmic-app-list/src/app.rs index 9ba4102c..614de8be 100755 --- a/cosmic-app-list/src/app.rs +++ b/cosmic-app-list/src/app.rs @@ -1236,8 +1236,8 @@ impl cosmic::Application for CosmicAppList { }), rectangle_tracker_subscription(0).map(|update| Message::Rectangle(update.1)), self.core.watch_config(APP_ID).map(|u| { - for err in u.errors { - log::error!("Error watching config: {}", err); + for why in u.errors { + tracing::error!(why = why.to_string(), "Error watching config"); } Message::ConfigUpdated(u.config) }), diff --git a/cosmic-applet-battery/Cargo.toml b/cosmic-applet-battery/Cargo.toml index 9e0c5ee1..8873fed1 100644 --- a/cosmic-applet-battery/Cargo.toml +++ b/cosmic-applet-battery/Cargo.toml @@ -10,7 +10,6 @@ futures.workspace = true i18n-embed-fl.workspace = true i18n-embed.workspace = true libcosmic.workspace = true -log = "0.4" once_cell = "1.19.0" rust-embed.workspace = true tokio = { version = "1.36.0", features = ["sync", "rt", "rt-multi-thread", "fs", "macros"] } diff --git a/cosmic-applet-battery/src/app.rs b/cosmic-applet-battery/src/app.rs index 9245afad..d38f9c54 100644 --- a/cosmic-applet-battery/src/app.rs +++ b/cosmic-applet-battery/src/app.rs @@ -33,7 +33,6 @@ use cosmic::Command; use cosmic::{Element, Theme}; use cosmic_time::{anim, chain, id, once_cell::sync::Lazy, Instant, Timeline}; -use log::error; use std::collections::HashMap; use std::path::PathBuf; use std::time::Duration; @@ -227,8 +226,8 @@ impl cosmic::Application for CosmicBatteryApplet { self.timeline.set_chain(chain).start(); self.set_charging_limit(enable); } - Message::Errored(e) => { - error!("{}", e); + Message::Errored(why) => { + tracing::error!("{}", why); } Message::TogglePopup => { if let Some(p) = self.popup.take() { diff --git a/cosmic-applet-bluetooth/Cargo.toml b/cosmic-applet-bluetooth/Cargo.toml index 6d1f0c9d..381ba8aa 100644 --- a/cosmic-applet-bluetooth/Cargo.toml +++ b/cosmic-applet-bluetooth/Cargo.toml @@ -14,7 +14,6 @@ i18n-embed-fl.workspace = true i18n-embed.workspace = true itertools = "0.12.1" libcosmic.workspace = true -log = "0.4" once_cell = "1.19.0" rand = "0.8" rust-embed.workspace = true diff --git a/cosmic-applet-network/Cargo.toml b/cosmic-applet-network/Cargo.toml index a2a1e39a..24b19c22 100644 --- a/cosmic-applet-network/Cargo.toml +++ b/cosmic-applet-network/Cargo.toml @@ -15,7 +15,6 @@ i18n-embed-fl.workspace = true i18n-embed.workspace = true itertools = "0.12.1" libcosmic.workspace = true -log = "0.4" rust-embed-utils.workspace = true rust-embed.workspace = true slotmap = "1.0.7" diff --git a/cosmic-applet-network/src/network_manager/active_conns.rs b/cosmic-applet-network/src/network_manager/active_conns.rs index 6f60f87f..852e82b5 100644 --- a/cosmic-applet-network/src/network_manager/active_conns.rs +++ b/cosmic-applet-network/src/network_manager/active_conns.rs @@ -2,7 +2,6 @@ use super::{NetworkManagerEvent, NetworkManagerState}; use cosmic::iced::{self, subscription}; use cosmic_dbus_networkmanager::nm::NetworkManager; use futures::{SinkExt, StreamExt}; -use log::error; use std::fmt::Debug; use std::hash::Hash; use zbus::Connection; @@ -39,8 +38,8 @@ async fn start_listening( }; let network_manager = match NetworkManager::new(&conn).await { Ok(n) => n, - Err(e) => { - error!("Failed to connect to NetworkManager: {}", e); + Err(why) => { + tracing::error!(why = why.to_string(), "Failed to connect to NetworkManager"); return State::Error; } }; diff --git a/cosmic-applet-network/src/network_manager/devices.rs b/cosmic-applet-network/src/network_manager/devices.rs index 2e141b9e..2b034ace 100644 --- a/cosmic-applet-network/src/network_manager/devices.rs +++ b/cosmic-applet-network/src/network_manager/devices.rs @@ -2,7 +2,6 @@ use super::{NetworkManagerEvent, NetworkManagerState}; use cosmic::iced::{self, subscription}; use cosmic_dbus_networkmanager::nm::NetworkManager; use futures::{SinkExt, StreamExt}; -use log::error; use std::fmt::Debug; use std::hash::Hash; use zbus::Connection; @@ -41,8 +40,8 @@ async fn start_listening( }; let network_manager = match NetworkManager::new(&conn).await { Ok(n) => n, - Err(e) => { - error!("Failed to connect to NetworkManager: {}", e); + Err(why) => { + tracing::error!(why = why.to_string(), "Failed to connect to NetworkManager"); return State::Error; } }; diff --git a/cosmic-applet-network/src/network_manager/wireless_enabled.rs b/cosmic-applet-network/src/network_manager/wireless_enabled.rs index 7c9c5fb1..2e43c74d 100644 --- a/cosmic-applet-network/src/network_manager/wireless_enabled.rs +++ b/cosmic-applet-network/src/network_manager/wireless_enabled.rs @@ -2,7 +2,6 @@ use super::{NetworkManagerEvent, NetworkManagerState}; use cosmic::iced::{self, subscription}; use cosmic_dbus_networkmanager::nm::NetworkManager; use futures::{SinkExt, StreamExt}; -use log::error; use std::fmt::Debug; use std::hash::Hash; use zbus::Connection; @@ -40,8 +39,8 @@ async fn start_listening( let network_manager = match NetworkManager::new(&conn).await { Ok(n) => n, - Err(e) => { - error!("Failed to connect to NetworkManager: {}", e); + Err(why) => { + tracing::error!(why = why.to_string(), "Failed to connect to NetworkManager"); return State::Error; } };