Skip to content

Tidy up old SystemCondition trait hierarchy #21844

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Tidy up old SystemCondition trait hierarchy #21844

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fe2fe05
Tidy up old `SystemCondition` trait hierarchy
ItsDoot Nov 14, 2025
84fa821
Merge branch 'main' into schedule/tidy-1
ItsDoot Nov 19, 2025
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
24 changes: 2 additions & 22 deletions crates/bevy_ecs/src/schedule/condition.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ pub type BoxedCondition<In = ()> = Box<dyn ReadOnlySystem<In = In, Out = bool>>;
/// # app.run(&mut world);
/// # assert!(world.resource::<DidRun>().0);
pub trait SystemCondition<Marker, In: SystemInput = ()>:
sealed::SystemCondition<Marker, In>
IntoSystem<In, bool, Marker, System: ReadOnlySystem>
{
/// Returns a new run condition that only returns `true`
/// if both this one and the passed `and` return `true`.
Expand Down Expand Up @@ -373,30 +373,10 @@ pub trait SystemCondition<Marker, In: SystemInput = ()>:
}

impl<Marker, In: SystemInput, F> SystemCondition<Marker, In> for F where
F: sealed::SystemCondition<Marker, In>
F: IntoSystem<In, bool, Marker, System: ReadOnlySystem>
{
}

mod sealed {
use crate::system::{IntoSystem, ReadOnlySystem, SystemInput};

pub trait SystemCondition<Marker, In: SystemInput>:
IntoSystem<In, bool, Marker, System = Self::ReadOnlySystem>
{
// This associated type is necessary to let the compiler
// know that `Self::System` is `ReadOnlySystem`.
type ReadOnlySystem: ReadOnlySystem<In = In, Out = bool>;
}

impl<Marker, In: SystemInput, F> SystemCondition<Marker, In> for F
where
F: IntoSystem<In, bool, Marker>,
F::System: ReadOnlySystem,
{
type ReadOnlySystem = F::System;
}
}

/// A collection of [run conditions](SystemCondition) that may be useful in any bevy app.
pub mod common_conditions {
use super::{NotSystem, SystemCondition};
Expand Down