Skip to content

Commit 75f40d0

Browse files
BoxyUwUBoxyUwU
committed
rename _target_filter
1 parent 5949f5a commit 75f40d0

File tree

8 files changed

+152
-286
lines changed

8 files changed

+152
-286
lines changed

‎crates/bevy_ecs/src/query/fetch.rs

Lines changed: 30 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -190,20 +190,16 @@ unsafe impl FetchState for EntityState {
190190
}
191191

192192
#[inline]
193-
fn matches_archetype(
194-
&self,
195-
_archetype: &Archetype,
196-
_target_filter: &Self::TargetFilter,
197-
) -> bool {
193+
fn matches_archetype(&self, _archetype: &Archetype, _: &Self::TargetFilter) -> bool {
198194
true
199195
}
200196

201197
#[inline]
202-
fn matches_table(&self, _table: &Table, _target_filter: &Self::TargetFilter) -> bool {
198+
fn matches_table(&self, _table: &Table, _: &Self::TargetFilter) -> bool {
203199
true
204200
}
205201

206-
fn deduplicate_targets(_target_filter: &mut Self::TargetFilter) {}
202+
fn deduplicate_targets(_: &mut Self::TargetFilter) {}
207203
}
208204

209205
impl<'w, 's> Fetch<'w, 's> for EntityFetch {
@@ -219,7 +215,7 @@ impl<'w, 's> Fetch<'w, 's> for EntityFetch {
219215
unsafe fn init(
220216
_world: &World,
221217
_state: &Self::State,
222-
_target_filter: &Self::TargetFilter,
218+
_: &Self::TargetFilter,
223219
_last_change_tick: u32,
224220
_change_tick: u32,
225221
) -> Self {
@@ -232,20 +228,15 @@ impl<'w, 's> Fetch<'w, 's> for EntityFetch {
232228
unsafe fn set_archetype(
233229
&mut self,
234230
_state: &Self::State,
235-
_target_filter: &Self::TargetFilter,
231+
_: &Self::TargetFilter,
236232
archetype: &Archetype,
237233
_tables: &Tables,
238234
) {
239235
self.entities = archetype.entities().as_ptr();
240236
}
241237

242238
#[inline]
243-
unsafe fn set_table(
244-
&mut self,
245-
_state: &Self::State,
246-
_target_filter: &Self::TargetFilter,
247-
table: &Table,
248-
) {
239+
unsafe fn set_table(&mut self, _state: &Self::State, _: &Self::TargetFilter, table: &Table) {
249240
self.entities = table.entities().as_ptr();
250241
}
251242

@@ -308,19 +299,15 @@ unsafe impl<T: Component> FetchState for ReadState<T> {
308299
}
309300
}
310301

311-
fn matches_archetype(
312-
&self,
313-
archetype: &Archetype,
314-
_target_filter: &Self::TargetFilter,
315-
) -> bool {
302+
fn matches_archetype(&self, archetype: &Archetype, _: &Self::TargetFilter) -> bool {
316303
archetype.contains(self.component_id, None)
317304
}
318305

319-
fn matches_table(&self, table: &Table, _target_filter: &Self::TargetFilter) -> bool {
306+
fn matches_table(&self, table: &Table, _: &Self::TargetFilter) -> bool {
320307
table.has_column(self.component_id, None)
321308
}
322309

323-
fn deduplicate_targets(_target_filter: &mut Self::TargetFilter) {}
310+
fn deduplicate_targets(_: &mut Self::TargetFilter) {}
324311
}
325312

326313
/// The [`Fetch`] of `&T`.
@@ -363,7 +350,7 @@ impl<'w, 's, T: Component> Fetch<'w, 's> for ReadFetch<T> {
363350
unsafe fn init(
364351
world: &World,
365352
state: &Self::State,
366-
_target_filter: &Self::TargetFilter,
353+
_: &Self::TargetFilter,
367354
_last_change_tick: u32,
368355
_change_tick: u32,
369356
) -> Self {
@@ -388,7 +375,7 @@ impl<'w, 's, T: Component> Fetch<'w, 's> for ReadFetch<T> {
388375
unsafe fn set_archetype(
389376
&mut self,
390377
state: &Self::State,
391-
_target_filter: &Self::TargetFilter,
378+
_: &Self::TargetFilter,
392379
archetype: &Archetype,
393380
tables: &Tables,
394381
) {
@@ -405,12 +392,7 @@ impl<'w, 's, T: Component> Fetch<'w, 's> for ReadFetch<T> {
405392
}
406393

407394
#[inline]
408-
unsafe fn set_table(
409-
&mut self,
410-
state: &Self::State,
411-
_target_filter: &Self::TargetFilter,
412-
table: &Table,
413-
) {
395+
unsafe fn set_table(&mut self, state: &Self::State, _: &Self::TargetFilter, table: &Table) {
414396
self.table_components = table
415397
.get_column(state.component_id, None)
416398
.unwrap()
@@ -513,19 +495,15 @@ unsafe impl<T: Component> FetchState for WriteState<T> {
513495
}
514496
}
515497

516-
fn matches_archetype(
517-
&self,
518-
archetype: &Archetype,
519-
_target_filter: &Self::TargetFilter,
520-
) -> bool {
498+
fn matches_archetype(&self, archetype: &Archetype, _: &Self::TargetFilter) -> bool {
521499
archetype.contains(self.component_id, None)
522500
}
523501

524-
fn matches_table(&self, table: &Table, _target_filter: &Self::TargetFilter) -> bool {
502+
fn matches_table(&self, table: &Table, _: &Self::TargetFilter) -> bool {
525503
table.has_column(self.component_id, None)
526504
}
527505

528-
fn deduplicate_targets(_target_filter: &mut Self::TargetFilter) {}
506+
fn deduplicate_targets(_: &mut Self::TargetFilter) {}
529507
}
530508

531509
impl<'w, 's, T: Component> Fetch<'w, 's> for WriteFetch<T> {
@@ -544,7 +522,7 @@ impl<'w, 's, T: Component> Fetch<'w, 's> for WriteFetch<T> {
544522
unsafe fn init(
545523
world: &World,
546524
state: &Self::State,
547-
_target_filter: &Self::TargetFilter,
525+
_: &Self::TargetFilter,
548526
last_change_tick: u32,
549527
change_tick: u32,
550528
) -> Self {
@@ -572,7 +550,7 @@ impl<'w, 's, T: Component> Fetch<'w, 's> for WriteFetch<T> {
572550
unsafe fn set_archetype(
573551
&mut self,
574552
state: &Self::State,
575-
_target_filter: &Self::TargetFilter,
553+
_: &Self::TargetFilter,
576554
archetype: &Archetype,
577555
tables: &Tables,
578556
) {
@@ -590,12 +568,7 @@ impl<'w, 's, T: Component> Fetch<'w, 's> for WriteFetch<T> {
590568
}
591569

592570
#[inline]
593-
unsafe fn set_table(
594-
&mut self,
595-
state: &Self::State,
596-
_target_filter: &Self::TargetFilter,
597-
table: &Table,
598-
) {
571+
unsafe fn set_table(&mut self, state: &Self::State, _: &Self::TargetFilter, table: &Table) {
599572
let column = table.get_column(state.component_id, None).unwrap();
600573
self.table_components = column.get_data_ptr().cast::<T>();
601574
self.table_ticks = column.get_ticks_ptr();
@@ -872,7 +845,7 @@ impl<'w, 's, T: Component> Fetch<'w, 's> for ReadRelationFetch<T> {
872845
unsafe fn set_archetype(
873846
&mut self,
874847
_state: &Self::State,
875-
_target_filter: &Self::TargetFilter,
848+
_: &Self::TargetFilter,
876849
archetype: &Archetype,
877850
tables: &Tables,
878851
) {
@@ -882,12 +855,7 @@ impl<'w, 's, T: Component> Fetch<'w, 's> for ReadRelationFetch<T> {
882855
self.entities = archetype.entities();
883856
}
884857

885-
unsafe fn set_table(
886-
&mut self,
887-
_state: &Self::State,
888-
_target_filter: &Self::TargetFilter,
889-
table: &Table,
890-
) {
858+
unsafe fn set_table(&mut self, _state: &Self::State, _: &Self::TargetFilter, table: &Table) {
891859
self.table_ptr = table;
892860
}
893861

@@ -1202,7 +1170,7 @@ impl<'w, 's, T: Component> Fetch<'w, 's> for WriteRelationFetch<T> {
12021170
unsafe fn set_archetype(
12031171
&mut self,
12041172
_state: &Self::State,
1205-
_target_filter: &Self::TargetFilter,
1173+
_: &Self::TargetFilter,
12061174
archetype: &Archetype,
12071175
tables: &Tables,
12081176
) {
@@ -1212,12 +1180,7 @@ impl<'w, 's, T: Component> Fetch<'w, 's> for WriteRelationFetch<T> {
12121180
self.entities = archetype.entities();
12131181
}
12141182

1215-
unsafe fn set_table(
1216-
&mut self,
1217-
_state: &Self::State,
1218-
_target_filter: &Self::TargetFilter,
1219-
table: &Table,
1220-
) {
1183+
unsafe fn set_table(&mut self, _state: &Self::State, _: &Self::TargetFilter, table: &Table) {
12211184
self.table_ptr = table;
12221185
}
12231186

@@ -1329,15 +1292,11 @@ unsafe impl<T: FetchState> FetchState for OptionState<T> {
13291292
}
13301293
}
13311294

1332-
fn matches_archetype(
1333-
&self,
1334-
_archetype: &Archetype,
1335-
_target_filter: &Self::TargetFilter,
1336-
) -> bool {
1295+
fn matches_archetype(&self, _archetype: &Archetype, _: &Self::TargetFilter) -> bool {
13371296
true
13381297
}
13391298

1340-
fn matches_table(&self, _table: &Table, _target_filter: &Self::TargetFilter) -> bool {
1299+
fn matches_table(&self, _table: &Table, _: &Self::TargetFilter) -> bool {
13411300
true
13421301
}
13431302

@@ -1533,19 +1492,15 @@ unsafe impl<T: Component> FetchState for ChangeTrackersState<T> {
15331492
}
15341493
}
15351494

1536-
fn matches_archetype(
1537-
&self,
1538-
archetype: &Archetype,
1539-
_target_filter: &Self::TargetFilter,
1540-
) -> bool {
1495+
fn matches_archetype(&self, archetype: &Archetype, _: &Self::TargetFilter) -> bool {
15411496
archetype.contains(self.component_id, None)
15421497
}
15431498

1544-
fn matches_table(&self, table: &Table, _target_filter: &Self::TargetFilter) -> bool {
1499+
fn matches_table(&self, table: &Table, _: &Self::TargetFilter) -> bool {
15451500
table.has_column(self.component_id, None)
15461501
}
15471502

1548-
fn deduplicate_targets(_target_filter: &mut Self::TargetFilter) {}
1503+
fn deduplicate_targets(_: &mut Self::TargetFilter) {}
15491504
}
15501505

15511506
/// The [`Fetch`] of [`ChangeTrackers`].
@@ -1579,7 +1534,7 @@ impl<'w, 's, T: Component> Fetch<'w, 's> for ChangeTrackersFetch<T> {
15791534
unsafe fn init(
15801535
world: &World,
15811536
state: &Self::State,
1582-
_target_filter: &Self::TargetFilter,
1537+
_: &Self::TargetFilter,
15831538
last_change_tick: u32,
15841539
change_tick: u32,
15851540
) -> Self {
@@ -1607,7 +1562,7 @@ impl<'w, 's, T: Component> Fetch<'w, 's> for ChangeTrackersFetch<T> {
16071562
unsafe fn set_archetype(
16081563
&mut self,
16091564
state: &Self::State,
1610-
_target_filter: &Self::TargetFilter,
1565+
_: &Self::TargetFilter,
16111566
archetype: &Archetype,
16121567
tables: &Tables,
16131568
) {
@@ -1624,12 +1579,7 @@ impl<'w, 's, T: Component> Fetch<'w, 's> for ChangeTrackersFetch<T> {
16241579
}
16251580

16261581
#[inline]
1627-
unsafe fn set_table(
1628-
&mut self,
1629-
state: &Self::State,
1630-
_target_filter: &Self::TargetFilter,
1631-
table: &Table,
1632-
) {
1582+
unsafe fn set_table(&mut self, state: &Self::State, _: &Self::TargetFilter, table: &Table) {
16331583
self.table_ticks = table
16341584
.get_column(state.component_id, None)
16351585
.unwrap()

0 commit comments

Comments
 (0)