From 2fbf0081ea2f83bb831f04bae76e3781a6fcf1ea Mon Sep 17 00:00:00 2001 From: Ian Douglas Scott Date: Tue, 12 Aug 2025 13:35:13 -0700 Subject: [PATCH] Fix compile warnings on nightly Should fix CI test. --- src/backend/mod.rs | 2 +- src/backend/render/element.rs | 2 +- src/shell/element/mod.rs | 2 +- src/shell/workspace.rs | 2 +- src/state.rs | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/backend/mod.rs b/src/backend/mod.rs index 3ecff86f..a1fe8fcf 100644 --- a/src/backend/mod.rs +++ b/src/backend/mod.rs @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-3.0-only +use crate::state::State; use crate::wayland::protocols::a11y::A11yHandler; -use crate::{config::ScreenFilter, state::State}; use anyhow::{anyhow, Context, Result}; use cosmic_comp_config::NumlockState; use cosmic_config::CosmicConfigEntry; diff --git a/src/backend/render/element.rs b/src/backend/render/element.rs index 426ba2ef..767e223a 100644 --- a/src/backend/render/element.rs +++ b/src/backend/render/element.rs @@ -244,7 +244,7 @@ where } } - fn underlying_storage(&self, renderer: &mut R) -> Option { + fn underlying_storage(&self, renderer: &mut R) -> Option> { match self { CosmicElement::Workspace(elem) => elem.underlying_storage(renderer), CosmicElement::Cursor(elem) => elem.underlying_storage(renderer), diff --git a/src/shell/element/mod.rs b/src/shell/element/mod.rs index 20ff8c26..a0e1ddc2 100644 --- a/src/shell/element/mod.rs +++ b/src/shell/element/mod.rs @@ -1322,7 +1322,7 @@ where } } - fn underlying_storage(&self, renderer: &mut R) -> Option { + fn underlying_storage(&self, renderer: &mut R) -> Option> { match self { CosmicMappedRenderElement::Stack(elem) => elem.underlying_storage(renderer), CosmicMappedRenderElement::Window(elem) => elem.underlying_storage(renderer), diff --git a/src/shell/workspace.rs b/src/shell/workspace.rs index 4449d451..70009d70 100644 --- a/src/shell/workspace.rs +++ b/src/shell/workspace.rs @@ -1969,7 +1969,7 @@ where fn underlying_storage( &self, renderer: &mut R, - ) -> Option { + ) -> Option> { match self { WorkspaceRenderElement::OverrideRedirect(elem) => elem.underlying_storage(renderer), WorkspaceRenderElement::Fullscreen(elem) => elem.underlying_storage(renderer), diff --git a/src/state.rs b/src/state.rs index 6cfe4e1f..4d665753 100644 --- a/src/state.rs +++ b/src/state.rs @@ -356,7 +356,7 @@ impl BackendData { pub fn offscreen_renderer, F: FnOnce(&mut KmsState) -> Option>( &mut self, kms_node_cb: F, - ) -> Result { + ) -> Result, GlMultiError> { match self { BackendData::Kms(kms) => { if let Some(nodes) = kms_node_cb(kms) {