Compare commits

...

2 Commits

Author SHA1 Message Date
6ff5eb15a9 Appease Clippy.
All checks were successful
continuous-integration/drone/push Build is passing
2022-07-06 10:13:59 -05:00
6ac7beb788 Bump dependencies. 2022-07-06 10:13:45 -05:00
5 changed files with 11 additions and 11 deletions

View File

@ -36,6 +36,6 @@ maze_generator = "2"
once_cell = "1" once_cell = "1"
pathfinding = "3" pathfinding = "3"
rand = "0.8" rand = "0.8"
sentry = "0.26" sentry = "0.27"
serde = "1" serde = "1"
shadowcast = "0.8" shadowcast = "0.8"

View File

@ -438,20 +438,23 @@ impl<S, A> Default for ExplorationConfig<S, A> {
} }
} }
pub struct ExplorationPlugin<'a, S, A, D>(PhantomData<&'a S>, PhantomData<&'a A>, PhantomData<D>); pub struct ExplorationPlugin<'a, S: 'static, A: 'static, D>(
PhantomData<&'a S>,
PhantomData<&'static A>,
PhantomData<D>,
);
impl<'a, S, A, D> Default for ExplorationPlugin<'a, S, A, D> { impl<S, A, D> Default for ExplorationPlugin<'static, S, A, D> {
fn default() -> Self { fn default() -> Self {
Self(PhantomData, PhantomData, PhantomData) Self(PhantomData, PhantomData, PhantomData)
} }
} }
impl<'a, S, A, D> Plugin for ExplorationPlugin<'a, S, A, D> impl<S, A, D> Plugin for ExplorationPlugin<'static, S, A, D>
where where
S: Clone + Debug + Eq + Hash + Send + Sync, S: Clone + Debug + Eq + Hash + Send + Sync,
A: Hash + Eq + Clone + Send + Sync, A: Hash + Eq + Clone + Send + Sync,
D: 'static + Clone + Default + Send + Sync, D: 'static + Clone + Default + Send + Sync,
'a: 'static,
{ {
fn build(&self, app: &mut App) { fn build(&self, app: &mut App) {
if !app.world.contains_resource::<ExplorationConfig<S, A>>() { if !app.world.contains_resource::<ExplorationConfig<S, A>>() {

View File

@ -365,11 +365,10 @@ impl<'a, S, A> Default for NavigationPlugin<'a, S, A> {
} }
} }
impl<'a, S, A> Plugin for NavigationPlugin<'a, S, A> impl<S, A> Plugin for NavigationPlugin<'static, S, A>
where where
S: 'static + Clone + Copy + Debug + Eq + Hash + Send + Sync, S: 'static + Clone + Copy + Debug + Eq + Hash + Send + Sync,
A: Hash + Eq + Copy + Send + Sync, A: Hash + Eq + Copy + Send + Sync,
'a: 'static,
{ {
fn build(&self, app: &mut App) { fn build(&self, app: &mut App) {
if !app.world.contains_resource::<NavigationConfig<S, A>>() { if !app.world.contains_resource::<NavigationConfig<S, A>>() {

View File

@ -287,10 +287,9 @@ impl<'a, S> Default for SoundIconPlugin<'a, S> {
} }
} }
impl<'a, S> Plugin for SoundIconPlugin<'a, S> impl<S> Plugin for SoundIconPlugin<'static, S>
where where
S: 'static + Clone + Debug + Eq + Hash + Send + Sync, S: 'static + Clone + Debug + Eq + Hash + Send + Sync,
'a: 'static,
{ {
fn build(&self, app: &mut App) { fn build(&self, app: &mut App) {
app.add_system(added) app.add_system(added)

View File

@ -28,10 +28,9 @@ impl<'a, S> Default for SoundPlugin<'a, S> {
} }
} }
impl<'a, S> Plugin for SoundPlugin<'a, S> impl<S> Plugin for SoundPlugin<'static, S>
where where
S: 'static + Clone + Debug + Eq + Hash + Send + Sync, S: 'static + Clone + Debug + Eq + Hash + Send + Sync,
'a: 'static,
{ {
fn build(&self, app: &mut App) { fn build(&self, app: &mut App) {
let _core_config = *app.world.get_resource::<CoreConfig>().unwrap(); let _core_config = *app.world.get_resource::<CoreConfig>().unwrap();