From 12c7759f667b80f4e54331d186e27a446e603f3a Mon Sep 17 00:00:00 2001
From: Nolan Darilek <nolan@thewordnerd.info>
Date: Mon, 4 Apr 2022 10:00:57 -0500
Subject: [PATCH] Remove more unnecessary bounds.

---
 src/navigation.rs | 6 +++---
 src/sound.rs      | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/navigation.rs b/src/navigation.rs
index c1185f8..67fa807 100644
--- a/src/navigation.rs
+++ b/src/navigation.rs
@@ -64,7 +64,7 @@ fn movement_controls<S, A: 'static>(
     >,
     exploration_focused: Query<Entity, With<ExplorationFocused>>,
 ) where
-    S: bevy::ecs::component::Component + Clone + Debug + Eq + Hash,
+    S: 'static + Clone + Debug + Eq + Hash + Send + Sync,
     A: Hash + Eq + Clone + Send + Sync,
 {
     for (entity, mut velocity, mut speed, max_speed, rotation_speed, mut position, destination) in
@@ -229,7 +229,7 @@ fn snap<S, A: 'static>(
     >,
 ) -> Result<(), Box<dyn Error>>
 where
-    S: bevy::ecs::component::Component + Clone + Debug + Eq + Hash,
+    S: 'static + Clone + Debug + Eq + Hash + Send + Sync,
     A: Hash + Eq + Clone + Send + Sync,
 {
     if let Some(action) = config.action_snap_left.clone() {
@@ -385,7 +385,7 @@ impl<'a, S, A> Default for NavigationPlugin<'a, S, A> {
 
 impl<'a, S, A> Plugin for NavigationPlugin<'a, S, A>
 where
-    S: bevy::ecs::component::Component + Clone + Debug + Eq + Hash,
+    S: 'static + Clone + Debug + Eq + Hash + Send + Sync,
     A: Hash + Eq + Clone + Send + Sync,
     'a: 'static,
 {
diff --git a/src/sound.rs b/src/sound.rs
index 9d9f71b..6705ac3 100644
--- a/src/sound.rs
+++ b/src/sound.rs
@@ -1,6 +1,6 @@
 use std::{collections::HashMap, fmt::Debug, hash::Hash, time::Duration};
 
-use bevy::{asset::HandleId, ecs::component::Component, prelude::*, transform::TransformSystem};
+use bevy::{asset::HandleId, prelude::*, transform::TransformSystem};
 use bevy_openal::{Buffer, Context, Sound, SoundState};
 
 use rand::random;
@@ -178,7 +178,7 @@ fn sound_icon<S>(
     )>,
     buffers: Res<Assets<Buffer>>,
 ) where
-    S: Component + Clone + Debug + Eq + Hash,
+    S: 'static + Clone + Debug + Eq + Hash + Send + Sync,
 {
     if !(*config).sound_icon_states.is_empty()
         && !config.sound_icon_states.contains(state.current())
@@ -292,7 +292,7 @@ impl<'a, S> Default for SoundPlugin<'a, S> {
 
 impl<'a, S> Plugin for SoundPlugin<'a, S>
 where
-    S: bevy::ecs::component::Component + Clone + Debug + Eq + Hash,
+    S: 'static + Clone + Debug + Eq + Hash + Send + Sync,
     'a: 'static,
 {
     fn build(&self, app: &mut App) {