From 4108db0eaecf3c887ae52270189acd9989c90e7b Mon Sep 17 00:00:00 2001 From: Jonathan Schwender <55576758+jschwe@users.noreply.github.com> Date: Thu, 5 Sep 2024 09:34:56 +0200 Subject: [PATCH] Fix two minor clippy lints (#315) * Fix clippy::redundant_static_lifetimes * Fix clippy::filter_next --- src/platform/generic/egl/context.rs | 13 +++++-------- src/platform/unix/generic/device.rs | 4 ++-- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/platform/generic/egl/context.rs b/src/platform/generic/egl/context.rs index 34e12dd8..605fab87 100644 --- a/src/platform/generic/egl/context.rs +++ b/src/platform/generic/egl/context.rs @@ -355,14 +355,11 @@ impl ContextDescriptor { } // Sanitize configs. - let egl_config = configs - .into_iter() - .filter(|&egl_config| { - required_config_attributes - .chunks(2) - .all(|pair| get_config_attr(egl_display, egl_config, pair[0]) == pair[1]) - }) - .next(); + let egl_config = configs.into_iter().find(|&egl_config| { + required_config_attributes + .chunks(2) + .all(|pair| get_config_attr(egl_display, egl_config, pair[0]) == pair[1]) + }); let egl_config = match egl_config { None => return Err(Error::NoPixelFormatFound), Some(egl_config) => egl_config, diff --git a/src/platform/unix/generic/device.rs b/src/platform/unix/generic/device.rs index e5a891c3..673162f9 100644 --- a/src/platform/unix/generic/device.rs +++ b/src/platform/unix/generic/device.rs @@ -8,8 +8,8 @@ use crate::{Error, GLApi}; use std::env; use std::sync::Arc; -static MESA_SOFTWARE_RENDERING_ENV_VAR: &'static str = "LIBGL_ALWAYS_SOFTWARE"; -static MESA_DRI_PRIME_ENV_VAR: &'static str = "DRI_PRIME"; +static MESA_SOFTWARE_RENDERING_ENV_VAR: &str = "LIBGL_ALWAYS_SOFTWARE"; +static MESA_DRI_PRIME_ENV_VAR: &str = "DRI_PRIME"; /// Represents a hardware display adapter that can be used for rendering (including the CPU). ///