From 3d68292b3572147170da067a51ddfefe62048cfc Mon Sep 17 00:00:00 2001 From: drendog Date: Sat, 24 Jan 2026 05:27:51 +0100 Subject: [PATCH] fix: remove `use-` prefix to make clippy happy --- Cargo.toml | 6 +++--- crates/adapters/Cargo.toml | 6 +++--- crates/adapters/src/lib.rs | 6 +++--- .../adapters/src/wayland/event_handling/app_dispatcher.rs | 2 +- crates/composition/Cargo.toml | 6 +++--- crates/composition/src/lib.rs | 6 +++--- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index cc96c6b..5e1afaa 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,9 +17,9 @@ workspace = true layer-shika-composition.workspace = true [features] -default = ["use-log"] -use-log = ["layer-shika-composition/use-log"] -use-tracing = ["layer-shika-composition/use-tracing"] +default = ["log"] +log = ["layer-shika-composition/log"] +tracing = ["layer-shika-composition/tracing"] [workspace] resolver = "2" diff --git a/crates/adapters/Cargo.toml b/crates/adapters/Cargo.toml index 5579572..d11e3cd 100644 --- a/crates/adapters/Cargo.toml +++ b/crates/adapters/Cargo.toml @@ -28,6 +28,6 @@ wayland-protocols.workspace = true xkbcommon.workspace = true [features] -default = ["use-log"] -use-log = ["dep:log"] -use-tracing = ["dep:tracing"] +default = ["log"] +log = ["dep:log"] +tracing = ["dep:tracing"] diff --git a/crates/adapters/src/lib.rs b/crates/adapters/src/lib.rs index 0607c97..6341b91 100644 --- a/crates/adapters/src/lib.rs +++ b/crates/adapters/src/lib.rs @@ -17,13 +17,13 @@ pub use wayland::surfaces::popup_manager::PopupManager; pub use wayland::surfaces::surface_state::SurfaceState; pub(crate) mod logger { - #[cfg(all(feature = "use-log", feature = "use-tracing"))] + #[cfg(all(feature = "log", feature = "tracing"))] compile_error!("Cannot use both logging backend at one time"); - #[cfg(feature = "use-log")] + #[cfg(feature = "log")] pub use log::{debug, error, info, warn}; - #[cfg(feature = "use-tracing")] + #[cfg(feature = "tracing")] pub use tracing::{debug, error, info, warn}; } diff --git a/crates/adapters/src/wayland/event_handling/app_dispatcher.rs b/crates/adapters/src/wayland/event_handling/app_dispatcher.rs index e76e89a..f739d21 100644 --- a/crates/adapters/src/wayland/event_handling/app_dispatcher.rs +++ b/crates/adapters/src/wayland/event_handling/app_dispatcher.rs @@ -86,7 +86,7 @@ impl Dispatch for AppState { } impl Dispatch for AppState { - #[allow(clippy::cognitive_complexity)] + #[allow(clippy::cognitive_complexity, clippy::too_many_lines)] fn event( state: &mut Self, proxy: &WlOutput, diff --git a/crates/composition/Cargo.toml b/crates/composition/Cargo.toml index 90e36f7..7e2a7d9 100644 --- a/crates/composition/Cargo.toml +++ b/crates/composition/Cargo.toml @@ -22,6 +22,6 @@ thiserror.workspace = true tracing = { workspace = true, optional = true } [features] -default = ["use-log"] -use-log = ["dep:log", "layer-shika-adapters/use-log"] -use-tracing = ["dep:tracing", "layer-shika-adapters/use-tracing"] +default = ["log"] +log = ["dep:log", "layer-shika-adapters/log"] +tracing = ["dep:tracing", "layer-shika-adapters/tracing"] diff --git a/crates/composition/src/lib.rs b/crates/composition/src/lib.rs index 44820a7..ba0ccf6 100644 --- a/crates/composition/src/lib.rs +++ b/crates/composition/src/lib.rs @@ -62,13 +62,13 @@ pub use surface_registry::{SurfaceDefinition, SurfaceEntry, SurfaceMetadata, Sur pub use shell_config::{CompiledUiSource, ShellConfig, SurfaceComponentConfig}; pub(crate) mod logger { - #[cfg(all(feature = "use-log", feature = "use-tracing"))] + #[cfg(all(feature = "log", feature = "tracing"))] compile_error!("Cannot use both logging backend at one time"); - #[cfg(feature = "use-log")] + #[cfg(feature = "log")] pub use log::{debug, error, info, warn}; - #[cfg(feature = "use-tracing")] + #[cfg(feature = "tracing")] pub use tracing::{debug, error, info, warn}; }