diff --git a/crates/bevy_ecs/src/lib.rs b/crates/bevy_ecs/src/lib.rs index c3061d1580..d575c9fb94 100644 --- a/crates/bevy_ecs/src/lib.rs +++ b/crates/bevy_ecs/src/lib.rs @@ -1110,7 +1110,7 @@ mod tests { fn resource_scope() { let mut world = World::default(); world.insert_resource::(0); - world.resource_scope(|mut value: Mut, world: &mut World| { + world.resource_scope(|world: &mut World, mut value: Mut| { *value += 1; assert!(!world.contains_resource::()); }); diff --git a/crates/bevy_ecs/src/world/mod.rs b/crates/bevy_ecs/src/world/mod.rs index 019434be5d..bd6c10e6a9 100644 --- a/crates/bevy_ecs/src/world/mod.rs +++ b/crates/bevy_ecs/src/world/mod.rs @@ -658,7 +658,7 @@ impl World { /// world.insert_resource(A(1)); /// let entity = world.spawn().insert(B(1)).id(); /// - /// world.resource_scope(|mut a: Mut, world| { + /// world.resource_scope(|world, mut a: Mut| { /// let b = world.get_mut::(entity).unwrap(); /// a.0 += b.0; /// }); @@ -666,7 +666,7 @@ impl World { /// ``` pub fn resource_scope( &mut self, - f: impl FnOnce(Mut, &mut World) -> U, + f: impl FnOnce(&mut World, Mut) -> U, ) -> U { let component_id = self .components @@ -692,7 +692,7 @@ impl World { last_change_tick: self.last_change_tick(), change_tick: self.change_tick(), }; - let result = f(value, self); + let result = f(self, value); let resource_archetype = self.archetypes.resource_mut(); let unique_components = resource_archetype.unique_components_mut(); let column = unique_components diff --git a/crates/bevy_render/src/render_graph/nodes/pass_node.rs b/crates/bevy_render/src/render_graph/nodes/pass_node.rs index 16cf5fef31..5258f9fa3e 100644 --- a/crates/bevy_render/src/render_graph/nodes/pass_node.rs +++ b/crates/bevy_render/src/render_graph/nodes/pass_node.rs @@ -128,7 +128,7 @@ where let query_state = self.query_state.get_or_insert_with(|| world.query()); let cameras = &self.cameras; let commands = &mut self.commands; - world.resource_scope(|mut active_cameras: Mut, world| { + world.resource_scope(|world, mut active_cameras: Mut| { let mut pipeline_camera_commands = HashMap::default(); let pipelines = world.get_resource::>().unwrap(); let render_resource_context = &**world diff --git a/crates/bevy_scene/src/scene_spawner.rs b/crates/bevy_scene/src/scene_spawner.rs index 71fd41aabf..b62015c509 100644 --- a/crates/bevy_scene/src/scene_spawner.rs +++ b/crates/bevy_scene/src/scene_spawner.rs @@ -115,7 +115,7 @@ impl SceneSpawner { scene_handle: &Handle, entity_map: &mut EntityMap, ) -> Result<(), SceneSpawnError> { - world.resource_scope(|scenes: Mut>, world| { + world.resource_scope(|world, scenes: Mut>| { let scene = scenes .get(scene_handle) @@ -145,7 +145,7 @@ impl SceneSpawner { }; let type_registry = world.get_resource::().unwrap().clone(); let type_registry = type_registry.read(); - world.resource_scope(|scenes: Mut>, world| { + world.resource_scope(|world, scenes: Mut>| { let scene = scenes .get(&scene_handle) @@ -297,7 +297,7 @@ impl SceneSpawner { } pub fn scene_spawner_system(world: &mut World) { - world.resource_scope(|mut scene_spawner: Mut, world| { + world.resource_scope(|world, mut scene_spawner: Mut| { let scene_asset_events = world .get_resource::>>() .unwrap(); diff --git a/crates/bevy_wgpu/src/wgpu_renderer.rs b/crates/bevy_wgpu/src/wgpu_renderer.rs index cdd5e3cf0f..76308c12c1 100644 --- a/crates/bevy_wgpu/src/wgpu_renderer.rs +++ b/crates/bevy_wgpu/src/wgpu_renderer.rs @@ -101,7 +101,7 @@ impl WgpuRenderer { } pub fn run_graph(&mut self, world: &mut World) { - world.resource_scope(|mut render_graph: Mut, world| { + world.resource_scope(|world, mut render_graph: Mut| { render_graph.prepare(world); // stage nodes let mut stager = DependentNodeStager::loose_grouping();