From b66c33eb92efca76a4644f4a3f7372e6156c2b7c Mon Sep 17 00:00:00 2001 From: Daniel McNab <36049421+DJMcNab@users.noreply.github.com> Date: Sun, 13 Feb 2022 21:51:12 +0000 Subject: [PATCH] Rebase cleanups --- crates/bevy_ecs/src/system/system_param.rs | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/crates/bevy_ecs/src/system/system_param.rs b/crates/bevy_ecs/src/system/system_param.rs index 4c32c9ed284451..4e9a6bf5dfda62 100644 --- a/crates/bevy_ecs/src/system/system_param.rs +++ b/crates/bevy_ecs/src/system/system_param.rs @@ -517,9 +517,7 @@ impl<'w, 's> SystemParam for &'w World { } unsafe impl<'w, 's> SystemParamState for WorldState { - type Config = (); - - fn init(_world: &mut World, system_meta: &mut SystemMeta, _config: Self::Config) -> Self { + fn init(_world: &mut World, system_meta: &mut SystemMeta) -> Self { let mut access = Access::default(); access.read_all(); if !system_meta @@ -544,8 +542,6 @@ unsafe impl<'w, 's> SystemParamState for WorldState { WorldState } - - fn default_config() -> Self::Config {} } impl<'w, 's> SystemParamFetch<'w, 's> for WorldState { @@ -592,16 +588,16 @@ impl<'w, 's> SystemParamFetch<'w, 's> for WorldState { /// /// ``` /// # use bevy_ecs::prelude::*; +/// # use bevy_ecs::system::assert_is_system; /// struct Config(u32); /// struct Myu32Wrapper(u32); -/// fn reset_to(value: Config) -> impl FnMut(ResMut) { +/// fn reset_to_system(value: Config) -> impl FnMut(ResMut) { /// move |mut val| val.0 = value.0 /// } /// /// // .add_system(reset_to(my_config)) -/// # reset_to(Config(10)).system(); +/// # assert_is_system(reset_to_system(Config(10))); /// ``` - pub struct Local<'a, T: Resource>(&'a mut T); // SAFE: Local only accesses internal state