Update to bevy 0.19

- this is more a subtractive change b/c in 0.19, render graphs no longer
  exist, it's Schedules all the way down. (This *also* means that we
  don't need `bevy_render` as an optional dependency anymore.)

Author: Jengamon

Cargo.toml

@@ -11,35 +11,28 @@ edition = "2021"
 exclude = ["docs/*"]
 
 [features]
-default = ["cli", "render_graph"]
+default = ["cli"]
 cli = ["dep:lexopt"]
-render_graph = ["dep:bevy_render"]
 
 [dependencies]
-bevy_app = { version = "0.18.0" }
-bevy_color = { version = "0.18.0" }
-bevy_ecs = { version = "0.18.0" }
-bevy_log = { version = "0.18.0" }
-bevy_platform = { version = "0.18.0" }
-bevy_render = { version = "0.18.0", optional = true }
-bevy_utils = { version = "0.18.0", features = ["debug"] }
+bevy_app = { version = "0.19.0-dev" }
+bevy_color = { version = "0.19.0-dev" }
+bevy_ecs = { version = "0.19.0-dev" }
+bevy_log = { version = "0.19.0-dev" }
+bevy_platform = { version = "0.19.0-dev" }
+bevy_utils = { version = "0.19.0-dev", features = ["debug"] }
 disqualified = "1.0"
 lexopt = { version = "0.3.0", optional = true }
 
 [dev-dependencies]
-bevy = { version = "0.18.0" }
+bevy = { version = "0.19.0-dev" }
 
-[[example]]
-name = "generate_docs"
-required-features = ["render_graph"]
-
-[[example]]
-name = "print_render_graph"
-required-features = ["render_graph"]
-
-# [patch.crates-io]
+[patch.crates-io]
 # bevy_ecs = { path = "../bevy/crates/bevy_ecs" }
 # bevy_app = { path = "../bevy/crates/bevy_app" }
+# bevy_color = { path = "../bevy/crates/bevy_color" }
+# bevy_log = { path = "../bevy/crates/bevy_log" }
+# bevy_platform = { path = "../bevy/crates/bevy_platform" }
 # bevy_utils = { path = "../bevy/crates/bevy_utils" }
-# bevy_render = { path = "../bevy/crates/bevy_render" }
 # bevy = { path = "../bevy" }
+bevy = { git = "https://github.com/bevyengine/bevy" }

examples/generate_docs.rs

@@ -1,8 +1,7 @@
 use std::{any::TypeId, path::PathBuf};
 
 use bevy::{
-    core_pipeline::core_3d::Transmissive3d,
-    pbr::{MeshInputUniform, MeshUniform},
+    pbr::{MeshInputUniform, MeshUniform, Transmissive3d},
     prelude::*,
     render::RenderApp,
 };
@@ -118,18 +117,6 @@ fn main() -> Result<(), std::io::Error> {
             })
     })?;
 
-    let settings_render_light = bevy_mod_debugdump::render_graph::Settings {
-        style: bevy_mod_debugdump::render_graph::settings::Style::light(),
-    };
-    let settings_render_dark = bevy_mod_debugdump::render_graph::Settings {
-        style: bevy_mod_debugdump::render_graph::settings::Style::dark_github(),
-    };
-    let dot_light = bevy_mod_debugdump::render_graph_dot(&app, &settings_render_light);
-    let dot_dark = bevy_mod_debugdump::render_graph_dot(&app, &settings_render_dark);
-    let filename = "render_graph.dot";
-    std::fs::write(render_path.join("light").join(filename), dot_light)?;
-    std::fs::write(render_path.join("dark").join(filename), dot_dark)?;
-
     Ok(())
 }
 

examples/print_render_graph.rs

@@ -9,8 +9,6 @@ use bevy_ecs::{
 use bevy_log::{error, info};
 use std::io::Write;
 
-#[cfg(feature = "render_graph")]
-use crate::{render_graph, render_graph_dot};
 use crate::{schedule_graph, schedule_graph_dot};
 
 /// Check the command line for arguments relevant to this crate.
@@ -82,8 +80,6 @@ struct Args {
 /// A command to execute from the CLI.
 enum ArgsCommand {
     None,
-    /// Dumps the render graph to the specified file path.
-    DumpRender,
     /// Dumps the schedule graph.
     DumpSchedule {
         /// The schedule to dump.
@@ -109,8 +105,6 @@ fn parse_args() -> Result<Args, lexopt::Error> {
                 if value == "dump-schedule" {
                     let schedule = parser.value()?.parse()?;
                     command = ArgsCommand::DumpSchedule { schedule };
-                } else if value == "dump-render" {
-                    command = ArgsCommand::DumpRender;
                 } else {
                     return Err(arg.unexpected());
                 }
@@ -163,18 +157,6 @@ fn execute_cli(app: &mut App) -> Result<Args> {
             args.exit = false;
             Ok(args)
         }
-        #[cfg(feature = "render_graph")]
-        ArgsCommand::DumpRender => {
-            let settings = render_graph::Settings::default();
-            write(&render_graph_dot(app, &settings))?;
-
-            Ok(args)
-        }
-        #[cfg(not(feature = "render_graph"))]
-        ArgsCommand::DumpRender => Err(
-            "cannot dump renderer, consider enabling the feature `bevy_mod_debugdump/render_graph"
-                .into(),
-        ),
         ArgsCommand::DumpSchedule { schedule } => {
             let schedule = find_schedule(app, schedule)?;
 

src/cli.rs

@@ -1,5 +1,3 @@
-#![cfg_attr(not(feature = "render_graph"), allow(dead_code))]
-
 use std::borrow::Cow;
 pub struct DotGraph {
     buffer: String,
@@ -39,6 +37,11 @@ fn format_attributes(attrs: &[(&str, &str)]) -> String {
     let attrs = attrs.join(", ");
     format!("[{attrs}]")
 }
+
+#[expect(
+    unused,
+    reason = "was used for rendering render graphs, which were removed in Bevy 0.19"
+)]
 pub fn font_tag(text: &str, color: &str, size: u8) -> String {
     if text.is_empty() {
         return "".to_string();
@@ -74,6 +77,10 @@ impl DotGraph {
         dot
     }
 
+    #[expect(
+        unused,
+        reason = "was used for rendering render graphs, which were removed in Bevy 0.19"
+    )]
     pub fn digraph(name: &str, options: &[(&str, &str)]) -> DotGraph {
         DotGraph::new(name, "digraph", options)
     }

src/dot.rs

@@ -8,8 +8,6 @@ use bevy_ecs::schedule::{ScheduleLabel, Schedules};
 mod cli;
 mod dot;
 
-#[cfg(feature = "render_graph")]
-pub mod render_graph;
 pub mod schedule_graph;
 
 /// Formats the schedule into a dot graph.
@@ -43,49 +41,5 @@ pub fn print_schedule_graph(app: &mut App, schedule_label: impl ScheduleLabel) {
     println!("{dot}");
 }
 
-/// Returns the current render graph using
-/// [`render_graph_dot`](render_graph::render_graph_dot).
-/// # Example
-/// ```rust,no_run
-/// use bevy::prelude::*;
-///
-/// fn main() {
-///     let mut app = App::new();
-///     app.add_plugins(DefaultPlugins);
-///     let settings = bevy_mod_debugdump::render_graph::Settings::default();
-///     let dot = bevy_mod_debugdump::render_graph_dot(&mut app, &settings);
-///     println!("{dot}");
-/// }
-/// ```
-#[cfg(feature = "render_graph")]
-pub fn render_graph_dot(app: &App, settings: &render_graph::Settings) -> String {
-    use bevy_render::render_graph::RenderGraph;
-
-    let render_app = app
-        .get_sub_app(bevy_render::RenderApp)
-        .unwrap_or_else(|| panic!("no render app"));
-    let render_graph = render_app.world().get_resource::<RenderGraph>().unwrap();
-
-    render_graph::render_graph_dot(render_graph, settings)
-}
-
-/// Prints the current render graph using
-/// [`render_graph_dot`](render_graph::render_graph_dot).
-/// # Example
-/// ```rust,no_run
-/// use bevy::prelude::*;
-///
-/// fn main() {
-///     let mut app = App::new();
-///     app.add_plugins(DefaultPlugins);
-///     bevy_mod_debugdump::print_render_graph(&mut app);
-/// }
-/// ```
-#[cfg(feature = "render_graph")]
-pub fn print_render_graph(app: &mut App) {
-    let dot = render_graph_dot(app, &render_graph::Settings::default());
-    println!("{dot}");
-}
-
 #[cfg(feature = "cli")]
 pub use cli::CommandLineArgs;

src/lib.rs

@@ -289,7 +289,12 @@ impl ScheduleGraphContext<'_> {
             if let Some(include_ambiguity) = &self.settings.include_ambiguity {
                 let system_a = self.graph.systems.get(system_a).unwrap();
                 let system_b = self.graph.systems.get(system_b).unwrap();
-                if !include_ambiguity(&system_a.system, &system_b.system, &conflicts, self.world) {
+                if !include_ambiguity(
+                    &system_a.system(),
+                    &system_b.system(),
+                    &conflicts,
+                    self.world,
+                ) {
                     continue;
                 }
             }
@@ -590,7 +595,7 @@ impl ScheduleGraphContext<'_> {
 
     fn full_name(&self, node_id: NodeId) -> Cow<'_, str> {
         match node_id {
-            NodeId::System(key) => self.system_name(&self.graph.systems.get(key).unwrap().system),
+            NodeId::System(key) => self.system_name(&self.graph.systems.get(key).unwrap().system()),
             NodeId::Set(key) => self.system_set_name(self.graph.system_sets.get(key).unwrap()),
         }
     }