diff --git a/examples/headless.rs b/examples/headless.rs index 7fd24475f9..2c38637d1c 100644 --- a/examples/headless.rs +++ b/examples/headless.rs @@ -1,5 +1,5 @@ use bevy::{ - app::schedule_runner::{RunMode, ScheduleRunner}, + app::schedule_runner::{RunMode, ScheduleRunnerPlugin}, prelude::*, }; use std::time::Duration; @@ -7,7 +7,7 @@ use std::time::Duration; fn main() { println!("This app runs once:"); App::build() - .add_plugin(ScheduleRunner { + .add_plugin(ScheduleRunnerPlugin { run_mode: RunMode::Once, }) .add_system(hello_world_system()) @@ -15,7 +15,7 @@ fn main() { println!("This app loops forever at 60 fps:"); App::build() - .add_plugin(ScheduleRunner { + .add_plugin(ScheduleRunnerPlugin { run_mode: RunMode::Loop { wait: Some(Duration::from_secs_f64(1.0 / 60.0)), }, diff --git a/examples/plugin_loading/example_plugin/src/lib.rs b/examples/plugin_loading/example_plugin/src/lib.rs index fc2cb7d84e..4ff4bb3fdd 100644 --- a/examples/plugin_loading/example_plugin/src/lib.rs +++ b/examples/plugin_loading/example_plugin/src/lib.rs @@ -8,7 +8,7 @@ impl AppPlugin for ExamplePlugin { app_builder.setup(setup) } - fn name(&self) -> &'static str { + fn name(&self) -> &str { "example" } } diff --git a/src/app/plugin.rs b/src/app/plugin.rs index 3750135426..7d83b9bacd 100644 --- a/src/app/plugin.rs +++ b/src/app/plugin.rs @@ -4,7 +4,7 @@ use std::any::Any; pub trait AppPlugin: Any + Send + Sync { fn build(&self, app: AppBuilder) -> AppBuilder; - fn name(&self) -> &'static str; + fn name(&self) -> &str; } pub type CreateAppPlugin = unsafe fn() -> *mut dyn AppPlugin; diff --git a/src/app/schedule_runner.rs b/src/app/schedule_runner.rs index 50c838c0b9..d3339117e1 100644 --- a/src/app/schedule_runner.rs +++ b/src/app/schedule_runner.rs @@ -17,11 +17,11 @@ impl Default for RunMode { } #[derive(Default)] -pub struct ScheduleRunner { +pub struct ScheduleRunnerPlugin { pub run_mode: RunMode, } -impl AppPlugin for ScheduleRunner { +impl AppPlugin for ScheduleRunnerPlugin { fn build(&self, app: AppBuilder) -> AppBuilder { let run_mode = self.run_mode; app.set_runner(move |mut app: App| match run_mode { @@ -36,7 +36,7 @@ impl AppPlugin for ScheduleRunner { }, }) } - fn name(&self) -> &'static str { + fn name(&self) -> &str { "ScheduleRun" } } diff --git a/src/core/core_plugin.rs b/src/core/core_plugin.rs index 101c2c5f64..2b147a443e 100644 --- a/src/core/core_plugin.rs +++ b/src/core/core_plugin.rs @@ -14,7 +14,7 @@ impl AppPlugin for CorePlugin { app.add_resource(Time::new()) } - fn name(&self) -> &'static str { + fn name(&self) -> &str { "Core" } } diff --git a/src/diagnostic/diagnostic_plugin.rs b/src/diagnostic/diagnostic_plugin.rs index 49e073699b..8c2bcbd303 100644 --- a/src/diagnostic/diagnostic_plugin.rs +++ b/src/diagnostic/diagnostic_plugin.rs @@ -36,7 +36,7 @@ impl AppPlugin for DiagnosticsPlugin { app } - fn name(&self) -> &'static str { + fn name(&self) -> &str { "Diagnostics" } } diff --git a/src/render/render_plugin.rs b/src/render/render_plugin.rs index 522d025473..541fb3bc4f 100644 --- a/src/render/render_plugin.rs +++ b/src/render/render_plugin.rs @@ -70,7 +70,7 @@ impl AppPlugin for RenderPlugin { app } - fn name(&self) -> &'static str { + fn name(&self) -> &str { "Render" } } diff --git a/src/render/renderer/renderers/wgpu_renderer/mod.rs b/src/render/renderer/renderers/wgpu_renderer/mod.rs index a295c77063..0fcc3cae64 100644 --- a/src/render/renderer/renderers/wgpu_renderer/mod.rs +++ b/src/render/renderer/renderers/wgpu_renderer/mod.rs @@ -24,7 +24,7 @@ impl AppPlugin for WgpuRendererPlugin { let render_system = wgpu_render_system(&app.resources); app.add_thread_local_to_stage(system_stage::RENDER, render_system) } - fn name(&self) -> &'static str { + fn name(&self) -> &str { "WgpuRenderer" } } diff --git a/src/ui/mod.rs b/src/ui/mod.rs index 21ecca14f7..abc82918ec 100644 --- a/src/ui/mod.rs +++ b/src/ui/mod.rs @@ -17,7 +17,7 @@ impl AppPlugin for UiPlugin { fn build(&self, app: AppBuilder) -> AppBuilder { app.add_system(ui_update_system()) } - fn name(&self) -> &'static str { + fn name(&self) -> &str { "UI" } } diff --git a/src/window/window_plugin.rs b/src/window/window_plugin.rs index 39c2e52a0b..8bf3173603 100644 --- a/src/window/window_plugin.rs +++ b/src/window/window_plugin.rs @@ -34,7 +34,7 @@ impl AppPlugin for WindowPlugin { app } - fn name(&self) -> &'static str { + fn name(&self) -> &str { "Window" } } diff --git a/src/window/winit/mod.rs b/src/window/winit/mod.rs index 3d2d16d18c..463c69125e 100644 --- a/src/window/winit/mod.rs +++ b/src/window/winit/mod.rs @@ -19,7 +19,7 @@ impl AppPlugin for WinitPlugin { .set_runner(winit_runner) } - fn name(&self) -> &'static str { + fn name(&self) -> &str { "Winit" } }