Fix two minor clippy lints (#315)

* Fix clippy::redundant_static_lifetimes * Fix clippy::filter_next
servo · Sep 5, 2024 · 4108db0 · 4108db0
1 parent 83c1d08
commit 4108db0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git 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
@@ -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).
 ///