From 9d1fd520da434b8dde885084acf816a736c95a64 Mon Sep 17 00:00:00 2001 From: Nico Burns Date: Sun, 11 Jan 2026 15:48:54 +0000 Subject: [PATCH 1/4] Bump rfd to 0.17.1 Signed-off-by: Nico Burns --- Cargo.lock | 28 ++++++++++++++++++++++++++-- packages/desktop/Cargo.toml | 2 +- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 870d3db0f0..efc48b03dd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3116,7 +3116,7 @@ dependencies = [ "blitz-traits", "futures-util", "keyboard-types", - "rfd", + "rfd 0.15.4", "tracing", "winit", ] @@ -5765,7 +5765,7 @@ dependencies = [ "percent-encoding", "rand 0.9.2", "reqwest 0.12.28", - "rfd", + "rfd 0.17.1", "rustc-hash 2.1.1", "separator", "serde", @@ -14463,6 +14463,30 @@ dependencies = [ "windows-sys 0.59.0", ] +[[package]] +name = "rfd" +version = "0.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "069d6129dede311430d0dcf1ded88a7affc7a342c2d8e6336043d43ed14dac17" +dependencies = [ + "block2 0.6.2", + "dispatch2", + "js-sys", + "libc", + "log", + "objc2 0.6.3", + "objc2-app-kit 0.3.2", + "objc2-core-foundation", + "objc2-foundation 0.3.2", + "percent-encoding", + "pollster 0.4.0", + "raw-window-handle 0.6.2", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "windows-sys 0.61.2", +] + [[package]] name = "rgb" version = "0.8.52" diff --git a/packages/desktop/Cargo.toml b/packages/desktop/Cargo.toml index 715c379f27..5a885f2ac4 100644 --- a/packages/desktop/Cargo.toml +++ b/packages/desktop/Cargo.toml @@ -61,7 +61,7 @@ wry = { workspace = true, features = ["os-webview", "protocol", "drag-drop", "li [target.'cfg(any(target_os = "windows",target_os = "macos",target_os = "linux",target_os = "dragonfly", target_os = "freebsd", target_os = "netbsd", target_os = "openbsd"))'.dependencies] global-hotkey = "0.7.0" -rfd = { version = "0.15.3", default-features = false, features = ["xdg-portal", "tokio"] } +rfd = { version = "0.17.1", default-features = false, features = ["xdg-portal"] } muda = { workspace = true } [target.'cfg(any(target_os = "windows",target_os = "macos",target_os = "linux"))'.dependencies] From 65e0a9fc9ca4c248ed6eabd39753439f80e85a33 Mon Sep 17 00:00:00 2001 From: Nico Burns Date: Sun, 11 Jan 2026 16:36:25 +0000 Subject: [PATCH 2/4] Bump MSRV to 1.90 Signed-off-by: Nico Burns --- .github/workflows/main.yml | 22 +++++++++++----------- Cargo.toml | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a2b1ca3b81..5a31904e6a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -48,7 +48,7 @@ jobs: runs-on: blacksmith-4vcpu-ubuntu-2404 steps: - uses: actions/checkout@v5 - - uses: dtolnay/rust-toolchain@1.88.0 + - uses: dtolnay/rust-toolchain@1.90.0 - uses: Swatinem/rust-cache@v2 with: cache-all-crates: "true" @@ -75,7 +75,7 @@ jobs: with: packages: libwebkit2gtk-4.1-dev libgtk-3-dev libasound2-dev libudev-dev libayatana-appindicator3-dev libxdo-dev libglib2.0-dev version: 1.0 - - uses: dtolnay/rust-toolchain@1.88.0 + - uses: dtolnay/rust-toolchain@1.90.0 with: components: rustfmt, clippy - uses: Swatinem/rust-cache@v2 @@ -96,7 +96,7 @@ jobs: with: packages: libwebkit2gtk-4.1-dev libgtk-3-dev libasound2-dev libudev-dev libayatana-appindicator3-dev libxdo-dev libglib2.0-dev version: 1.0 - - uses: dtolnay/rust-toolchain@1.88.0 + - uses: dtolnay/rust-toolchain@1.90.0 with: components: rustfmt, clippy - uses: Swatinem/rust-cache@v2 @@ -111,7 +111,7 @@ jobs: runs-on: blacksmith-4vcpu-ubuntu-2404 steps: - uses: actions/checkout@v5 - - uses: dtolnay/rust-toolchain@1.88.0 + - uses: dtolnay/rust-toolchain@1.90.0 with: components: rustfmt - uses: Swatinem/rust-cache@v2 @@ -173,7 +173,7 @@ jobs: with: packages: libwebkit2gtk-4.1-dev libgtk-3-dev libasound2-dev libudev-dev libayatana-appindicator3-dev libxdo-dev libglib2.0-dev version: 1.0 - - uses: dtolnay/rust-toolchain@1.88.0 + - uses: dtolnay/rust-toolchain@1.90.0 - uses: Swatinem/rust-cache@v2 with: cache-all-crates: "true" @@ -284,7 +284,7 @@ jobs: - { target: aarch64-apple-darwin, os: macos-latest, - toolchain: "1.88.0", + toolchain: "1.90.0", cross: false, command: "test", args: "--all --tests", @@ -293,7 +293,7 @@ jobs: - { target: aarch64-apple-ios, os: macos-latest, - toolchain: "1.88.0", + toolchain: "1.90.0", cross: false, command: "build", args: "--package dioxus-desktop", @@ -302,7 +302,7 @@ jobs: - { target: aarch64-unknown-linux-gnu, os: ubuntu-24.04-arm, - toolchain: "1.88.0", + toolchain: "1.90.0", cross: false, command: "build", args: "--all --tests", @@ -311,7 +311,7 @@ jobs: - { target: aarch64-linux-android, os: blacksmith-4vcpu-ubuntu-2404, - toolchain: "1.88.0", + toolchain: "1.90.0", cross: true, command: "build", args: "--package dioxus-desktop", @@ -321,7 +321,7 @@ jobs: # - { # target: x86_64-unknown-linux-gnu, # os: ubuntu-24.04, - # toolchain: "1.88.0", + # toolchain: "1.90.0", # cross: false, # command: "build", # args: "--all --tests", @@ -373,7 +373,7 @@ jobs: name: "cargo test | windows" steps: - uses: actions/checkout@v5 - - uses: dtolnay/rust-toolchain@1.88.0 + - uses: dtolnay/rust-toolchain@1.90.0 with: components: rustfmt, clippy - uses: Swatinem/rust-cache@v2 diff --git a/Cargo.toml b/Cargo.toml index f3e89d12a0..823061c3db 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -451,7 +451,7 @@ repository = "https://github.com/DioxusLabs/dioxus/" homepage = "https://dioxuslabs.com" documentation = "https://dioxuslabs.com" keywords = ["dom", "ui", "gui", "react", "wasm"] -rust-version = "1.85.0" +rust-version = "1.90.0" publish = false version = "0.7.0" From 75578de7a0d1744b51e3d157131b5d307c115d74 Mon Sep 17 00:00:00 2001 From: Nico Burns Date: Sun, 11 Jan 2026 17:04:54 +0000 Subject: [PATCH 3/4] Fix clippy Signed-off-by: Nico Burns --- examples/08-apis/drag_and_drop.rs | 7 +++---- examples/08-apis/read_size.rs | 8 ++++---- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/examples/08-apis/drag_and_drop.rs b/examples/08-apis/drag_and_drop.rs index a10bcc1f49..5b3dd24d09 100644 --- a/examples/08-apis/drag_and_drop.rs +++ b/examples/08-apis/drag_and_drop.rs @@ -42,10 +42,9 @@ fn app() -> Element { background_color: "#f0f0f0", ondragover: |e| e.prevent_default(), ondrop: move |e| { - if let Some(item_id) = e.data_transfer().get_data("text/plain").and_then(|data| data.parse::().ok()) { - if let Some(pos) = items.iter().position(|item| item.id == item_id) { - items.write()[pos].category = category.to_string(); - } + if let Some(item_id) = e.data_transfer().get_data("text/plain").and_then(|data| data.parse::().ok()) + && let Some(pos) = items.iter().position(|item| item.id == item_id) { + items.write()[pos].category = category.to_string(); } }, h2 { "Category: {category}" } diff --git a/examples/08-apis/read_size.rs b/examples/08-apis/read_size.rs index fe6cc2059f..5f4748b28a 100644 --- a/examples/08-apis/read_size.rs +++ b/examples/08-apis/read_size.rs @@ -20,10 +20,10 @@ fn app() -> Element { let read = div_element.read(); let client_rect = read.as_ref().map(|el| el.get_client_rect()); - if let Some(client_rect) = client_rect { - if let Ok(rect) = client_rect.await { - dimensions.set(rect); - } + if let Some(client_rect) = client_rect + && let Ok(rect) = client_rect.await + { + dimensions.set(rect); } }; From 48f1fdcdbff0fb06d657482316b95a1bdb271cf8 Mon Sep 17 00:00:00 2001 From: Evan Almloff Date: Wed, 14 Jan 2026 15:38:53 -0600 Subject: [PATCH 4/4] bump rfd and revert msrv changes --- .github/workflows/main.yml | 22 +++++++++++----------- Cargo.lock | 6 +++--- Cargo.toml | 2 +- examples/08-apis/drag_and_drop.rs | 7 ++++--- examples/08-apis/read_size.rs | 8 ++++---- packages/desktop/Cargo.toml | 2 +- 6 files changed, 24 insertions(+), 23 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5a31904e6a..a2b1ca3b81 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -48,7 +48,7 @@ jobs: runs-on: blacksmith-4vcpu-ubuntu-2404 steps: - uses: actions/checkout@v5 - - uses: dtolnay/rust-toolchain@1.90.0 + - uses: dtolnay/rust-toolchain@1.88.0 - uses: Swatinem/rust-cache@v2 with: cache-all-crates: "true" @@ -75,7 +75,7 @@ jobs: with: packages: libwebkit2gtk-4.1-dev libgtk-3-dev libasound2-dev libudev-dev libayatana-appindicator3-dev libxdo-dev libglib2.0-dev version: 1.0 - - uses: dtolnay/rust-toolchain@1.90.0 + - uses: dtolnay/rust-toolchain@1.88.0 with: components: rustfmt, clippy - uses: Swatinem/rust-cache@v2 @@ -96,7 +96,7 @@ jobs: with: packages: libwebkit2gtk-4.1-dev libgtk-3-dev libasound2-dev libudev-dev libayatana-appindicator3-dev libxdo-dev libglib2.0-dev version: 1.0 - - uses: dtolnay/rust-toolchain@1.90.0 + - uses: dtolnay/rust-toolchain@1.88.0 with: components: rustfmt, clippy - uses: Swatinem/rust-cache@v2 @@ -111,7 +111,7 @@ jobs: runs-on: blacksmith-4vcpu-ubuntu-2404 steps: - uses: actions/checkout@v5 - - uses: dtolnay/rust-toolchain@1.90.0 + - uses: dtolnay/rust-toolchain@1.88.0 with: components: rustfmt - uses: Swatinem/rust-cache@v2 @@ -173,7 +173,7 @@ jobs: with: packages: libwebkit2gtk-4.1-dev libgtk-3-dev libasound2-dev libudev-dev libayatana-appindicator3-dev libxdo-dev libglib2.0-dev version: 1.0 - - uses: dtolnay/rust-toolchain@1.90.0 + - uses: dtolnay/rust-toolchain@1.88.0 - uses: Swatinem/rust-cache@v2 with: cache-all-crates: "true" @@ -284,7 +284,7 @@ jobs: - { target: aarch64-apple-darwin, os: macos-latest, - toolchain: "1.90.0", + toolchain: "1.88.0", cross: false, command: "test", args: "--all --tests", @@ -293,7 +293,7 @@ jobs: - { target: aarch64-apple-ios, os: macos-latest, - toolchain: "1.90.0", + toolchain: "1.88.0", cross: false, command: "build", args: "--package dioxus-desktop", @@ -302,7 +302,7 @@ jobs: - { target: aarch64-unknown-linux-gnu, os: ubuntu-24.04-arm, - toolchain: "1.90.0", + toolchain: "1.88.0", cross: false, command: "build", args: "--all --tests", @@ -311,7 +311,7 @@ jobs: - { target: aarch64-linux-android, os: blacksmith-4vcpu-ubuntu-2404, - toolchain: "1.90.0", + toolchain: "1.88.0", cross: true, command: "build", args: "--package dioxus-desktop", @@ -321,7 +321,7 @@ jobs: # - { # target: x86_64-unknown-linux-gnu, # os: ubuntu-24.04, - # toolchain: "1.90.0", + # toolchain: "1.88.0", # cross: false, # command: "build", # args: "--all --tests", @@ -373,7 +373,7 @@ jobs: name: "cargo test | windows" steps: - uses: actions/checkout@v5 - - uses: dtolnay/rust-toolchain@1.90.0 + - uses: dtolnay/rust-toolchain@1.88.0 with: components: rustfmt, clippy - uses: Swatinem/rust-cache@v2 diff --git a/Cargo.lock b/Cargo.lock index efc48b03dd..5667f8dabc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5765,7 +5765,7 @@ dependencies = [ "percent-encoding", "rand 0.9.2", "reqwest 0.12.28", - "rfd 0.17.1", + "rfd 0.17.2", "rustc-hash 2.1.1", "separator", "serde", @@ -14465,9 +14465,9 @@ dependencies = [ [[package]] name = "rfd" -version = "0.17.1" +version = "0.17.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "069d6129dede311430d0dcf1ded88a7affc7a342c2d8e6336043d43ed14dac17" +checksum = "20dafead71c16a34e1ff357ddefc8afc11e7d51d6d2b9fbd07eaa48e3e540220" dependencies = [ "block2 0.6.2", "dispatch2", diff --git a/Cargo.toml b/Cargo.toml index 823061c3db..f3e89d12a0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -451,7 +451,7 @@ repository = "https://github.com/DioxusLabs/dioxus/" homepage = "https://dioxuslabs.com" documentation = "https://dioxuslabs.com" keywords = ["dom", "ui", "gui", "react", "wasm"] -rust-version = "1.90.0" +rust-version = "1.85.0" publish = false version = "0.7.0" diff --git a/examples/08-apis/drag_and_drop.rs b/examples/08-apis/drag_and_drop.rs index 5b3dd24d09..a10bcc1f49 100644 --- a/examples/08-apis/drag_and_drop.rs +++ b/examples/08-apis/drag_and_drop.rs @@ -42,9 +42,10 @@ fn app() -> Element { background_color: "#f0f0f0", ondragover: |e| e.prevent_default(), ondrop: move |e| { - if let Some(item_id) = e.data_transfer().get_data("text/plain").and_then(|data| data.parse::().ok()) - && let Some(pos) = items.iter().position(|item| item.id == item_id) { - items.write()[pos].category = category.to_string(); + if let Some(item_id) = e.data_transfer().get_data("text/plain").and_then(|data| data.parse::().ok()) { + if let Some(pos) = items.iter().position(|item| item.id == item_id) { + items.write()[pos].category = category.to_string(); + } } }, h2 { "Category: {category}" } diff --git a/examples/08-apis/read_size.rs b/examples/08-apis/read_size.rs index 5f4748b28a..fe6cc2059f 100644 --- a/examples/08-apis/read_size.rs +++ b/examples/08-apis/read_size.rs @@ -20,10 +20,10 @@ fn app() -> Element { let read = div_element.read(); let client_rect = read.as_ref().map(|el| el.get_client_rect()); - if let Some(client_rect) = client_rect - && let Ok(rect) = client_rect.await - { - dimensions.set(rect); + if let Some(client_rect) = client_rect { + if let Ok(rect) = client_rect.await { + dimensions.set(rect); + } } }; diff --git a/packages/desktop/Cargo.toml b/packages/desktop/Cargo.toml index 5a885f2ac4..c3996bb6fc 100644 --- a/packages/desktop/Cargo.toml +++ b/packages/desktop/Cargo.toml @@ -61,7 +61,7 @@ wry = { workspace = true, features = ["os-webview", "protocol", "drag-drop", "li [target.'cfg(any(target_os = "windows",target_os = "macos",target_os = "linux",target_os = "dragonfly", target_os = "freebsd", target_os = "netbsd", target_os = "openbsd"))'.dependencies] global-hotkey = "0.7.0" -rfd = { version = "0.17.1", default-features = false, features = ["xdg-portal"] } +rfd = { version = "0.17.2", default-features = false, features = ["xdg-portal"] } muda = { workspace = true } [target.'cfg(any(target_os = "windows",target_os = "macos",target_os = "linux"))'.dependencies]