From e55570f581c8f063c116691fa5cbb1593cfe3af6 Mon Sep 17 00:00:00 2001 From: cyrgani Date: Sun, 13 Apr 2025 23:13:40 +0200 Subject: [PATCH] loosen `Fn(Response)` to `FnOnce(Response)` in `fs::load_file` --- src/fs.rs | 10 +++++----- src/native/ios.rs | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/fs.rs b/src/fs.rs index 2212b042..d8c62620 100644 --- a/src/fs.rs +++ b/src/fs.rs @@ -35,7 +35,7 @@ impl std::error::Error for Error {} pub type Response = Result, Error>; /// Filesystem path on desktops or HTTP URL in WASM -pub fn load_file(path: &str, on_loaded: F) { +pub fn load_file(path: &str, on_loaded: F) { #[cfg(target_arch = "wasm32")] wasm::load_file(path, on_loaded); @@ -50,7 +50,7 @@ pub fn load_file(path: &str, on_loaded: F) { } #[cfg(target_os = "android")] -fn load_file_android(path: &str, on_loaded: F) { +fn load_file_android(path: &str, on_loaded: F) { fn load_file_sync(path: &str) -> Response { use crate::native; @@ -84,7 +84,7 @@ mod wasm { thread_local! { #[allow(clippy::type_complexity)] - static FILES: RefCell>> = RefCell::new(HashMap::new()); + static FILES: RefCell>> = RefCell::new(HashMap::new()); } #[no_mangle] @@ -109,7 +109,7 @@ mod wasm { }) } - pub fn load_file(path: &str, on_loaded: F) { + pub fn load_file(path: &str, on_loaded: F) { use native::wasm::fs; use std::ffi::CString; @@ -123,7 +123,7 @@ mod wasm { } #[cfg(not(any(target_arch = "wasm32", target_os = "android", target_os = "ios")))] -fn load_file_desktop(path: &str, on_loaded: F) { +fn load_file_desktop(path: &str, on_loaded: F) { fn load_file_sync(path: &str) -> Response { use std::fs::File; use std::io::Read; diff --git a/src/native/ios.rs b/src/native/ios.rs index a98831ed..abededd7 100644 --- a/src/native/ios.rs +++ b/src/native/ios.rs @@ -782,7 +782,7 @@ pub fn log(message: &str) { let _: () = unsafe { frameworks::NSLog(nsstring) }; } -pub fn load_file(path: &str, on_loaded: F) { +pub fn load_file(path: &str, on_loaded: F) { let path = std::path::Path::new(&path); let path_without_extension = path.with_extension(""); let path_without_extension = path_without_extension.to_str().unwrap();