SystemNodeId, SystemSetNodeId

Author: stepancheg

crates/bevy_ecs/src/schedule/executor/mod.rs

@@ -8,11 +8,8 @@ pub use self::single_threaded::SingleThreadedExecutor;
 
 use fixedbitset::FixedBitSet;
 
-use crate::{
-    schedule::{BoxedCondition, NodeId},
-    system::BoxedSystem,
-    world::World,
-};
+use crate::schedule::graph_utils::{SystemNodeId, SystemSetNodeId};
+use crate::{schedule::BoxedCondition, system::BoxedSystem, world::World};
 
 /// Types that can run a [`SystemSchedule`] on a [`World`].
 pub(super) trait SystemExecutor: Send + Sync {
@@ -53,8 +50,8 @@ pub struct SystemSchedule {
     pub(super) systems: Vec<BoxedSystem>,
     pub(super) system_conditions: Vec<Vec<BoxedCondition>>,
     pub(super) set_conditions: Vec<Vec<BoxedCondition>>,
-    pub(super) system_ids: Vec<NodeId>,
-    pub(super) set_ids: Vec<NodeId>,
+    pub(super) system_ids: Vec<SystemNodeId>,
+    pub(super) set_ids: Vec<SystemSetNodeId>,
     pub(super) system_dependencies: Vec<usize>,
     pub(super) system_dependents: Vec<Vec<usize>>,
     pub(super) sets_with_conditions_of_systems: Vec<FixedBitSet>,

crates/bevy_ecs/src/schedule/graph_utils.rs

@@ -8,22 +8,69 @@ use fixedbitset::FixedBitSet;
 
 use crate::schedule::set::*;
 
+/// Unique identifier for a system set stored in a [`ScheduleGraph`].
+///
+/// [`ScheduleGraph`]: super::ScheduleGraph
+#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
+pub struct SystemNodeId(
+    /// Index in various arrays storing systems.
+    usize,
+);
+
+impl SystemNodeId {
+    pub(crate) fn new(index: usize) -> Self {
+        Self(index)
+    }
+
+    pub(crate) fn index(&self) -> usize {
+        self.0
+    }
+}
+
+/// Unique identifier for a system set stored in a [`ScheduleGraph`].
+///
+/// [`ScheduleGraph`]: super::ScheduleGraph
+#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
+pub struct SystemSetNodeId(
+    /// Index in various arrays storing system sets.
+    usize,
+);
+
+impl SystemSetNodeId {
+    pub(crate) fn new(index: usize) -> Self {
+        Self(index)
+    }
+
+    pub(crate) fn index(&self) -> usize {
+        self.0
+    }
+}
+
 /// Unique identifier for a system or system set stored in a [`ScheduleGraph`].
 ///
 /// [`ScheduleGraph`]: super::ScheduleGraph
 #[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
 pub enum NodeId {
     /// Identifier for a system.
-    System(usize),
+    System(SystemNodeId),
     /// Identifier for a system set.
-    Set(usize),
+    Set(SystemSetNodeId),
 }
 
 impl NodeId {
-    /// Returns the internal integer value.
-    pub(crate) fn index(&self) -> usize {
+    /// Unpack [`SystemNodeId`] variant.
+    pub fn system(&self) -> Option<SystemNodeId> {
+        match self {
+            NodeId::System(node) => Some(*node),
+            NodeId::Set(_) => None,
+        }
+    }
+
+    /// Unpack [`SystemSetNodeId`] variant.
+    pub fn set(&self) -> Option<SystemSetNodeId> {
         match self {
-            NodeId::System(index) | NodeId::Set(index) => *index,
+            NodeId::System(_) => None,
+            NodeId::Set(node) => Some(*node),
         }
     }
 

crates/bevy_ecs/src/schedule/mod.rs

@@ -18,6 +18,8 @@ pub use self::set::*;
 pub use self::state::*;
 
 pub use self::graph_utils::NodeId;
+pub use self::graph_utils::SystemNodeId;
+pub use self::graph_utils::SystemSetNodeId;
 
 #[cfg(test)]
 mod tests {