summaryrefslogtreecommitdiff
path: root/ecs/src/system
diff options
context:
space:
mode:
authorHampusM <hampus@hampusmat.com>2024-06-06 22:27:03 +0200
committerHampusM <hampus@hampusmat.com>2024-06-06 22:27:03 +0200
commit8adf787bca7744344b83dace7997031b07785a25 (patch)
tree4b510178e39593f08e548972f493e1856f703a15 /ecs/src/system
parentcb1ff29c8c7fa77bbb4e532eaa7e45df717a58ef (diff)
refactor(ecs): rename tuple filter to tuple reduce
Diffstat (limited to 'ecs/src/system')
-rw-r--r--ecs/src/system/stateful.rs12
1 files changed, 6 insertions, 6 deletions
diff --git a/ecs/src/system/stateful.rs b/ecs/src/system/stateful.rs
index 8d56a13..e74c0ee 100644
--- a/ecs/src/system/stateful.rs
+++ b/ecs/src/system/stateful.rs
@@ -9,9 +9,9 @@ use crate::lock::Lock;
use crate::system::util::check_params_are_compatible;
use crate::system::{ComponentRefMut, Into as IntoSystem, Param, System, TypeErased};
use crate::tuple::{
- Filter as TupleFilter,
- FilterExclude as TupleFilterExclude,
IntoInOptions as TupleIntoInOptions,
+ Reduce as TupleReduce,
+ ReduceNoOp as TupleReduceNoOp,
TakeOptionElementResult as TupleTakeOptionElementResult,
WithOptionElements as TupleWithOptionElements,
};
@@ -33,10 +33,10 @@ macro_rules! impl_system {
Func: Fn(#(TParam~I,)*) + Copy + RefUnwindSafe + UnwindSafe + 'static,
#(TParam~I: Param<'world>,)*
#(TParam~I::Input: 'static,)*
- (#(TParam~I::Input,)*): TupleFilter,
- <(#(TParam~I::Input,)*) as TupleFilter>::Out: TupleIntoInOptions
+ (#(TParam~I::Input,)*): TupleReduce,
+ <(#(TParam~I::Input,)*) as TupleReduce>::Out: TupleIntoInOptions
{
- type Input = <(#(TParam~I::Input,)*) as TupleFilter>::Out;
+ type Input = <(#(TParam~I::Input,)*) as TupleReduce>::Out;
fn initialize(mut self, input: Self::Input) -> Self
{
@@ -44,7 +44,7 @@ macro_rules! impl_system {
#(
if TypeId::of::<TParam~I::Input>() !=
- TypeId::of::<TupleFilterExclude>()
+ TypeId::of::<TupleReduceNoOp>()
{
let input = match option_input.take::<TParam~I::Input>() {
TupleTakeOptionElementResult::Found(input) => input,