fix ci

Author: ItsDoot

crates/bevy_ecs/src/schedule/stepping.rs

@@ -828,6 +828,7 @@ mod tests {
     use super::*;
     use crate::{prelude::*, schedule::ScheduleLabel};
     use alloc::{format, vec};
+    use slotmap::SlotMap;
     use std::println;
 
     #[derive(ScheduleLabel, Clone, Debug, PartialEq, Eq, Hash)]
@@ -1470,10 +1471,11 @@ mod tests {
         // helper to build a cursor tuple for the supplied schedule
         fn cursor(schedule: &Schedule, index: usize) -> (InternedScheduleLabel, NodeId) {
             let node_id = schedule.executable().system_ids[index];
-            (schedule.label(), node_id)
+            (schedule.label(), NodeId::System(node_id))
         }
 
         let mut world = World::new();
+        let mut slotmap = SlotMap::<SystemKey, ()>::with_key();
 
         // create two schedules with a number of systems in them
         let mut schedule_a = Schedule::new(TestScheduleA);
@@ -1520,16 +1522,21 @@ mod tests {
             ]
         );
 
+        let sys0 = slotmap.insert(());
+        let sys1 = slotmap.insert(());
+        let _sys2 = slotmap.insert(());
+        let sys3 = slotmap.insert(());
+
         // reset our cursor (disable/enable), and update stepping to test if the
         // cursor properly skips over AlwaysRun & NeverRun systems.  Also set
         // a Break system to ensure that shows properly in the cursor
         stepping
             // disable/enable to reset cursor
             .disable()
             .enable()
-            .set_breakpoint_node(TestScheduleA, NodeId::System(1))
-            .always_run_node(TestScheduleA, NodeId::System(3))
-            .never_run_node(TestScheduleB, NodeId::System(0));
+            .set_breakpoint_node(TestScheduleA, NodeId::System(sys1))
+            .always_run_node(TestScheduleA, NodeId::System(sys3))
+            .never_run_node(TestScheduleB, NodeId::System(sys0));
 
         let mut cursors = Vec::new();
         for _ in 0..9 {

examples/games/stepping.rs

@@ -139,7 +139,9 @@ fn build_ui(
             // Add an entry to our systems list so we can find where to draw
             // the cursor when the stepping cursor is at this system
             // we add plus 1 to account for the empty root span
-            state.systems.push((*label, node_id, text_spans.len() + 1));
+            state
+                .systems
+                .push((*label, NodeId::System(node_id), text_spans.len() + 1));
 
             // Add a text section for displaying the cursor for this system
             text_spans.push((
@@ -158,7 +160,7 @@ fn build_ui(
     }
 
     for (label, node) in always_run.drain(..) {
-        stepping.always_run_node(label, node);
+        stepping.always_run_node(label, NodeId::System(node));
     }
 
     commands.spawn((

release-content/migration-guides/schedule_slotmaps.md

@@ -8,25 +8,27 @@ In order to support removing systems from schedules, `Vec`s storing `System`s an
 reusing indices. The maps are respectively keyed by `SystemKey`s and `SystemSetKey`s.
 
 The following signatures were changed:
+
 - `NodeId::System`: Now stores a `SystemKey` instead of a plain `usize`
 - `NodeId::Set`: Now stores a `SystemSetKey` instead of a plain `usize`
 - `ScheduleBuildPass::collapse_set`: Now takes the type-specific keys. Wrap them back into a `NodeId` if necessary.
 - The following functions now return the type-specific keys. Wrap them back into a `NodeId` if necessary.
-    - `Schedule::systems`
-    - `ScheduleGraph::systems`
-    - `ScheduleGraph::system_sets`
-    - `ScheduleGraph::conflicting_systems`
+  - `Schedule::systems`
+  - `ScheduleGraph::systems`
+  - `ScheduleGraph::system_sets`
+  - `ScheduleGraph::conflicting_systems`
 - Use the appropriate key types to index these structures rather than bare `usize`s:
-    - `ScheduleGraph::systems` field
-    - `ScheduleGraph::system_conditions`
+  - `ScheduleGraph::systems` field
+  - `ScheduleGraph::system_conditions`
 - The following functions now take the type-specific keys. Use pattern matching to extract them from `NodeId`s, if necessary:
-    - `ScheduleGraph::get_system_at`
-    - `ScheduleGraph::system_at`
-    - `ScheduleGraph::get_set_at`
-    - `ScheduleGraph::set_at`
-    - `ScheduleGraph::get_set_conditions_at`
-    - `ScheduleGraph::set_conditions_at`
+  - `ScheduleGraph::get_system_at`
+  - `ScheduleGraph::system_at`
+  - `ScheduleGraph::get_set_at`
+  - `ScheduleGraph::set_at`
+  - `ScheduleGraph::get_set_conditions_at`
+  - `ScheduleGraph::set_conditions_at`
 
 The following functions were removed:
+
 - `NodeId::index`: You should match on and use the `SystemKey` and `SystemSetKey` instead.
-- `NodeId::cmp`: Use the `PartialOrd` and `Ord` traits instead.
+- `NodeId::cmp`: Use the `PartialOrd` and `Ord` traits instead.