Skip to content

Commit

Permalink
Add a const PipeSystem constructor (#7019)
Browse files Browse the repository at this point in the history
# Objective

Fix #5914.

`PipeSystem` cannot be constructed in `const` contexts.

## Solution

Add a const `PipeSystem::new` function.
  • Loading branch information
JoJoJet committed Dec 25, 2022
1 parent a91f89d commit 48b4a45
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 11 deletions.
13 changes: 9 additions & 4 deletions crates/bevy_ecs/src/query/access.rs
Original file line number Diff line number Diff line change
Expand Up @@ -71,16 +71,21 @@ impl<T: SparseSetIndex + fmt::Debug> fmt::Debug for Access<T> {
}
impl<T: SparseSetIndex> Default for Access<T> {
fn default() -> Self {
Self::new()
}
}

impl<T: SparseSetIndex> Access<T> {
/// Creates an empty [`Access`] collection.
pub const fn new() -> Self {
Self {
reads_all: false,
reads_and_writes: Default::default(),
writes: Default::default(),
reads_and_writes: FixedBitSet::new(),
writes: FixedBitSet::new(),
marker: PhantomData,
}
}
}

impl<T: SparseSetIndex> Access<T> {
/// Increases the set capacity to the specified amount.
///
/// Does nothing if `capacity` is less than or equal to the current value.
Expand Down
24 changes: 17 additions & 7 deletions crates/bevy_ecs/src/system/system_piping.rs
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,21 @@ pub struct PipeSystem<SystemA, SystemB> {
archetype_component_access: Access<ArchetypeComponentId>,
}

impl<SystemA, SystemB> PipeSystem<SystemA, SystemB> {
/// Manual constructor for creating a [`PipeSystem`].
/// This should only be used when [`IntoPipeSystem::pipe`] cannot be used,
/// such as in `const` contexts.
pub const fn new(system_a: SystemA, system_b: SystemB, name: Cow<'static, str>) -> Self {
Self {
system_a,
system_b,
name,
component_access: Access::new(),
archetype_component_access: Access::new(),
}
}
}

impl<SystemA: System, SystemB: System<In = SystemA::Out>> System for PipeSystem<SystemA, SystemB> {
type In = SystemA::In;
type Out = SystemB::Out;
Expand Down Expand Up @@ -154,13 +169,8 @@ where
fn pipe(self, system: SystemB) -> PipeSystem<SystemA::System, SystemB::System> {
let system_a = IntoSystem::into_system(self);
let system_b = IntoSystem::into_system(system);
PipeSystem {
name: Cow::Owned(format!("Pipe({}, {})", system_a.name(), system_b.name())),
system_a,
system_b,
archetype_component_access: Default::default(),
component_access: Default::default(),
}
let name = format!("Pipe({}, {})", system_a.name(), system_b.name());
PipeSystem::new(system_a, system_b, Cow::Owned(name))
}
}

Expand Down

0 comments on commit 48b4a45

Please sign in to comment.