swaits/dioxus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use CapturedError as dioxus::Ok() so resources still function as expected (#4851)

Browse Source
This commit is contained in:
Jonathan Kelley authored and GitHub committed 2025-10-27 15:06:21 -07:00
1 parent 9f0bacc85c
commit 281f68faf5
14 files changed
+200 -54
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

packages/desktop/src/file_upload.rs
+7 -4
View File
@@ -331,7 +331,10 @@ impl NativeFileData for DesktopFileData {
fn read_bytes(
&self,
) -> std::pin::Pin<
Box<dyn std::future::Future<Output = Result<bytes::Bytes, dioxus_core::Error>> + 'static>,
Box<
dyn std::future::Future<Output = Result<bytes::Bytes, dioxus_core::CapturedError>>
+ 'static,
>,
> {
let path = self.0.clone();
Box::pin(async move { Ok(bytes::Bytes::from(std::fs::read(&path)?)) })
@@ -340,7 +343,7 @@ impl NativeFileData for DesktopFileData {
fn read_string(
&self,
) -> std::pin::Pin<
Box<dyn std::future::Future<Output = Result<String, dioxus_core::Error>> + 'static>,
Box<dyn std::future::Future<Output = Result<String, dioxus_core::CapturedError>> + 'static>,
> {
let path = self.0.clone();
Box::pin(async move { Ok(std::fs::read_to_string(&path)?) })
@@ -358,7 +361,7 @@ impl NativeFileData for DesktopFileData {
&self,
) -> std::pin::Pin<
Box<
dyn futures_util::Stream<Item = Result<bytes::Bytes, dioxus_core::Error>>
dyn futures_util::Stream<Item = Result<bytes::Bytes, dioxus_core::CapturedError>>
+ 'static
+ Send,
>,
@@ -374,7 +377,7 @@ impl NativeFileData for DesktopFileData {
// let n = file
// .read(&mut buf)
// .await
// .map_err(|e| dioxus_core::Error::from(e))?;
// .map_err(|e| dioxus_core::CapturedError::from(e))?;
// if n == 0 {
// Ok(None)
// } else {