[Merged by Bors] - Add more FromWorld implementations

crates/bevy_ecs/src/system/function_system.rs

@@ -1,6 +1,7 @@
 use crate::{
     archetype::{Archetype, ArchetypeComponentId, ArchetypeGeneration, ArchetypeId},
     component::ComponentId,
+    prelude::FromWorld,
     query::{Access, FilteredAccessSet},
     schedule::SystemLabel,
     system::{
@@ -229,6 +230,12 @@ impl<Param: SystemParam> SystemState<Param> {
     }
 }
 
+impl<Param: SystemParam> FromWorld for SystemState<Param> {
+    fn from_world(world: &mut World) -> Self {
+        Self::new(world)
+    }
+}
+
 /// Conversion trait to turn something into a [`System`].
 ///
 /// Use this to get a system from a function. Also note that every system implements this trait as

crates/bevy_ecs/src/world/mod.rs

@@ -3,6 +3,7 @@ mod spawn_batch;
 mod world_cell;
 
 pub use crate::change_detection::Mut;
+use bevy_ecs_macros::all_tuples;
 pub use entity_ref::*;
 pub use spawn_batch::*;
 pub use world_cell::*;
@@ -1316,6 +1317,25 @@ impl<T: Default> FromWorld for T {
     }
 }
 
+/// Wrapper type to enable getting multiple [`FromWorld`] types in one type.
+///
+/// This wrapper is necessary because a [`FromWorld`] implementation for a tuple of
+/// [`FromWorld`] implementing types would conflict with the [`FromWorld`] impl over all
+/// [`Default`] type.
+pub struct FromWorldWrap<T>(pub T);
+
+macro_rules! impl_from_world {
+    ($($t:ident),*) => {
+        impl<$($t: FromWorld,)*> FromWorld for FromWorldWrap<($($t,)*)> {
+            fn from_world(_world: &mut World) -> Self {
+                FromWorldWrap(($($t::from_world(_world),)*))
+            }
+        }
+    };
+}
+
+all_tuples!(impl_from_world, 0, 12, T);
+
 struct MainThreadValidator {
     main_thread: std::thread::ThreadId,
 }