forestia/bevy
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove helper functions entirely

Browse Source
This commit is contained in:
Christian Hughes 2025-07-12 14:51:57 -05:00
parent d0fa5cb036
commit 0d45a8dc50
2 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crates/bevy_ecs/src/schedule/schedule.rs
View File

@ -1680,7 +1680,7 @@ impl ScheduleGraph {
if set.is_anonymous() { if set.is_anonymous() {
self.anonymous_set_name(id) self.anonymous_set_name(id)
} else { } else {
set.debug_name() format!("{set:?}")
} }
} }
} }
@ -1903,7 +1903,7 @@ impl ScheduleGraph {
) -> Result<(), ScheduleBuildError> { ) -> Result<(), ScheduleBuildError> {
for (&key, systems) in set_systems { for (&key, systems) in set_systems {
let set = &self.system_sets.sets[key]; let set = &self.system_sets.sets[key];
if set.is_system_type() { if set.system_type().is_some() {
let instances = systems.len(); let instances = systems.len();
let ambiguous_with = self.ambiguous_with.edges(NodeId::Set(key)); let ambiguous_with = self.ambiguous_with.edges(NodeId::Set(key));
let before = self let before = self
@ -2009,7 +2009,7 @@ impl ScheduleGraph {
fn names_of_sets_containing_node(&self, id: &NodeId) -> Vec<String> { fn names_of_sets_containing_node(&self, id: &NodeId) -> Vec<String> {
let mut sets = <HashSet<_>>::default(); let mut sets = <HashSet<_>>::default();
self.traverse_sets_containing_node(*id, &mut |key| { self.traverse_sets_containing_node(*id, &mut |key| {
!self.system_sets.sets[key].is_system_type() && sets.insert(key) self.system_sets.sets[key].system_type().is_none() && sets.insert(key)
}); });
let mut sets: Vec<_> = sets let mut sets: Vec<_> = sets
.into_iter() .into_iter()

14
crates/bevy_ecs/src/schedule/set.rs
View File

@ -1,4 +1,4 @@
use alloc::{boxed::Box, format, string::String}; use alloc::boxed::Box;
use bevy_utils::prelude::DebugName; use bevy_utils::prelude::DebugName;
use core::{ use core::{
any::TypeId, any::TypeId,
@ -175,18 +175,6 @@ define_label!(
} }
); );
impl dyn SystemSet {
/// Returns the name of this system set for debugging purposes.
pub fn debug_name(&self) -> String {
format!("{self:?}")
}
/// Returns `true` if this system set is a [`SystemTypeSet`].
pub fn is_system_type(&self) -> bool {
self.system_type().is_some()
}
}
/// A shorthand for `Interned<dyn SystemSet>`. /// A shorthand for `Interned<dyn SystemSet>`.
pub type InternedSystemSet = Interned<dyn SystemSet>; pub type InternedSystemSet = Interned<dyn SystemSet>;
/// A shorthand for `Interned<dyn ScheduleLabel>`. /// A shorthand for `Interned<dyn ScheduleLabel>`.