Merge pull request 'clippy + rustfmt' (#1) from wip into master

Reviewed-on: #1

.cargo/config.toml

@@ -1,2 +0,0 @@
-[profile.dev.package."*"]
-opt-level = 2

.gitignore

@@ -1 +1,3 @@
 /target
+Cargo.lock
+.cargo

README.md

@@ -1,7 +1,6 @@
 # bevy_basic_interaction
 
 ![License](https://img.shields.io/badge/license-0BSD%2FMIT%2FApache-blue.svg)
-![Tag](https://img.shields.io/github/v/tag/exvacuum/bevy_basic_interaction)
 
 This crate provides an `InteractionPlugin` which enables a basic interaction system.
 
@@ -20,7 +19,7 @@ If enough people (like literally 1 person) want this on crates.io I'll consider
 
 ```toml
 [dependencies.bevy_basic_interaction]
-git = "https://git.exvacuum.dev/bevy_basic_interaction"
+git = "https://git.soaos.dev/soaos/bevy_basic_interaction"
 ```
 
 ## Usage

src/components.rs

@@ -27,7 +27,7 @@ pub struct Interactable {
     /// An optional description of the action
     pub description: Option<String>,
     /// Predicate to check to see if interaction is possible
-    pub predicate: Option<Arc<Box<dyn Fn(Entity, &World) -> bool + Send + Sync>>>,
+    pub predicate: Option<Arc<Box<dyn Fn(Entity, &mut World) -> bool + Send + Sync>>>,
     pub(crate) exclusive: bool,
     pub(crate) max_distance_squared: f32,
     pub(crate) possible: bool,
@@ -41,7 +41,13 @@ impl Interactable {
     /// If exclusive, this interactable will only be interacted with if it's the closest one to the
     /// interactor, and the interaction will *not* be processed for any other in-range
     /// interactables.
-    pub fn new(max_distance: f32, exclusive: bool, name: Option<String>, description: Option<String>, predicate: Option<Box<dyn Fn(Entity, &World) -> bool + Send + Sync>>) -> Self {
+    pub fn new(
+        max_distance: f32,
+        exclusive: bool,
+        name: Option<String>,
+        description: Option<String>,
+        predicate: Option<Box<dyn Fn(Entity, &mut World) -> bool + Send + Sync>>,
+    ) -> Self {
         Self {
             name,
             description,
@@ -64,4 +70,3 @@ impl Default for Interactable {
         Self::new(1.0, false, None, None, None)
     }
 }
-

src/lib.rs

@@ -1,4 +1,5 @@
 #![warn(missing_docs)]
+#![allow(clippy::type_complexity)]
 
 //! This library provides basic "interaction" functionality
 //! Entities which can trigger interactions get the `Interactor` component, and entities which can
@@ -28,7 +29,11 @@ impl Plugin for InteractionPlugin {
     fn build(&self, app: &mut App) {
         app.add_systems(
             Update,
-            (handle_interactor_events, update_interactor_targets, update_interactable_predicates),
+            (
+                handle_interactor_events,
+                update_interactor_targets,
+                update_interactable_predicates,
+            ),
         )
         .add_event::<InteractorFiredEvent>()
         .add_event::<InteractionEvent>();
@@ -125,7 +130,10 @@ fn update_interactable_predicates(world: &mut World) {
             interactable.possible = predicate(*interactable_entity, world);
         }
     }
-    for ((_, mut interactable), (_, temp)) in interactable_query.iter_mut(world).zip(interactables.into_iter()) {
+    for ((_, mut interactable), (_, temp)) in interactable_query
+        .iter_mut(world)
+        .zip(interactables.into_iter())
+    {
         *interactable = temp;
     }
 }