From 27276739c9e7f3199c96bc35e13aad21c509adfd Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Fri, 9 Mar 2018 09:30:52 +0100 Subject: [PATCH] Remove lifetime bounds in higher-ranked lifetimes Those bounds are ignored by the compiler, and will soon trigger an error. According to crater, this is the only crate using these bounds. --- rhusics-ecs/src/collide/systems/basic.rs | 2 +- rhusics-ecs/src/collide/systems/spatial_collision.rs | 4 ++-- rhusics-ecs/src/collide/systems/spatial_sort.rs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/rhusics-ecs/src/collide/systems/basic.rs b/rhusics-ecs/src/collide/systems/basic.rs index 194c9c8..f5d6082 100644 --- a/rhusics-ecs/src/collide/systems/basic.rs +++ b/rhusics-ecs/src/collide/systems/basic.rs @@ -78,7 +78,7 @@ where Y: Default + Send + Sync + 'static, B: Bound + Send + Sync + 'static + Union + Clone, D: HasBound + From<(Entity, B)> + GetId, - for<'b: 'a> &'b T::Storage: Join, + for<'b> &'b T::Storage: Join, { type SystemData = ( Entities<'a>, diff --git a/rhusics-ecs/src/collide/systems/spatial_collision.rs b/rhusics-ecs/src/collide/systems/spatial_collision.rs index 3c3a676..f27c4df 100644 --- a/rhusics-ecs/src/collide/systems/spatial_collision.rs +++ b/rhusics-ecs/src/collide/systems/spatial_collision.rs @@ -101,7 +101,7 @@ where P::Point: Debug + Send + Sync + 'static, T: Component + Clone + Debug + Transform + Send + Sync + 'static, Y: Default + Send + Sync + 'static, - for<'b: 'a> &'b T::Storage: Join, + for<'b> &'b T::Storage: Join, D: Send + Sync + 'static + TreeValue + HasBound + GetId, { type SystemData = ( @@ -160,7 +160,7 @@ where T: Component + Transform + Send + Sync + Clone + 'static, Y: Default + Send + Sync + 'static, B: Bound + Send + Sync + 'static + Union + Clone, - for<'b: 'a> &'b T::Storage: Join, + for<'b> &'b T::Storage: Join, { fn get_broad_data(&self) -> Vec { Vec::default() diff --git a/rhusics-ecs/src/collide/systems/spatial_sort.rs b/rhusics-ecs/src/collide/systems/spatial_sort.rs index 79e7510..1b35fc9 100644 --- a/rhusics-ecs/src/collide/systems/spatial_sort.rs +++ b/rhusics-ecs/src/collide/systems/spatial_sort.rs @@ -68,7 +68,7 @@ where ::Diff: Debug + Send + Sync, T: Component + Clone + Debug + Transform + Send + Sync, Y: Default + Send + Sync + 'static, - for<'b: 'a> &'b T::Storage: Join, + for<'b> &'b T::Storage: Join, D: Send + Sync + 'static + TreeValue + From<(Entity, B)>, { type SystemData = (