From 8aae84193034ecaeb7631879753ddfa6bbba9a9a Mon Sep 17 00:00:00 2001
From: yukkop <hectic.yukkop@gmail.com>
Date: Fri, 5 Apr 2024 13:19:17 +0200
Subject: [PATCH] feat: update strum version

---
 crate/bevy_controls/example/basic/Cargo.lock | 37 +++++++++++++++-----
 crate/bevy_controls/example/basic/Cargo.toml |  4 +--
 crate/bevy_controls/src/plugin.rs            |  1 +
 3 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/crate/bevy_controls/example/basic/Cargo.lock b/crate/bevy_controls/example/basic/Cargo.lock
index eb70c35..dbbb5fc 100644
--- a/crate/bevy_controls/example/basic/Cargo.lock
+++ b/crate/bevy_controls/example/basic/Cargo.lock
@@ -268,8 +268,8 @@ dependencies = [
  "bevy",
  "bevy_controls",
  "bevy_controls_derive",
- "strum",
- "strum_macros",
+ "strum 0.26.2",
+ "strum_macros 0.26.2",
 ]
 
 [[package]]
@@ -365,8 +365,8 @@ dependencies = [
  "bevy_input",
  "bevy_utils 0.12.1",
  "log",
- "strum",
- "strum_macros",
+ "strum 0.25.0",
+ "strum_macros 0.25.3",
 ]
 
 [[package]]
@@ -1348,7 +1348,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3e3d747f100290a1ca24b752186f61f6637e1deffe3bf6320de6fcb29510a307"
 dependencies = [
  "bitflags 2.4.2",
- "libloading 0.7.4",
+ "libloading 0.8.3",
  "winapi",
 ]
 
@@ -1370,7 +1370,7 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412"
 dependencies = [
- "libloading 0.7.4",
+ "libloading 0.8.3",
 ]
 
 [[package]]
@@ -1721,7 +1721,7 @@ dependencies = [
  "bitflags 2.4.2",
  "com",
  "libc",
- "libloading 0.7.4",
+ "libloading 0.8.3",
  "thiserror",
  "widestring",
  "winapi",
@@ -1886,7 +1886,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19"
 dependencies = [
  "cfg-if",
- "windows-targets 0.48.5",
+ "windows-targets 0.52.4",
 ]
 
 [[package]]
@@ -2620,6 +2620,12 @@ version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125"
 
+[[package]]
+name = "strum"
+version = "0.26.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29"
+
 [[package]]
 name = "strum_macros"
 version = "0.25.3"
@@ -2633,6 +2639,19 @@ dependencies = [
  "syn 2.0.48",
 ]
 
+[[package]]
+name = "strum_macros"
+version = "0.26.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c6cf59daf282c0a494ba14fd21610a0325f9f90ec9d1231dea26bcb1d696c946"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "quote",
+ "rustversion",
+ "syn 2.0.48",
+]
+
 [[package]]
 name = "svg_fmt"
 version = "0.4.1"
@@ -3199,7 +3218,7 @@ dependencies = [
  "js-sys",
  "khronos-egl",
  "libc",
- "libloading 0.7.4",
+ "libloading 0.8.3",
  "log",
  "metal",
  "naga",
diff --git a/crate/bevy_controls/example/basic/Cargo.toml b/crate/bevy_controls/example/basic/Cargo.toml
index dfd7cf9..db9d152 100644
--- a/crate/bevy_controls/example/basic/Cargo.toml
+++ b/crate/bevy_controls/example/basic/Cargo.toml
@@ -21,5 +21,5 @@ bevy = { version = "0.13.2", default-features = false, features = [
 ]}
 bevy_controls = { path = "./../../" } 
 bevy_controls_derive = { path = "./../../../bevy_controls_derive" } 
-strum = "0.25.0"
-strum_macros = "0.25.3"
+strum_macros = "0.26.2"
+strum = "0.26.2"
diff --git a/crate/bevy_controls/src/plugin.rs b/crate/bevy_controls/src/plugin.rs
index eec9929..37e5971 100644
--- a/crate/bevy_controls/src/plugin.rs
+++ b/crate/bevy_controls/src/plugin.rs
@@ -158,6 +158,7 @@ impl<A: Action, Ic: InputsContainer<A>, Gs: GameState> ControlsPlugin<A, Ic, Gs>
 
         match &binding.input {
           ButtonCombination::Single(input_type) => {
+            // TODO: exclude if used
             if collected_inputs.contains_key(&*input_type) {
               inputs.forced_set(**action, true);
             } else {