DRY

Author: dlom

src/system.rs

@@ -1,3 +1,4 @@
+use crate::util::remove_system;
 use crate::world::AsyncWorld;
 use crate::{die, recv_and_yield};
 use bevy_ecs::prelude::*;
@@ -54,11 +55,7 @@ impl AsyncSystem {
 	pub async fn unregister(self) {
 		let Self { id, world } = self;
 		if let Some(id) = Arc::into_inner(id) {
-			world
-				.apply(move |world: &mut World| {
-					world.remove_system(id).unwrap_or_else(die);
-				})
-				.await;
+			world.apply(remove_system(id)).await;
 		}
 	}
 }
@@ -148,11 +145,7 @@ impl<I: Send + 'static, O: Send + 'static> AsyncIOSystem<I, O> {
 	pub async fn unregister(self) {
 		let Self { id, world, _pd } = self;
 		if let Some(id) = Arc::into_inner(id) {
-			world
-				.apply(move |world: &mut World| {
-					world.remove_system(id).unwrap_or_else(die);
-				})
-				.await
+			world.apply(remove_system(id)).await
 		}
 	}
 }

src/util.rs

@@ -1,5 +1,5 @@
 use bevy_ecs::prelude::*;
-use bevy_ecs::system::Command;
+use bevy_ecs::system::{Command, SystemId};
 
 pub(crate) fn insert<B: Bundle>(id: Entity, bundle: B) -> impl Command {
 	move |world: &mut World| {
@@ -24,3 +24,9 @@ pub(crate) fn remove_resource<R: Resource>() -> impl Command {
 		world.remove_resource::<R>();
 	}
 }
+
+pub(crate) fn remove_system<I: 'static, O: 'static>(system_id: SystemId<I, O>) -> impl Command {
+	move |world: &mut World| {
+		world.remove_system(system_id).ok();
+	}
+}