More Linux + example fixes

Author: decahedron1

crates/gpui/src/gpui.rs

@@ -3,6 +3,8 @@
 #![allow(unused_mut)] // False positives in platform specific code
 #![warn(clippy::wildcard_imports)]
 
+use std::{any::Any, future::Future};
+
 extern crate self as gpui;
 
 #[macro_use]
@@ -65,7 +67,6 @@ mod seal {
 
 pub extern crate lucie_common as common;
 pub extern crate lucie_macros as macros;
-use std::{any::Any, future::Future};
 
 pub use action::*;
 pub use anyhow::Result;
@@ -84,7 +85,10 @@ pub use input::*;
 pub use interactive::*;
 use key_dispatch::{DispatchActionListener, DispatchNodeId, DispatchTree, Replay};
 pub use keymap::*;
-pub use lucie_common::refineable;
+pub use lucie_common::{
+	SharedString,
+	refineable::{self, Refineable}
+};
 pub use lucie_macros::{AppContext, IntoElement, Render, VisualContext, register_action, test};
 pub use path_builder::*;
 pub use platform::*;

crates/gpui/src/platform/linux/x11/clipboard.rs

@@ -721,7 +721,7 @@ fn serve_requests(context: Arc<Inner>) -> Result<(), Box<dyn std::error::Error>>
 
 	log::trace!("Started serve requests thread.");
 
-	let _guard = crate::util::defer(|| {
+	let _guard = lucie_common::defer(|| {
 		context.serve_stopped.store(true, Ordering::Relaxed);
 	});
 

crates/gpui/src/platform/linux/x11/window.rs

@@ -2,7 +2,7 @@ use std::{cell::RefCell, ffi::c_void, fmt::Display, num::NonZeroU32, ops::Div, p
 
 use anyhow::{Context as _, anyhow};
 use blade_graphics as gpu;
-use lucie_common::ResultExt as _;
+use lucie_common::{ResultExt as _, trys};
 use raw_window_handle as rwh;
 use x11rb::{
 	connection::{Connection, RequestConnection},
@@ -22,7 +22,7 @@ use super::{X11Display, XINPUT_ALL_DEVICE_GROUPS, XINPUT_ALL_DEVICES};
 use crate::{
 	AnyWindowHandle, Bounds, Decorations, DevicePixels, ForegroundExecutor, GpuSpecs, Modifiers, Pixels, PlatformAtlas, PlatformDisplay, PlatformInput,
 	PlatformInputHandler, PlatformWindow, Point, PromptButton, PromptLevel, RequestFrameOptions, ResizeEdge, ScaledPixels, Scene, Size, Tiling,
-	WindowAppearance, WindowBackgroundAppearance, WindowBounds, WindowControlArea, WindowDecorations, WindowKind, WindowParams, X11ClientStatePtr, maybe,
+	WindowAppearance, WindowBackgroundAppearance, WindowBounds, WindowControlArea, WindowDecorations, WindowKind, WindowParams, X11ClientStatePtr,
 	platform::blade::{BladeContext, BladeRenderer, BladeSurfaceConfig},
 	px, size
 };
@@ -442,7 +442,7 @@ impl X11WindowState {
 		)?;
 
 		// Collect errors during setup, so that window can be destroyed on failure.
-		let setup_result = maybe!({
+		let setup_result = trys!({
 			let pid = std::process::id();
 			check_reply(
 				|| "X11 ChangeProperty for _NET_WM_PID failed.",
@@ -648,7 +648,7 @@ impl Drop for X11Window {
 		let mut state = self.0.state.borrow_mut();
 		state.renderer.destroy();
 
-		let destroy_x_window = maybe!({
+		let destroy_x_window = trys!({
 			check_reply(|| "X11 DestroyWindow failure.", self.0.xcb.destroy_window(self.0.x_window))?;
 			xcb_flush(&self.0.xcb);