Fix imports in x11, mesa_surfaceless & wayland modules

.github/workflows/main.yml

@@ -37,6 +37,9 @@ jobs:
             "chains sm-raw-window-handle-05",
           ]
         include:
+          - features: "sm-x11"
+            platform:
+              { target: x86_64-unknown-linux-gnu, os: ubuntu-24.04, test: true }
           - features: "sm-x11 sm-wayland-default"
             platform:
               { target: x86_64-unknown-linux-gnu, os: ubuntu-24.04, test: true }

Cargo.toml

@@ -2,7 +2,7 @@
 name = "surfman"
 license = "MIT OR Apache-2.0 OR MPL-2.0"
 edition = "2021"
-version = "0.12.4"
+version = "0.12.5"
 authors = [
     "Patrick Walton <pcwalton@mimiga.net>",
     "Emilio Cobos Álvarez <emilio@crisal.io>",

src/mesa_surfaceless/device.rs

@@ -8,10 +8,10 @@ use crate::context::ContextID;
 use crate::egl;
 use crate::egl::types::EGLint;
 use crate::gl;
-use crate::mesa_surfaceless::context::Context;
+use crate::mesa_surfaceless::context::{Context, ContextDescriptor, NativeContext};
 use crate::mesa_surfaceless::surface::{NativeWidget, Surface, SurfaceTexture};
 use crate::{ContextAttributes, Gl, SurfaceInfo};
-use crate::{ContextDescriptor, Error, GLApi, NativeContext, SurfaceAccess, SurfaceType};
+use crate::{Error, GLApi, SurfaceAccess, SurfaceType};
 use euclid::default::Size2D;
 use glow::Texture;
 use std::env;

src/wayland/device.rs

@@ -1,7 +1,8 @@
 //! A wrapper around Wayland `EGLDisplay`s.
 
 use super::connection::{Connection, NativeConnectionWrapper};
-use super::surface::{Surface, SurfaceDataGuard, SurfaceTexture};
+use super::context::{Context, ContextDescriptor, NativeContext};
+use super::surface::{NativeWidget, Surface, SurfaceDataGuard, SurfaceTexture};
 use crate::base::egl::context::{self, CurrentContextGuard, EGLBackedContext};
 use crate::base::egl::surface::EGLBackedSurface;
 use crate::context::ContextID;
@@ -10,11 +11,8 @@ use crate::egl::types::EGLint;
 use crate::gl;
 pub use crate::mesa_surfaceless::device::Adapter;
 use crate::surface::Framebuffer;
-use crate::{
-    Context, ContextDescriptor, Error, GLApi, NativeContext, NativeWidget, SurfaceAccess,
-    SurfaceType,
-};
 use crate::{ContextAttributes, Gl, SurfaceInfo};
+use crate::{Error, GLApi, SurfaceAccess, SurfaceType};
 use euclid::default::Size2D;
 use glow::Texture;
 use std::os::raw::c_void;

src/x11/connection.rs

@@ -285,7 +285,7 @@ impl Connection {
 
 impl NativeConnectionWrapper {
     #[inline]
-    pub(crate) fn lock_display(&self) -> DisplayGuard {
+    pub(crate) fn lock_display(&self) -> DisplayGuard<'_> {
         unsafe {
             let display = self.x11_display;
             let xlib = &self.xlib;

src/x11/device.rs

@@ -1,21 +1,18 @@
 //! A wrapper around X11 `EGLDisplay`s.
 
 use super::connection::{Connection, NativeConnectionWrapper};
-use super::context::Context;
+use super::context::{Context, ContextDescriptor, NativeContext};
 use super::surface::Surface;
 use crate::base::egl::{
     context::{self, CurrentContextGuard, EGLBackedContext},
     surface::EGLBackedSurface,
 };
 use crate::context::ContextID;
 use crate::egl::types::EGLint;
+use crate::gl;
 pub use crate::mesa_surfaceless::device::Adapter;
 use crate::x11::surface::{NativeWidget, SurfaceDataGuard, SurfaceTexture};
-use crate::{
-    egl, ContextAttributes, ContextDescriptor, Error, GLApi, Gl, SurfaceAccess, SurfaceInfo,
-    SurfaceType,
-};
-use crate::{gl, NativeContext};
+use crate::{egl, ContextAttributes, Error, GLApi, Gl, SurfaceAccess, SurfaceInfo, SurfaceType};
 use euclid::default::Size2D;
 use glow::Texture;
 use std::os::raw::c_void;