Skip to content

fix(desktop): compile rfd after nil-NSOpenPanel guard (E0069) #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jmfcamp merged 2 commits into from
Aug 20, 2026
Merged

fix(desktop): compile rfd after nil-NSOpenPanel guard (E0069) #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9b1c17f
fix(desktop): return cancelled ModalFuture when NSOpenPanel is nil
cursoragent Aug 20, 2026
0cd9a99
fix(desktop): keep rfd nil-panel comment from matching bare return
cursoragent Aug 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions desktop/src-tauri/src/macos_file_panel.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@ mod tests {
env!("CARGO_MANIFEST_DIR"),
"/vendor/rfd/src/backend/macos/file_dialog/panel_ffi.rs"
));
const RFD_MODAL: &str = include_str!(concat!(
env!("CARGO_MANIFEST_DIR"),
"/vendor/rfd/src/backend/macos/modal_future.rs"
));

#[test]
fn patched_wry_cancels_when_nsopenpanel_is_nil() {
Expand Down Expand Up @@ -67,4 +71,16 @@ mod tests {
"typed NSSavePanel::savePanel panics on nil"
);
}

#[test]
fn patched_rfd_nil_panel_returns_cancelled_future() {
assert!(
RFD_MODAL.contains("NSModalResponseCancel"),
"nil panel must complete the modal future as cancelled"
);
assert!(
RFD_MODAL.contains("return Self { state }"),
"ModalFuture::new returns Self; a bare `return;` on the sync nil-panel path is E0069"
);
}
}
6 changes: 4 additions & 2 deletions desktop/src-tauri/vendor/rfd/src/backend/macos/modal_future.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,10 @@ impl<R: 'static + Default, D: AsModal + 'static> ModalFuture<R, D> {

if let Some(mtm) = MainThreadMarker::new() {
let Some(modal) = build_modal(mtm) else {
dialog_callback(state, NSModalResponseCancel);
return;
// Constructor returns Self. Complete as cancelled when
// NSOpenPanel/NSSavePanel is nil (E0069 on a unit return).
dialog_callback(state.clone(), NSModalResponseCancel);
return Self { state };
};
let inner = modal.inner_modal().retain();

Expand Down