From b5de29ca1f42cfea558ae09f4841fdefac7970c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?= <hector@hecrj.dev>
Date: Tue, 25 Nov 2025 08:38:59 +0100
Subject: [PATCH] Simplify windowing server features a bit

---
 Cargo.lock                 | 5 ++---
 Cargo.toml                 | 4 ++--
 examples/editor/Cargo.toml | 1 -
 tester/Cargo.toml          | 3 ---
 winit/Cargo.toml           | 8 +++-----
 5 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d09b798b..9b0feb46 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -208,6 +208,8 @@ version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6cbdf310d77fd3aaee6ea2093db7011dc2d35d2eb3481e5607f1f8d942ed99df"
 dependencies = [
+ "async-fs",
+ "async-net",
  "enumflags2",
  "futures-channel",
  "futures-util",
@@ -215,7 +217,6 @@ dependencies = [
  "raw-window-handle",
  "serde",
  "serde_repr",
- "tokio",
  "url",
  "wayland-backend",
  "wayland-client",
@@ -5927,7 +5928,6 @@ dependencies = [
  "signal-hook-registry",
  "socket2 0.6.1",
  "tokio-macros",
- "tracing",
  "windows-sys 0.61.2",
 ]
 
@@ -7651,7 +7651,6 @@ dependencies = [
  "ordered-stream",
  "serde",
  "serde_repr",
- "tokio",
  "tracing",
  "uds_windows",
  "uuid",
diff --git a/Cargo.toml b/Cargo.toml
index 14d50e73..fd201efc 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -88,7 +88,7 @@ linux-theme-detection = ["iced_winit/linux-theme-detection"]
 # Enables the Unix X11 backend
 x11 = ["iced_renderer/x11", "iced_winit/x11"]
 # Enables the Unix Wayland backend
-wayland = ["iced_renderer/wayland", "iced_winit/wayland", "iced_winit/wayland-csd-adwaita", "iced_tester?/wayland"]
+wayland = ["iced_renderer/wayland", "iced_winit/wayland"]
 
 [dependencies]
 iced_debug.workspace = true
@@ -212,7 +212,7 @@ pulldown-cmark = "0.12"
 qrcode = { version = "0.13", default-features = false }
 raw-window-handle = "0.6"
 resvg = "0.45"
-rfd = { version = "0.16", default-features = false }
+rfd = "0.16"
 rustc-hash = "2.0"
 semver = "1.0"
 serde = "1.0"
diff --git a/examples/editor/Cargo.toml b/examples/editor/Cargo.toml
index cb7d51b2..d3f408d6 100644
--- a/examples/editor/Cargo.toml
+++ b/examples/editor/Cargo.toml
@@ -13,4 +13,3 @@ tokio.workspace = true
 tokio.features = ["fs"]
 
 rfd.workspace = true
-rfd.features = ["xdg-portal", "wayland", "tokio"]
diff --git a/tester/Cargo.toml b/tester/Cargo.toml
index 229ab66b..4f97bac3 100644
--- a/tester/Cargo.toml
+++ b/tester/Cargo.toml
@@ -10,9 +10,6 @@ categories.workspace = true
 keywords.workspace = true
 rust-version.workspace = true
 
-[features]
-wayland = ["rfd/wayland"]
-
 [dependencies]
 iced_test.workspace = true
 iced_widget.workspace = true
diff --git a/winit/Cargo.toml b/winit/Cargo.toml
index 42ec755d..cdce9c10 100644
--- a/winit/Cargo.toml
+++ b/winit/Cargo.toml
@@ -14,15 +14,13 @@ keywords.workspace = true
 workspace = true
 
 [features]
-default = ["x11", "wayland", "wayland-dlopen", "wayland-csd-adwaita"]
+default = ["x11", "wayland"]
 debug = ["iced_debug/enable"]
 sysinfo = ["dep:sysinfo"]
-x11 = ["winit/x11", "window_clipboard/x11"]
-wayland = ["winit/wayland", "window_clipboard/wayland"]
-wayland-dlopen = ["winit/wayland-dlopen"]
-wayland-csd-adwaita = ["winit/wayland-csd-adwaita"]
 unconditional-rendering = []
 linux-theme-detection = ["dep:mundy", "mundy/async-io", "mundy/color-scheme"]
+x11 = ["winit/x11", "window_clipboard/x11"]
+wayland = ["winit/wayland", "winit/wayland-dlopen", "winit/wayland-csd-adwaita", "window_clipboard/wayland"]
 
 [dependencies]
 iced_debug.workspace = true