reorganise trait soup into wrapper traits

Author: Bluefinger

crates/bevy_entropy/src/component.rs

@@ -1,66 +1,35 @@
 use std::fmt::Debug;
 
 use crate::{
-    entropy_source::EntropySource, resource::GlobalEntropy, Deserialize, RngCore, SeedableRng,
-    Serialize,
+    thread_local_entropy::ThreadLocalEntropy,
+    resource::GlobalEntropy,
+    traits::{EntropySource, SeedableEntropySource},
+    Deserialize, RngCore, SeedableRng, Serialize,
 };
 use bevy_ecs::{prelude::Component, system::ResMut, world::Mut};
 use bevy_reflect::{FromReflect, Reflect, ReflectDeserialize, ReflectSerialize};
 
 #[derive(Debug, Clone, PartialEq, Eq, Component, Reflect, FromReflect, Serialize, Deserialize)]
 #[serde(bound(deserialize = "R: for<'a> Deserialize<'a>"))]
 #[reflect_value(Debug, PartialEq, Serialize, Deserialize)]
-pub struct EntropyComponent<
-    R: RngCore
-        + Clone
-        + Debug
-        + PartialEq
-        + Sync
-        + Send
-        + Serialize
-        + for<'a> Deserialize<'a>
-        + 'static,
->(R);
-
-impl<
-        R: RngCore
-            + Clone
-            + Debug
-            + PartialEq
-            + Sync
-            + Send
-            + Serialize
-            + for<'a> Deserialize<'a>
-            + 'static,
-    > EntropyComponent<R>
-{
+pub struct EntropyComponent<R: EntropySource + 'static>(R);
+
+impl<R: EntropySource + 'static> EntropyComponent<R> {
     #[inline]
     #[must_use]
     pub fn new(rng: R) -> Self {
         Self(rng)
     }
 }
 
-impl<
-        R: RngCore
-            + SeedableRng
-            + Clone
-            + Debug
-            + PartialEq
-            + Sync
-            + Send
-            + Serialize
-            + for<'a> Deserialize<'a>
-            + 'static,
-    > EntropyComponent<R>
-{
+impl<R: SeedableEntropySource + 'static> EntropyComponent<R> {
     #[inline]
     #[must_use]
     pub fn from_entropy() -> Self {
         // Source entropy from thread local user-space RNG instead of
         // system entropy source to reduce overhead when creating many
         // rng instances for many entities at once.
-        Self(R::from_rng(EntropySource).unwrap())
+        Self(R::from_rng(ThreadLocalEntropy).unwrap())
     }
 
     #[inline]
@@ -69,53 +38,13 @@ impl<
     }
 }
 
-impl<
-        R: RngCore
-            + Clone
-            + Debug
-            + PartialEq
-            + Sync
-            + Send
-            + Serialize
-            + for<'a> Deserialize<'a>
-            + 'static,
-    > From<R> for EntropyComponent<R>
-{
-    fn from(value: R) -> Self {
-        Self::new(value)
-    }
-}
-
-impl<
-        R: RngCore
-            + SeedableRng
-            + Clone
-            + Debug
-            + PartialEq
-            + Sync
-            + Send
-            + Serialize
-            + for<'a> Deserialize<'a>
-            + 'static,
-    > Default for EntropyComponent<R>
-{
+impl<R: SeedableEntropySource + 'static> Default for EntropyComponent<R> {
     fn default() -> Self {
         Self::from_entropy()
     }
 }
 
-impl<
-        R: RngCore
-            + Clone
-            + Debug
-            + PartialEq
-            + Sync
-            + Send
-            + Serialize
-            + for<'a> Deserialize<'a>
-            + 'static,
-    > RngCore for EntropyComponent<R>
-{
+impl<R: EntropySource + 'static> RngCore for EntropyComponent<R> {
     #[inline]
     fn next_u32(&mut self) -> u32 {
         self.0.next_u32()
@@ -137,75 +66,33 @@ impl<
     }
 }
 
-impl<
-        R: RngCore
-            + SeedableRng
-            + Clone
-            + Debug
-            + PartialEq
-            + Sync
-            + Send
-            + Serialize
-            + for<'a> Deserialize<'a>
-            + 'static,
-    > SeedableRng for EntropyComponent<R>
-{
+impl<R: SeedableEntropySource + 'static> SeedableRng for EntropyComponent<R> {
     type Seed = R::Seed;
 
     fn from_seed(seed: Self::Seed) -> Self {
         Self::new(R::from_seed(seed))
     }
 }
 
-impl<
-        R: RngCore
-            + SeedableRng
-            + Clone
-            + Debug
-            + PartialEq
-            + Sync
-            + Send
-            + Serialize
-            + for<'a> Deserialize<'a>
-            + 'static,
-    > From<&mut R> for EntropyComponent<R>
-{
+impl<R: EntropySource + 'static> From<R> for EntropyComponent<R> {
+    fn from(value: R) -> Self {
+        Self::new(value)
+    }
+}
+
+impl<R: SeedableEntropySource + 'static> From<&mut R> for EntropyComponent<R> {
     fn from(rng: &mut R) -> Self {
         Self::from_rng(rng).unwrap()
     }
 }
 
-impl<
-        R: RngCore
-            + SeedableRng
-            + Clone
-            + Debug
-            + PartialEq
-            + Sync
-            + Send
-            + Serialize
-            + for<'a> Deserialize<'a>
-            + 'static,
-    > From<&mut Mut<'_, R>> for EntropyComponent<R>
-{
+impl<R: SeedableEntropySource + 'static> From<&mut Mut<'_, R>> for EntropyComponent<R> {
     fn from(rng: &mut Mut<'_, R>) -> Self {
         Self::from_rng(rng.as_mut()).unwrap()
     }
 }
 
-impl<
-        R: RngCore
-            + SeedableRng
-            + Clone
-            + Debug
-            + PartialEq
-            + Sync
-            + Send
-            + Serialize
-            + for<'a> Deserialize<'a>
-            + 'static,
-    > From<&mut ResMut<'_, GlobalEntropy<R>>> for EntropyComponent<R>
-{
+impl<R: SeedableEntropySource + 'static> From<&mut ResMut<'_, GlobalEntropy<R>>> for EntropyComponent<R> {
     fn from(rng: &mut ResMut<'_, GlobalEntropy<R>>) -> Self {
         Self::from_rng(rng.as_mut()).unwrap()
     }

crates/bevy_entropy/src/lib.rs

@@ -2,17 +2,19 @@
 #![doc = include_str!("../README.md")]
 
 pub mod component;
-mod entropy_source;
 pub mod prelude;
 pub mod resource;
+mod thread_local_entropy;
+mod traits;
 
-use std::{fmt::Debug, marker::PhantomData};
+use std::marker::PhantomData;
 
 use bevy_app::{App, Plugin};
 use component::EntropyComponent;
 use rand_core::{RngCore, SeedableRng};
 use resource::GlobalEntropy;
 use serde::{Deserialize, Serialize};
+use traits::SeedableEntropySource;
 
 /// Plugin for integrating a PRNG that implements `RngCore` into
 /// the bevy engine, registering types for a global resource and
@@ -36,34 +38,12 @@ use serde::{Deserialize, Serialize};
 ///   println!("Random value: {}", rng.next_u32());
 /// }
 /// ```
-pub struct EntropyPlugin<
-    R: RngCore
-        + SeedableRng
-        + Clone
-        + Debug
-        + PartialEq
-        + Sync
-        + Send
-        + Serialize
-        + for<'a> Deserialize<'a>
-        + 'static,
-> {
+pub struct EntropyPlugin<R: SeedableEntropySource + 'static> {
     seed: Option<R::Seed>,
     _marker: PhantomData<&'static mut R>,
 }
 
-impl<
-        R: RngCore
-            + SeedableRng
-            + Clone
-            + Debug
-            + PartialEq
-            + Sync
-            + Send
-            + Serialize
-            + for<'a> Deserialize<'a>
-            + 'static,
-    > EntropyPlugin<R>
+impl<R: SeedableEntropySource + 'static> EntropyPlugin<R>
 where
     R::Seed: Send + Sync + Copy,
 {
@@ -83,18 +63,7 @@ where
     }
 }
 
-impl<
-        R: RngCore
-            + SeedableRng
-            + Clone
-            + Debug
-            + PartialEq
-            + Sync
-            + Send
-            + Serialize
-            + for<'a> Deserialize<'a>
-            + 'static,
-    > Default for EntropyPlugin<R>
+impl<R: SeedableEntropySource + 'static> Default for EntropyPlugin<R>
 where
     R::Seed: Send + Sync + Copy,
 {
@@ -103,18 +72,7 @@ where
     }
 }
 
-impl<
-        R: RngCore
-            + SeedableRng
-            + Clone
-            + Debug
-            + PartialEq
-            + Sync
-            + Send
-            + Serialize
-            + for<'a> Deserialize<'a>
-            + 'static,
-    > Plugin for EntropyPlugin<R>
+impl<R: SeedableEntropySource + 'static> Plugin for EntropyPlugin<R>
 where
     R::Seed: Send + Sync + Copy,
 {