update to bevy 0.17

Author: jakobhellermann

Cargo.toml

@@ -16,18 +16,18 @@ cli = ["dep:lexopt"]
 render_graph = ["dep:bevy_render"]
 
 [dependencies]
-bevy_app = { version = "0.16.0" }
-bevy_color = { version = "0.16.0" }
-bevy_ecs = { version = "0.16.0" }
-bevy_log = { version = "0.16.0" }
-bevy_platform = { version = "0.16.0" }
-bevy_render = { version = "0.16.0", optional = true }
-bevy_utils = { version = "0.16.0" }
+bevy_app = { version = "0.17.0" }
+bevy_color = { version = "0.17.0" }
+bevy_ecs = { version = "0.17.0" }
+bevy_log = { version = "0.17.0" }
+bevy_platform = { version = "0.17.0" }
+bevy_render = { version = "0.17.0", optional = true }
+bevy_utils = { version = "0.17.0" }
 disqualified = "1.0"
 lexopt = { version = "0.3.0", optional = true }
 
 [dev-dependencies]
-bevy = { version = "0.16.0" }
+bevy = { version = "0.17.0" }
 
 [[example]]
 name = "generate_docs"

examples/generate_docs.rs

@@ -5,9 +5,7 @@ use bevy::{
     pbr::{MeshInputUniform, MeshUniform},
     prelude::*,
     render::RenderApp,
-    sprite::Mesh2dUniform,
 };
-use bevy_ecs::schedule::ScheduleLabel;
 use bevy_mod_debugdump::schedule_graph::{settings::Style, Settings};
 use bevy_render::{
     batching::{
@@ -18,9 +16,6 @@ use bevy_render::{
     render_phase::ViewSortedRenderPhases,
 };
 
-#[derive(ScheduleLabel, Clone, Debug, PartialEq, Eq, Hash)]
-struct ScheduleDebugGroup;
-
 fn main() -> Result<(), std::io::Error> {
     let docs_path = PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("docs");
     let schedule_path = docs_path.join("schedule");
@@ -81,7 +76,7 @@ fn main() -> Result<(), std::io::Error> {
 
                     schedule
                         .graph_mut()
-                        .build_schedule(world, ScheduleDebugGroup.intern(), &ignored_ambiguities)
+                        .build_schedule(world, &ignored_ambiguities)
                         .unwrap();
 
                     let ignore_ambiguities = &[
@@ -90,7 +85,6 @@ fn main() -> Result<(), std::io::Error> {
                         TypeId::of::<IndirectParametersBuffers>(),
                         TypeId::of::<BatchedInstanceBuffers<MeshUniform, MeshInputUniform>>(),
                         TypeId::of::<BatchedInstanceBuffer<MeshUniform>>(),
-                        TypeId::of::<BatchedInstanceBuffer<Mesh2dUniform>>(),
                         TypeId::of::<RenderAssetBytesPerFrame>(),
                         TypeId::of::<ViewSortedRenderPhases<Transmissive3d>>(),
                     ];
@@ -150,7 +144,7 @@ fn initialize_schedules(
         // for `conflicting_systems`
         schedule
             .graph_mut()
-            .build_schedule(world, ScheduleDebugGroup.intern(), &ignored_ambiguities)
+            .build_schedule(world, &ignored_ambiguities)
             .unwrap();
     }
     Ok(())

examples/schedule_graph_compare.rs

@@ -1,12 +1,8 @@
 use std::path::PathBuf;
 
 use bevy::prelude::*;
-use bevy_ecs::schedule::ScheduleLabel;
 use bevy_mod_debugdump::schedule_graph::{settings::EdgeStyle, Settings};
 
-#[derive(ScheduleLabel, Clone, Debug, PartialEq, Eq, Hash)]
-struct ScheduleDebugGroup;
-
 fn main() -> Result<(), std::io::Error> {
     let compare_path = PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("compare");
     std::fs::create_dir_all(&compare_path)?;
@@ -25,7 +21,7 @@ fn main() -> Result<(), std::io::Error> {
             // for `conflicting_systems`
             schedule
                 .graph_mut()
-                .build_schedule(world, ScheduleDebugGroup.intern(), &ignored_ambiguities)
+                .build_schedule(world, &ignored_ambiguities)
                 .unwrap();
 
             for edge_style in [

examples/schedule_graph_testing.rs

@@ -40,7 +40,7 @@ fn main() -> Result<(), std::io::Error> {
             schedule.graph_mut().initialize(world);
             schedule
                 .graph_mut()
-                .build_schedule(world, ScheduleDebugGroup.intern(), &ignored_ambiguities)
+                .build_schedule(world, &ignored_ambiguities)
                 .unwrap();
 
             let settings = Settings {
@@ -61,9 +61,9 @@ fn print_schedule(schedule: &Schedule, schedule_label: &dyn ScheduleLabel) {
 
     let name_of_node = |id: NodeId| {
         let name = match id {
-            NodeId::System(_) => graph.system_at(id).name(),
-            NodeId::Set(_) => {
-                let name = format!("{:?}", graph.set_at(id));
+            NodeId::System(id) => graph.systems.get(id).unwrap().name(),
+            NodeId::Set(id) => {
+                let name = format!("{:?}", graph.system_sets.get(id).unwrap());
                 if let Some(name) = name.strip_prefix("SystemTypeSet(\"") {
                     let system_name = name.trim_end_matches("\")").to_string();
                     format!("@{system_name}").into()
@@ -75,19 +75,19 @@ fn print_schedule(schedule: &Schedule, schedule_label: &dyn ScheduleLabel) {
         if false {
             disqualified::ShortName(&name).to_string()
         } else {
-            name.into()
+            name.to_string()
         }
     };
 
     println!("{schedule_label:?}");
 
     println!("- SETS");
-    for (_set_id, set, _conditions) in graph.system_sets() {
+    for (_set_id, set, _conditions) in graph.system_sets.iter() {
         println!("  - {set:?}");
     }
 
     println!("- SYSTEMS");
-    for (_system_id, system, _conditions) in graph.systems() {
+    for (_system_id, system, _conditions) in graph.systems.iter() {
         println!("  - {}", system.name());
     }
 

src/cli.rs

@@ -1,7 +1,11 @@
 use std::{fs::File, path::PathBuf};
 
 use bevy_app::App;
-use bevy_ecs::{intern::Interned, schedule::ScheduleLabel, schedule::Schedules};
+use bevy_ecs::{
+    intern::Interned,
+    message::MessageWriter,
+    schedule::{ScheduleLabel, Schedules},
+};
 use bevy_log::{error, info};
 use std::io::Write;
 
@@ -60,7 +64,7 @@ impl bevy_app::Plugin for CommandLineArgs {
             // opens, but I don't see how.
             app.add_systems(
                 bevy_app::First,
-                |mut app_exit_events: bevy_ecs::event::EventWriter<bevy_app::AppExit>| {
+                |mut app_exit_events: MessageWriter<bevy_app::AppExit>| {
                     app_exit_events.write(bevy_app::AppExit::Success);
                 },
             );

src/lib.rs

@@ -1,6 +1,5 @@
 #![allow(clippy::needless_doctest_main)]
 #![allow(clippy::type_complexity)]
-use std::fmt::Debug;
 
 use bevy_app::App;
 use bevy_ecs::schedule::{ScheduleLabel, Schedules};
@@ -13,9 +12,6 @@ mod dot;
 pub mod render_graph;
 pub mod schedule_graph;
 
-#[derive(ScheduleLabel, Clone, Debug, PartialEq, Eq, Hash)]
-struct ScheduleDebugGroup;
-
 /// Formats the schedule into a dot graph.
 #[track_caller]
 pub fn schedule_graph_dot(
@@ -33,11 +29,9 @@ pub fn schedule_graph_dot(
                 .ok_or_else(|| format!("schedule {label_name} doesn't exist"))
                 .unwrap();
             schedule.graph_mut().initialize(world);
-            let _ = schedule.graph_mut().build_schedule(
-                world,
-                ScheduleDebugGroup.intern(),
-                &ignored_ambiguities,
-            );
+            let _ = schedule
+                .graph_mut()
+                .build_schedule(world, &ignored_ambiguities);
 
             schedule_graph::schedule_graph_dot(schedule, world, settings)
         })