Skip to content

impl Residual<()> for OperatorCancelled #278

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
jbuehler23 merged 2 commits into from
May 23, 2026
+6 −1
Merged

impl Residual<()> for OperatorCancelled #278

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
fd9778e
impl Residual<()> for OperatorCancelled
ThierryBerger May 23, 2026
3ef72e0
Merge branch 'main' into fix_nightly_residual_try
jbuehler23 May 23, 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
1 change: 1 addition & 0 deletions crates/jackdaw_api_internal/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#![feature(try_trait_v2)]
#![feature(try_trait_v2_residual)]
//! Public API for Jackdaw editor extensions.
//!
//! Extensions are entities. An extension entity holds an [`lifecycle::Extension`]
Expand Down
6 changes: 5 additions & 1 deletion crates/jackdaw_api_internal/src/operator.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use std::{
borrow::Cow,
collections::BTreeMap,
convert::Infallible,
ops::{ControlFlow, FromResidual, Try},
ops::{ControlFlow, FromResidual, Residual, Try},
};

use bevy::ecs::system::{SystemId, SystemState};
Expand Down Expand Up @@ -305,6 +305,10 @@ impl<E> FromResidual<Result<Infallible, E>> for OperatorResult {
}
}

impl Residual<()> for OperatorCancelled {
type TryType = OperatorResult;
}

/// Extension trait on [`World`] for calling operators by id.
///
/// Usage:
Expand Down
Loading