Fix X11 build error (#283)

* Fix X11 build error from rwh 0.6's usage of a NonNull * Add X11 to CI workflow
servo · Apr 11, 2024 · 3722893 · 3722893
1 parent b683ecc
commit 3722893
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -24,7 +24,7 @@ jobs:
         include:
           # rust stable
           - os: ubuntu-22.04
-            features: "--features sm-wayland-default"
+            features: "--features 'sm-x11 sm-wayland-default'"
             rust: stable
             target: "default"
           - os: ubuntu-22.04

diff --git a/surfman/src/platform/unix/x11/connection.rs b/surfman/src/platform/unix/x11/connection.rs
@@ -211,7 +211,10 @@ impl Connection {
         use rwh_06::RawDisplayHandle::Xlib;
         use rwh_06::XlibDisplayHandle;
         let display = match handle.as_raw() {
-            Xlib(XlibDisplayHandle { display, .. }) => display as *mut Display,
+            Xlib(XlibDisplayHandle {
+                display: Some(display),
+                ..
+            }) => display.as_ptr() as *mut Display,
             Xcb(_) => return Err(Error::Unimplemented),
             _ => return Err(Error::IncompatibleRawDisplayHandle),
         };