Skip to content

Commit f64cb53

Browse files
MiniaczQMiniaczQ
committed
partial ci fix
1 parent 74911e5 commit f64cb53

File tree

7 files changed

+68
-63
lines changed

7 files changed

+68
-63
lines changed

‎crates/bevy_ecs/src/removal_detection.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -259,8 +259,8 @@ unsafe impl<'a> SystemParam for &'a RemovedComponentEvents {
259259
fn init_state(_world: &mut World, _system_meta: &mut SystemMeta) -> Self::State {}
260260

261261
#[inline]
262-
fn validate_param<'w, 's>(
263-
_state: &'s Self::State,
262+
fn validate_param(
263+
_state: &Self::State,
264264
_system_meta: &SystemMeta,
265265
_world: &World,
266266
_change_tick: Tick,

‎crates/bevy_ecs/src/system/commands/mod.rs

+8-3
Original file line numberDiff line numberDiff line change
@@ -146,13 +146,18 @@ const _: () = {
146146
}
147147

148148
#[inline]
149-
fn validate_param<'w, 's>(
150-
state: &'s Self::State,
149+
fn validate_param(
150+
state: &Self::State,
151151
system_meta: &bevy_ecs::system::SystemMeta,
152152
world: &World,
153153
change_tick: bevy_ecs::component::Tick,
154154
) -> bool {
155-
<(Deferred<'s, CommandQueue>, &'w Entities) as bevy_ecs::system::SystemParam>::validate_param(&state.state, system_meta, world, change_tick)
155+
<(Deferred<CommandQueue>, &Entities) as bevy_ecs::system::SystemParam>::validate_param(
156+
&state.state,
157+
system_meta,
158+
world,
159+
change_tick,
160+
)
156161
}
157162

158163
#[inline]

‎crates/bevy_ecs/src/system/system_name.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ unsafe impl SystemParam for SystemName<'_> {
7777
}
7878

7979
#[inline]
80-
fn validate_param<'w, 's>(
81-
_state: &'s Self::State,
80+
fn validate_param(
81+
_state: &Self::State,
8282
_system_meta: &SystemMeta,
8383
_world: &World,
8484
_change_tick: Tick,

‎crates/bevy_ecs/src/system/system_param.rs

+50-50
Original file line numberDiff line numberDiff line change
@@ -227,8 +227,8 @@ pub unsafe trait SystemParam: Sized {
227227
/// - The passed [`World`] must have access to any world data
228228
/// registered in [`init_state`](SystemParam::init_state).
229229
/// - `world` must be the same [`World`] that was used to initialize [`state`](SystemParam::init_state).
230-
fn validate_param<'world, 'state>(
231-
state: &'state Self::State,
230+
fn validate_param(
231+
state: &Self::State,
232232
system_meta: &SystemMeta,
233233
world: &World,
234234
change_tick: Tick,
@@ -286,8 +286,8 @@ unsafe impl<D: QueryData + 'static, F: QueryFilter + 'static> SystemParam for Qu
286286
}
287287

288288
#[inline]
289-
fn validate_param<'w, 's>(
290-
_state: &'s Self::State,
289+
fn validate_param(
290+
_state: &Self::State,
291291
_system_meta: &SystemMeta,
292292
_world: &World,
293293
_change_tick: Tick,
@@ -614,8 +614,8 @@ unsafe impl<'a, T: Resource> SystemParam for Res<'a, T> {
614614
}
615615

616616
#[inline]
617-
fn validate_param<'w, 's>(
618-
&component_id: &'s Self::State,
617+
fn validate_param(
618+
&component_id: &Self::State,
619619
_system_meta: &SystemMeta,
620620
world: &World,
621621
_change_tick: Tick,
@@ -667,8 +667,8 @@ unsafe impl<'a, T: Resource> SystemParam for Option<Res<'a, T>> {
667667
}
668668

669669
#[inline]
670-
fn validate_param<'w, 's>(
671-
_state: &'s Self::State,
670+
fn validate_param(
671+
_state: &Self::State,
672672
_system_meta: &SystemMeta,
673673
_world: &World,
674674
_change_tick: Tick,
@@ -731,8 +731,8 @@ unsafe impl<'a, T: Resource> SystemParam for ResMut<'a, T> {
731731
}
732732

733733
#[inline]
734-
fn validate_param<'w, 's>(
735-
&component_id: &'s Self::State,
734+
fn validate_param(
735+
&component_id: &Self::State,
736736
_system_meta: &SystemMeta,
737737
world: &World,
738738
_change_tick: Tick,
@@ -780,8 +780,8 @@ unsafe impl<'a, T: Resource> SystemParam for Option<ResMut<'a, T>> {
780780
}
781781

782782
#[inline]
783-
fn validate_param<'w, 's>(
784-
_state: &'s Self::State,
783+
fn validate_param(
784+
_state: &Self::State,
785785
_system_meta: &SystemMeta,
786786
_world: &World,
787787
_change_tick: Tick,
@@ -845,8 +845,8 @@ unsafe impl SystemParam for &'_ World {
845845
}
846846

847847
#[inline]
848-
fn validate_param<'w, 's>(
849-
_state: &'s Self::State,
848+
fn validate_param(
849+
_state: &Self::State,
850850
_system_meta: &SystemMeta,
851851
_world: &World,
852852
_change_tick: Tick,
@@ -878,8 +878,8 @@ unsafe impl<'w> SystemParam for DeferredWorld<'w> {
878878
}
879879

880880
#[inline]
881-
fn validate_param<'world, 'state>(
882-
_state: &'state Self::State,
881+
fn validate_param(
882+
_state: &Self::State,
883883
_system_meta: &SystemMeta,
884884
_world: &World,
885885
_change_tick: Tick,
@@ -1000,8 +1000,8 @@ unsafe impl<'a, T: FromWorld + Send + 'static> SystemParam for Local<'a, T> {
10001000
}
10011001

10021002
#[inline]
1003-
fn validate_param<'w, 's>(
1004-
_state: &'s Self::State,
1003+
fn validate_param(
1004+
_state: &Self::State,
10051005
_system_meta: &SystemMeta,
10061006
_world: &World,
10071007
_change_tick: Tick,
@@ -1200,8 +1200,8 @@ unsafe impl<T: SystemBuffer> SystemParam for Deferred<'_, T> {
12001200
}
12011201

12021202
#[inline]
1203-
fn validate_param<'w, 's>(
1204-
_state: &'s Self::State,
1203+
fn validate_param(
1204+
_state: &Self::State,
12051205
_system_meta: &SystemMeta,
12061206
_world: &World,
12071207
_change_tick: Tick,
@@ -1325,8 +1325,8 @@ unsafe impl<'a, T: 'static> SystemParam for NonSend<'a, T> {
13251325
}
13261326

13271327
#[inline]
1328-
fn validate_param<'w, 's>(
1329-
&component_id: &'s Self::State,
1328+
fn validate_param(
1329+
&component_id: &Self::State,
13301330
_system_meta: &SystemMeta,
13311331
world: &World,
13321332
_change_tick: Tick,
@@ -1376,8 +1376,8 @@ unsafe impl<T: 'static> SystemParam for Option<NonSend<'_, T>> {
13761376
}
13771377

13781378
#[inline]
1379-
fn validate_param<'w, 's>(
1380-
_state: &'s Self::State,
1379+
fn validate_param(
1380+
_state: &Self::State,
13811381
_system_meta: &SystemMeta,
13821382
_world: &World,
13831383
_change_tick: Tick,
@@ -1439,8 +1439,8 @@ unsafe impl<'a, T: 'static> SystemParam for NonSendMut<'a, T> {
14391439
}
14401440

14411441
#[inline]
1442-
fn validate_param<'w, 's>(
1443-
&component_id: &'s Self::State,
1442+
fn validate_param(
1443+
&component_id: &Self::State,
14441444
_system_meta: &SystemMeta,
14451445
world: &World,
14461446
_change_tick: Tick,
@@ -1484,8 +1484,8 @@ unsafe impl<'a, T: 'static> SystemParam for Option<NonSendMut<'a, T>> {
14841484
}
14851485

14861486
#[inline]
1487-
fn validate_param<'w, 's>(
1488-
_state: &'s Self::State,
1487+
fn validate_param(
1488+
_state: &Self::State,
14891489
_system_meta: &SystemMeta,
14901490
_world: &World,
14911491
_change_tick: Tick,
@@ -1522,8 +1522,8 @@ unsafe impl<'a> SystemParam for &'a Archetypes {
15221522
fn init_state(_world: &mut World, _system_meta: &mut SystemMeta) -> Self::State {}
15231523

15241524
#[inline]
1525-
fn validate_param<'w, 's>(
1526-
_state: &'s Self::State,
1525+
fn validate_param(
1526+
_state: &Self::State,
15271527
_system_meta: &SystemMeta,
15281528
_world: &World,
15291529
_change_tick: Tick,
@@ -1553,8 +1553,8 @@ unsafe impl<'a> SystemParam for &'a Components {
15531553
fn init_state(_world: &mut World, _system_meta: &mut SystemMeta) -> Self::State {}
15541554

15551555
#[inline]
1556-
fn validate_param<'w, 's>(
1557-
_state: &'s Self::State,
1556+
fn validate_param(
1557+
_state: &Self::State,
15581558
_system_meta: &SystemMeta,
15591559
_world: &World,
15601560
_change_tick: Tick,
@@ -1584,8 +1584,8 @@ unsafe impl<'a> SystemParam for &'a Entities {
15841584
fn init_state(_world: &mut World, _system_meta: &mut SystemMeta) -> Self::State {}
15851585

15861586
#[inline]
1587-
fn validate_param<'w, 's>(
1588-
_state: &'s Self::State,
1587+
fn validate_param(
1588+
_state: &Self::State,
15891589
_system_meta: &SystemMeta,
15901590
_world: &World,
15911591
_change_tick: Tick,
@@ -1615,8 +1615,8 @@ unsafe impl<'a> SystemParam for &'a Bundles {
16151615
fn init_state(_world: &mut World, _system_meta: &mut SystemMeta) -> Self::State {}
16161616

16171617
#[inline]
1618-
fn validate_param<'w, 's>(
1619-
_state: &'s Self::State,
1618+
fn validate_param(
1619+
_state: &Self::State,
16201620
_system_meta: &SystemMeta,
16211621
_world: &World,
16221622
_change_tick: Tick,
@@ -1675,8 +1675,8 @@ unsafe impl SystemParam for SystemChangeTick {
16751675
fn init_state(_world: &mut World, _system_meta: &mut SystemMeta) -> Self::State {}
16761676

16771677
#[inline]
1678-
fn validate_param<'w, 's>(
1679-
_state: &'s Self::State,
1678+
fn validate_param(
1679+
_state: &Self::State,
16801680
_system_meta: &SystemMeta,
16811681
_world: &World,
16821682
_change_tick: Tick,
@@ -1711,8 +1711,8 @@ unsafe impl<T: SystemParam> SystemParam for Vec<T> {
17111711
}
17121712

17131713
#[inline]
1714-
fn validate_param<'world, 'state>(
1715-
state: &'state Self::State,
1714+
fn validate_param(
1715+
state: &Self::State,
17161716
system_meta: &SystemMeta,
17171717
world: &World,
17181718
change_tick: Tick,
@@ -1775,8 +1775,8 @@ unsafe impl<T: SystemParam> SystemParam for ParamSet<'_, '_, Vec<T>> {
17751775
}
17761776

17771777
#[inline]
1778-
fn validate_param<'world, 'state>(
1779-
state: &'state Self::State,
1778+
fn validate_param(
1779+
state: &Self::State,
17801780
system_meta: &SystemMeta,
17811781
world: &World,
17821782
change_tick: Tick,
@@ -1894,8 +1894,8 @@ macro_rules! impl_system_param_tuple {
18941894
}
18951895

18961896
#[inline]
1897-
fn validate_param<'w, 's>(
1898-
state: &'s Self::State,
1897+
fn validate_param(
1898+
state: &Self::State,
18991899
_system_meta: &SystemMeta,
19001900
_world: &World,
19011901
_change_tick: Tick,
@@ -2062,8 +2062,8 @@ unsafe impl<P: SystemParam + 'static> SystemParam for StaticSystemParam<'_, '_,
20622062
}
20632063

20642064
#[inline]
2065-
fn validate_param<'world, 'state>(
2066-
state: &'state Self::State,
2065+
fn validate_param(
2066+
state: &Self::State,
20672067
system_meta: &SystemMeta,
20682068
world: &World,
20692069
change_tick: Tick,
@@ -2091,8 +2091,8 @@ unsafe impl<T: ?Sized> SystemParam for PhantomData<T> {
20912091
fn init_state(_world: &mut World, _system_meta: &mut SystemMeta) -> Self::State {}
20922092

20932093
#[inline]
2094-
fn validate_param<'world, 'state>(
2095-
_state: &'state Self::State,
2094+
fn validate_param(
2095+
_state: &Self::State,
20962096
_system_meta: &SystemMeta,
20972097
_world: &World,
20982098
_change_tick: Tick,
@@ -2368,8 +2368,8 @@ unsafe impl SystemParam for DynSystemParam<'_, '_> {
23682368
}
23692369

23702370
#[inline]
2371-
fn validate_param<'world, 'state>(
2372-
state: &'state Self::State,
2371+
fn validate_param(
2372+
state: &Self::State,
23732373
system_meta: &SystemMeta,
23742374
world: &World,
23752375
change_tick: Tick,

‎crates/bevy_ecs/src/world/identifier.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ unsafe impl SystemParam for WorldId {
5757
fn init_state(_: &mut World, _: &mut SystemMeta) -> Self::State {}
5858

5959
#[inline]
60-
fn validate_param<'world, 'state>(
61-
_state: &'state Self::State,
60+
fn validate_param(
61+
_state: &Self::State,
6262
_system_meta: &SystemMeta,
6363
_world: &World,
6464
_change_tick: Tick,

‎crates/bevy_gizmos/src/gizmos.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -188,8 +188,8 @@ where
188188
}
189189

190190
#[inline]
191-
fn validate_param<'w, 's>(
192-
state: &'s Self::State,
191+
fn validate_param(
192+
state: &Self::State,
193193
system_meta: &SystemMeta,
194194
world: &World,
195195
change_tick: Tick,

‎crates/bevy_render/src/extract_param.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ where
7575
}
7676

7777
#[inline]
78-
fn validate_param<'w, 's>(
79-
state: &'s Self::State,
78+
fn validate_param(
79+
state: &Self::State,
8080
system_meta: &SystemMeta,
8181
world: &World,
8282
change_tick: Tick,

0 commit comments

Comments
 (0)