Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

cargo clippy lifetimes

Browse Source
This commit is contained in:
Marcel Märtens 2022-11-28 14:46:35 +01:00
parent dad73ba2a3
commit 2812729b78
166 changed files with 344 additions and 340 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/net/src/sync/packet.rs
View File

@ -111,8 +111,8 @@ pub struct EntitySyncPackage {
pub deleted_entities: Vec<u64>,
}
impl EntitySyncPackage {
pub fn new<'a>(
uids: &ReadStorage<'a, Uid>,
pub fn new(
uids: &ReadStorage<'_, Uid>,
uid_tracker: &UpdateTracker<Uid>,
filter: impl Join + Copy,
deleted_entities: Vec<u64>,
@ -186,10 +186,10 @@ impl<P: CompPacket> CompSyncPackage<P> {
/// If there was an update to the component `C` on the provided entity this
/// will add the update to this package.
pub fn add_component_update<'a, C: Component + Clone + Send + Sync>(
pub fn add_component_update<C: Component + Clone + Send + Sync>(
&mut self,
tracker: &UpdateTracker<C>,
storage: &ReadStorage<'a, C>,
storage: &ReadStorage<'_, C>,
uid: u64,
entity: Entity,
) where

16
common/net/src/sync/track.rs
View File

@ -33,7 +33,7 @@ where
pub fn removed(&self) -> &BitSet { &self.removed }
pub fn record_changes<'a>(&mut self, storage: &ReadStorage<'a, C>) {
pub fn record_changes(&mut self, storage: &ReadStorage<'_, C>) {
self.inserted.clear();
self.modified.clear();
self.removed.clear();
@ -66,9 +66,9 @@ where
}
impl<C: Component + Clone + Send + Sync> UpdateTracker<C> {
pub fn add_packet_for<'a, P>(
pub fn add_packet_for<P>(
&self,
storage: &ReadStorage<'a, C>,
storage: &ReadStorage<'_, C>,
entity: Entity,
packets: &mut Vec<P>,
) where
@ -84,10 +84,10 @@ impl<C: Component + Clone + Send + Sync> UpdateTracker<C> {
}
}
pub fn get_updates_for<'a, P>(
pub fn get_updates_for<P>(
&self,
uids: &ReadStorage<'a, Uid>,
storage: &ReadStorage<'a, C>,
uids: &ReadStorage<'_, Uid>,
storage: &ReadStorage<'_, C>,
entity_filter: impl Join + Copy,
buf: &mut Vec<(u64, CompUpdateKind<P>)>,
) where
@ -125,9 +125,9 @@ impl<C: Component + Clone + Send + Sync> UpdateTracker<C> {
/// Returns `Some(update)` if the tracked component was modified for this
/// entity.
pub fn get_update<'a, P>(
pub fn get_update<P>(
&self,
storage: &ReadStorage<'a, C>,
storage: &ReadStorage<'_, C>,
entity: Entity,
) -> Option<CompUpdateKind<P>>
where

4
common/src/skillset_builder.rs
View File

@ -111,9 +111,7 @@ impl SkillSetBuilder {
/// 3) If added skill wasn't applied at the end
pub fn with_skill(mut self, skill: Skill, level: u16) -> Self {
let group = if let Some(skill_group) = skill.skill_group_kind() {
skill_group
} else {
let Some(group) = skill.skill_group_kind() else {
let err = format!(
"Tried to add skill: {:?} which does not have an associated skill group.",
skill

4
common/systems/src/phys.rs
View File

@ -1333,9 +1333,9 @@ impl<'a> System<'a> for Sys {
}
#[allow(clippy::too_many_lines)]
fn box_voxel_collision<'a, T: BaseVol<Vox = Block> + ReadVol>(
fn box_voxel_collision<T: BaseVol<Vox = Block> + ReadVol>(
cylinder: (f32, f32, f32), // effective collision cylinder
terrain: &'a T,
terrain: &T,
entity: Entity,
pos: &mut Pos,
tgt_pos: Vec3<f32>,

4
voxygen/anim/src/arthropod/alpha.rs
View File

@ -16,9 +16,9 @@ impl Animation for AlphaAnimation {
const UPDATE_FN: &'static [u8] = b"arthropod_alpha\0";
#[cfg_attr(feature = "be-dyn-lib", export_name = "arthropod_alpha")]
fn update_skeleton_inner<'a>(
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
(_velocity, global_time, stage_section, timer): Self::Dependency<'a>,
(_velocity, global_time, stage_section, timer): Self::Dependency<'_>,
anim_time: f32,
_rate: &mut f32,
s_a: &SkeletonAttr,

4
voxygen/anim/src/arthropod/dash.rs
View File

@ -14,9 +14,9 @@ impl Animation for DashAnimation {
const UPDATE_FN: &'static [u8] = b"arthropod_dash\0";
#[cfg_attr(feature = "be-dyn-lib", export_name = "arthropod_dash")]
fn update_skeleton_inner<'a>(
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
(_velocity, _global_time, stage_section, _timer): Self::Dependency<'a>,
(_velocity, _global_time, stage_section, _timer): Self::Dependency<'_>,
anim_time: f32,
_rate: &mut f32,
s_a: &SkeletonAttr,

4
voxygen/anim/src/arthropod/idle.rs
View File

@ -13,9 +13,9 @@ impl Animation for IdleAnimation {
const UPDATE_FN: &'static [u8] = b"arthropod_idle\0";
#[cfg_attr(feature = "be-dyn-lib", export_name = "arthropod_idle")]
fn update_skeleton_inner<'a>(
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
_global_time: Self::Dependency<'a>,
_global_time: Self::Dependency<'_>,
_anim_time: f32,
_rate: &mut f32,
s_a: &SkeletonAttr,

4
voxygen/anim/src/arthropod/jump.rs
View File

@ -13,9 +13,9 @@ impl Animation for JumpAnimation {
const UPDATE_FN: &'static [u8] = b"arthropod_jump\0";
#[cfg_attr(feature = "be-dyn-lib", export_name = "arthropod_jump")]
fn update_skeleton_inner<'a>(
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
(_velocity, _orientation, _last_ori, _global_time, _avg_vel): Self::Dependency<'a>,
(_velocity, _orientation, _last_ori, _global_time, _avg_vel): Self::Dependency<'_>,
_anim_time: f32,
_rate: &mut f32,
s_a: &SkeletonAttr,

4
voxygen/anim/src/arthropod/leapmelee.rs
View File

@ -16,9 +16,9 @@ impl Animation for LeapMeleeAnimation {
const UPDATE_FN: &'static [u8] = b"arthropod_leapmelee\0";
#[cfg_attr(feature = "be-dyn-lib", export_name = "arthropod_leapmelee")]
fn update_skeleton_inner<'a>(
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
(_velocity, global_time, stage_section, _timer): Self::Dependency<'a>,
(_velocity, global_time, stage_section, _timer): Self::Dependency<'_>,
anim_time: f32,
_rate: &mut f32,
s_a: &SkeletonAttr,

4
voxygen/anim/src/arthropod/run.rs
View File

@ -14,9 +14,9 @@ impl Animation for RunAnimation {
const UPDATE_FN: &'static [u8] = b"arthropod_run\0";
#[cfg_attr(feature = "be-dyn-lib", export_name = "arthropod_run")]
fn update_skeleton_inner<'a>(
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
(velocity, _orientation, _last_ori, _global_time, avg_vel, acc_vel): Self::Dependency<'a>,
(velocity, _orientation, _last_ori, _global_time, avg_vel, acc_vel): Self::Dependency<'_>,
anim_time: f32,
rate: &mut f32,
s_a: &SkeletonAttr,

4
voxygen/anim/src/arthropod/shoot.rs
View File

@ -14,9 +14,9 @@ impl Animation for ShootAnimation {
const UPDATE_FN: &'static [u8] = b"arthropod_shoot\0";
#[cfg_attr(feature = "be-dyn-lib", export_name = "arthropod_shoot")]
fn update_skeleton_inner<'a>(
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
(_velocity, _global_time, stage_section, _timer): Self::Dependency<'a>,
(_velocity, _global_time, stage_section, _timer): Self::Dependency<'_>,
anim_time: f32,
_rate: &mut f32,
s_a: &SkeletonAttr,

4
voxygen/anim/src/arthropod/stunned.rs
View File

@ -14,9 +14,9 @@ impl Animation for StunnedAnimation {
const UPDATE_FN: &'static [u8] = b"arthropod_stunned\0";
#[cfg_attr(feature = "be-dyn-lib", export_name = "arthropod_stunned")]
fn update_skeleton_inner<'a>(
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
(_velocity, global_time, stage_section, timer): Self::Dependency<'a>,
(_velocity, global_time, stage_section, timer): Self::Dependency<'_>,
anim_time: f32,
_rate: &mut f32,
s_a: &SkeletonAttr,

4
voxygen/anim/src/arthropod/summon.rs
View File

@ -16,9 +16,9 @@ impl Animation for SummonAnimation {
const UPDATE_FN: &'static [u8] = b"arthropod_summon\0";
#[cfg_attr(feature = "be-dyn-lib", export_name = "arthropod_summon")]
fn update_skeleton_inner<'a>(
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
(_velocity, global_time, stage_section, timer): Self::Dependency<'a>,
(_velocity, global_time, stage_section, timer): Self::Dependency<'_>,
anim_time: f32,
_rate: &mut f32,
s_a: &SkeletonAttr,

4
voxygen/anim/src/biped_large/alpha.rs
View File

@ -26,7 +26,7 @@ impl Animation for AlphaAnimation {
const UPDATE_FN: &'static [u8] = b"biped_large_alpha\0";
#[cfg_attr(feature = "be-dyn-lib", export_name = "biped_large_alpha")]
fn update_skeleton_inner<'a>(
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
(
(active_tool_kind, active_tool_spec),
@ -36,7 +36,7 @@ impl Animation for AlphaAnimation {
stage_section,
acc_vel,
timer,
): Self::Dependency<'a>,
): Self::Dependency<'_>,
anim_time: f32,
rate: &mut f32,
s_a: &SkeletonAttr,

4
voxygen/anim/src/biped_large/beam.rs
View File

@ -26,7 +26,7 @@ impl Animation for BeamAnimation {
const UPDATE_FN: &'static [u8] = b"biped_large_beam\0";
#[cfg_attr(feature = "be-dyn-lib", export_name = "biped_large_beam")]
fn update_skeleton_inner<'a>(
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
(
(active_tool_kind, active_tool_spec),
@ -36,7 +36,7 @@ impl Animation for BeamAnimation {
stage_section,
acc_vel,
timer,
): Self::Dependency<'a>,
): Self::Dependency<'_>,
anim_time: f32,
rate: &mut f32,
s_a: &SkeletonAttr,

4
voxygen/anim/src/biped_large/beta.rs
View File

@ -25,7 +25,7 @@ impl Animation for BetaAnimation {
const UPDATE_FN: &'static [u8] = b"biped_large_beta\0";
#[cfg_attr(feature = "be-dyn-lib", export_name = "biped_large_beta")]
fn update_skeleton_inner<'a>(
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
(
(active_tool_kind, active_tool_spec),
@ -34,7 +34,7 @@ impl Animation for BetaAnimation {
_global_time,
stage_section,
acc_vel,
): Self::Dependency<'a>,
): Self::Dependency<'_>,
anim_time: f32,
rate: &mut f32,
s_a: &SkeletonAttr,

4
voxygen/anim/src/biped_large/blink.rs
View File

@ -22,9 +22,9 @@ impl Animation for BlinkAnimation {
const UPDATE_FN: &'static [u8] = b"biped_large_blink\0";
#[cfg_attr(feature = "be-dyn-lib", export_name = "biped_large_blink")]
fn update_skeleton_inner<'a>(
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
(active_tool_kind, _second_tool_kind, velocity, _global_time, stage_section, acc_vel): Self::Dependency<'a>,
(active_tool_kind, _second_tool_kind, velocity, _global_time, stage_section, acc_vel): Self::Dependency<'_>,
anim_time: f32,
rate: &mut f32,
s_a: &SkeletonAttr,

4
voxygen/anim/src/biped_large/charge.rs
View File

@ -22,9 +22,9 @@ impl Animation for ChargeAnimation {
const UPDATE_FN: &'static [u8] = b"biped_large_charge\0";
#[cfg_attr(feature = "be-dyn-lib", export_name = "biped_large_charge")]
fn update_skeleton_inner<'a>(
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
(active_tool_kind, _second_tool_kind, velocity, orientation, last_ori, _global_time): Self::Dependency<'a>,
(active_tool_kind, _second_tool_kind, velocity, orientation, last_ori, _global_time): Self::Dependency<'_>,
anim_time: f32,
_rate: &mut f32,
s_a: &SkeletonAttr,

4
voxygen/anim/src/biped_large/chargemelee.rs
View File

@ -25,7 +25,7 @@ impl Animation for ChargeMeleeAnimation {
const UPDATE_FN: &'static [u8] = b"biped_large_chargemelee\0";
#[cfg_attr(feature = "be-dyn-lib", export_name = "biped_large_chargemelee")]
fn update_skeleton_inner<'a>(
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
(
(active_tool_kind, active_tool_spec),
@ -34,7 +34,7 @@ impl Animation for ChargeMeleeAnimation {
_global_time,
stage_section,
acc_vel,
): Self::Dependency<'a>,
): Self::Dependency<'_>,
anim_time: f32,
rate: &mut f32,
s_a: &SkeletonAttr,

4
voxygen/anim/src/biped_large/dash.rs
View File

@ -25,7 +25,7 @@ impl Animation for DashAnimation {
const UPDATE_FN: &'static [u8] = b"biped_large_dash\0";
#[cfg_attr(feature = "be-dyn-lib", export_name = "biped_large_dash")]
fn update_skeleton_inner<'a>(
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
(
(active_tool_kind, active_tool_spec),
@ -34,7 +34,7 @@ impl Animation for DashAnimation {
_global_time,
stage_section,
acc_vel,
): Self::Dependency<'a>,
): Self::Dependency<'_>,
anim_time: f32,
rate: &mut f32,
s_a: &SkeletonAttr,

4
voxygen/anim/src/biped_large/equip.rs
View File

@ -15,9 +15,9 @@ impl Animation for EquipAnimation {
const UPDATE_FN: &'static [u8] = b"biped_large_equip\0";
#[cfg_attr(feature = "be-dyn-lib", export_name = "biped_large_equip")]
fn update_skeleton_inner<'a>(
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
(active_tool_kind, _second_tool_kind, _velocity, _global_time): Self::Dependency<'a>,
(active_tool_kind, _second_tool_kind, _velocity, _global_time): Self::Dependency<'_>,
anim_time: f32,
rate: &mut f32,
_s_a: &SkeletonAttr,

4
voxygen/anim/src/biped_large/idle.rs
View File

@ -15,9 +15,9 @@ impl Animation for IdleAnimation {
const UPDATE_FN: &'static [u8] = b"biped_large_idle\0";
#[cfg_attr(feature = "be-dyn-lib", export_name = "biped_large_idle")]
fn update_skeleton_inner<'a>(
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
(active_tool_kind, _second_tool_kind, global_time): Self::Dependency<'a>,
(active_tool_kind, _second_tool_kind, global_time): Self::Dependency<'_>,
anim_time: f32,
_rate: &mut f32,
s_a: &SkeletonAttr,

4
voxygen/anim/src/biped_large/jump.rs
View File

@ -15,9 +15,9 @@ impl Animation for JumpAnimation {
const UPDATE_FN: &'static [u8] = b"biped_large_jump\0";
#[cfg_attr(feature = "be-dyn-lib", export_name = "biped_large_jump")]
fn update_skeleton_inner<'a>(
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
(active_tool_kind, _second_tool_kind, _global_time): Self::Dependency<'a>,
(active_tool_kind, _second_tool_kind, _global_time): Self::Dependency<'_>,
anim_time: f32,
_rate: &mut f32,
s_a: &SkeletonAttr,

4
voxygen/anim/src/biped_large/leapmelee.rs
View File

@ -21,9 +21,9 @@ impl Animation for LeapAnimation {
const UPDATE_FN: &'static [u8] = b"biped_large_leapmelee\0";
#[cfg_attr(feature = "be-dyn-lib", export_name = "biped_large_leapmelee")]
fn update_skeleton_inner<'a>(
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
(active_tool_kind, _second_tool_kind, _velocity, _global_time, stage_section): Self::Dependency<'a>,
(active_tool_kind, _second_tool_kind, _velocity, _global_time, stage_section): Self::Dependency<'_>,
anim_time: f32,
rate: &mut f32,
s_a: &SkeletonAttr,

4
voxygen/anim/src/biped_large/run.rs
View File

@ -25,7 +25,7 @@ impl Animation for RunAnimation {
const UPDATE_FN: &'static [u8] = b"biped_large_run\0";
#[cfg_attr(feature = "be-dyn-lib", export_name = "biped_large_run")]
fn update_skeleton_inner<'a>(
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
(
active_tool_kind,
@ -36,7 +36,7 @@ impl Animation for RunAnimation {
global_time,
avg_vel,
acc_vel,
): Self::Dependency<'a>,
): Self::Dependency<'_>,
anim_time: f32,
rate: &mut f32,
s_a: &SkeletonAttr,

4
voxygen/anim/src/biped_large/selfbuff.rs
View File

@ -25,7 +25,7 @@ impl Animation for SelfBuffAnimation {
const UPDATE_FN: &'static [u8] = b"biped_large_selfbuff\0";
#[cfg_attr(feature = "be-dyn-lib", export_name = "biped_large_selfbuff")]
fn update_skeleton_inner<'a>(
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
(
(active_tool_kind, active_tool_spec),
@ -34,7 +34,7 @@ impl Animation for SelfBuffAnimation {
_global_time,
stage_section,
acc_vel,
): Self::Dependency<'a>,
): Self::Dependency<'_>,
anim_time: f32,
rate: &mut f32,
s_a: &SkeletonAttr,

4
voxygen/anim/src/biped_large/shockwave.rs
View File

@ -26,7 +26,7 @@ impl Animation for ShockwaveAnimation {
#[cfg_attr(feature = "be-dyn-lib", export_name = "biped_large_shockwave")]
#[allow(clippy::single_match)] // TODO: Pending review in #587
fn update_skeleton_inner<'a>(
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
(
(active_tool_kind, active_tool_spec),
@ -34,7 +34,7 @@ impl Animation for ShockwaveAnimation {
_global_time,
velocity,
stage_section,
): Self::Dependency<'a>,
): Self::Dependency<'_>,
anim_time: f32,
rate: &mut f32,
s_a: &SkeletonAttr,

4
voxygen/anim/src/biped_large/shoot.rs
View File

@ -28,7 +28,7 @@ impl Animation for ShootAnimation {
const UPDATE_FN: &'static [u8] = b"biped_large_shoot\0";
#[cfg_attr(feature = "be-dyn-lib", export_name = "biped_large_shoot")]
fn update_skeleton_inner<'a>(
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
(
(active_tool_kind, active_tool_spec),
@ -39,7 +39,7 @@ impl Animation for ShootAnimation {
_global_time,
stage_section,
acc_vel,
): Self::Dependency<'a>,
): Self::Dependency<'_>,
anim_time: f32,
rate: &mut f32,
s_a: &SkeletonAttr,

4
voxygen/anim/src/biped_large/spin.rs
View File

@ -20,9 +20,9 @@ impl Animation for SpinAnimation {
const UPDATE_FN: &'static [u8] = b"biped_large_spin\0";
#[cfg_attr(feature = "be-dyn-lib", export_name = "biped_large_spin")]
fn update_skeleton_inner<'a>(
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
(active_tool_kind, _second_tool_kind, _global_time, stage_section): Self::Dependency<'a>,
(active_tool_kind, _second_tool_kind, _global_time, stage_section): Self::Dependency<'_>,
anim_time: f32,
rate: &mut f32,
s_a: &SkeletonAttr,

4
voxygen/anim/src/biped_large/spinmelee.rs
View File

@ -22,9 +22,9 @@ impl Animation for SpinMeleeAnimation {
const UPDATE_FN: &'static [u8] = b"biped_large_spinmelee\0";
#[cfg_attr(feature = "be-dyn-lib", export_name = "biped_large_spinmelee")]
fn update_skeleton_inner<'a>(
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
(active_tool_kind, _second_tool_kind, velocity, _global_time, stage_section, acc_vel): Self::Dependency<'a>,
(active_tool_kind, _second_tool_kind, velocity, _global_time, stage_section, acc_vel): Self::Dependency<'_>,
anim_time: f32,
rate: &mut f32,
s_a: &SkeletonAttr,

4
voxygen/anim/src/biped_large/spritesummon.rs
View File

@ -26,7 +26,7 @@ impl Animation for SpriteSummonAnimation {
#[cfg_attr(feature = "be-dyn-lib", export_name = "biped_large_sprite_summon")]
#[allow(clippy::single_match)] // TODO: Pending review in #587
fn update_skeleton_inner<'a>(
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
(
(active_tool_kind, active_tool_spec),
@ -34,7 +34,7 @@ impl Animation for SpriteSummonAnimation {
_global_time,
velocity,
stage_section,
): Self::Dependency<'a>,
): Self::Dependency<'_>,
anim_time: f32,
rate: &mut f32,
s_a: &SkeletonAttr,

4
voxygen/anim/src/biped_large/stunned.rs
View File

@ -23,10 +23,10 @@ impl Animation for StunnedAnimation {
const UPDATE_FN: &'static [u8] = b"biped_large_stunned\0";
#[cfg_attr(feature = "be-dyn-lib", export_name = "biped_large_stunned")]
fn update_skeleton_inner<'a>(
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
((active_tool_kind, active_tool_spec), velocity, acc_vel, stage_section): Self::Dependency<
'a,
'_,
>,
anim_time: f32,
_rate: &mut f32,

4
voxygen/anim/src/biped_large/summon.rs
View File

@ -25,7 +25,7 @@ impl Animation for SummonAnimation {
const UPDATE_FN: &'static [u8] = b"biped_large_summon\0";
#[cfg_attr(feature = "be-dyn-lib", export_name = "biped_large_summon")]
fn update_skeleton_inner<'a>(
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
(
(active_tool_kind, active_tool_spec),
@ -34,7 +34,7 @@ impl Animation for SummonAnimation {
_global_time,
stage_section,
acc_vel,
): Self::Dependency<'a>,
): Self::Dependency<'_>,
anim_time: f32,
rate: &mut f32,
s_a: &SkeletonAttr,

4
voxygen/anim/src/biped_large/wield.rs
View File

@ -21,9 +21,9 @@ impl Animation for WieldAnimation {
const UPDATE_FN: &'static [u8] = b"biped_large_wield\0";
#[cfg_attr(feature = "be-dyn-lib", export_name = "biped_large_wield")]
fn update_skeleton_inner<'a>(
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
((active_tool_kind, active_tool_spec), _second_tool, velocity, global_time, acc_vel): Self::Dependency<'a>,
((active_tool_kind, active_tool_spec), _second_tool, velocity, global_time, acc_vel): Self::Dependency<'_>,
anim_time: f32,
_rate: &mut f32,
s_a: &SkeletonAttr,

4
voxygen/anim/src/biped_small/alpha.rs
View File

@ -28,7 +28,7 @@ impl Animation for AlphaAnimation {
#[cfg_attr(feature = "be-dyn-lib", export_name = "biped_small_alpha")]
fn update_skeleton_inner<'a>(
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
(
active_tool_kind,
@ -40,7 +40,7 @@ impl Animation for AlphaAnimation {
_acc_vel,
stage_section,
timer,
): Self::Dependency<'a>,
): Self::Dependency<'_>,
anim_time: f32,
_rate: &mut f32,
s_a: &SkeletonAttr,

4
voxygen/anim/src/biped_small/beam.rs
View File

@ -28,7 +28,7 @@ impl Animation for BeamAnimation {
#[cfg_attr(feature = "be-dyn-lib", export_name = "biped_small_beam")]
fn update_skeleton_inner<'a>(
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
(
_active_tool_kind,
@ -40,7 +40,7 @@ impl Animation for BeamAnimation {
_acc_vel,
stage_section,
_timer,
): Self::Dependency<'a>,
): Self::Dependency<'_>,
anim_time: f32,
_rate: &mut f32,
s_a: &SkeletonAttr,

4
voxygen/anim/src/biped_small/dash.rs
View File

@ -27,7 +27,7 @@ impl Animation for DashAnimation {
#[cfg_attr(feature = "be-dyn-lib", export_name = "biped_small_dash")]
fn update_skeleton_inner<'a>(
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
(
velocity,
@ -38,7 +38,7 @@ impl Animation for DashAnimation {
_acc_vel,
stage_section,
_timer,
): Self::Dependency<'a>,
): Self::Dependency<'_>,
anim_time: f32,
_rate: &mut f32,
s_a: &SkeletonAttr,

4
voxygen/anim/src/biped_small/idle.rs
View File

@ -17,9 +17,9 @@ impl Animation for IdleAnimation {
#[cfg_attr(feature = "be-dyn-lib", export_name = "biped_small_idle")]
fn update_skeleton_inner<'a>(
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
(_velocity, _orientation, _last_ori, _global_time, _avg_vel): Self::Dependency<'a>,
(_velocity, _orientation, _last_ori, _global_time, _avg_vel): Self::Dependency<'_>,
anim_time: f32,
_rate: &mut f32,
s_a: &SkeletonAttr,

4
voxygen/anim/src/biped_small/run.rs
View File

@ -17,9 +17,9 @@ impl Animation for RunAnimation {
#[cfg_attr(feature = "be-dyn-lib", export_name = "biped_small_run")]
fn update_skeleton_inner<'a>(
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
(velocity, orientation, last_ori, global_time, _avg_vel, acc_vel): Self::Dependency<'a>,
(velocity, orientation, last_ori, global_time, _avg_vel, acc_vel): Self::Dependency<'_>,
anim_time: f32,
rate: &mut f32,
s_a: &SkeletonAttr,

4
voxygen/anim/src/biped_small/shockwave.rs
View File

@ -28,7 +28,7 @@ impl Animation for ShockwaveAnimation {
#[cfg_attr(feature = "be-dyn-lib", export_name = "biped_small_shockwave")]
fn update_skeleton_inner<'a>(
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
(
active_tool_kind,
@ -40,7 +40,7 @@ impl Animation for ShockwaveAnimation {
_acc_vel,
stage_section,
timer,
): Self::Dependency<'a>,
): Self::Dependency<'_>,
anim_time: f32,
_rate: &mut f32,
s_a: &SkeletonAttr,

4
voxygen/anim/src/biped_small/shoot.rs
View File

@ -28,7 +28,7 @@ impl Animation for ShootAnimation {
#[cfg_attr(feature = "be-dyn-lib", export_name = "biped_small_shoot")]
fn update_skeleton_inner<'a>(
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
(
active_tool_kind,
@ -40,7 +40,7 @@ impl Animation for ShootAnimation {
_acc_vel,
stage_section,
_timer,
): Self::Dependency<'a>,
): Self::Dependency<'_>,
anim_time: f32,
_rate: &mut f32,
s_a: &SkeletonAttr,

4
voxygen/anim/src/biped_small/spinmelee.rs
View File

@ -27,7 +27,7 @@ impl Animation for SpinMeleeAnimation {
#[cfg_attr(feature = "be-dyn-lib", export_name = "biped_small_spinmelee")]
fn update_skeleton_inner<'a>(
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
(
active_tool_kind,
@ -39,7 +39,7 @@ impl Animation for SpinMeleeAnimation {
_acc_vel,
stage_section,
_timer,
): Self::Dependency<'a>,
): Self::Dependency<'_>,
anim_time: f32,
_rate: &mut f32,
s_a: &SkeletonAttr,

4
voxygen/anim/src/biped_small/stunned.rs
View File

@ -29,7 +29,7 @@ impl Animation for StunnedAnimation {
#[cfg_attr(feature = "be-dyn-lib", export_name = "biped_small_stunned")]
fn update_skeleton_inner<'a>(
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
(
active_tool_kind,
@ -42,7 +42,7 @@ impl Animation for StunnedAnimation {
wield_status,
stage_section,
timer,
): Self::Dependency<'a>,
): Self::Dependency<'_>,
anim_time: f32,
_rate: &mut f32,
s_a: &SkeletonAttr,

4
voxygen/anim/src/biped_small/summon.rs
View File

@ -28,7 +28,7 @@ impl Animation for SummonAnimation {
#[cfg_attr(feature = "be-dyn-lib", export_name = "biped_small_summon")]
fn update_skeleton_inner<'a>(
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
(
active_tool_kind,
@ -40,7 +40,7 @@ impl Animation for SummonAnimation {
_acc_vel,
stage_section,
timer,
): Self::Dependency<'a>,
): Self::Dependency<'_>,
anim_time: f32,
_rate: &mut f32,
s_a: &SkeletonAttr,

4
voxygen/anim/src/biped_small/wield.rs
View File

@ -26,9 +26,9 @@ impl Animation for WieldAnimation {
#[cfg_attr(feature = "be-dyn-lib", export_name = "biped_small_wield")]
fn update_skeleton_inner<'a>(
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
(active_tool_kind, velocity, _orientation, _last_ori, _global_time, _avg_vel, acc_vel): Self::Dependency<'a>,
(active_tool_kind, velocity, _orientation, _last_ori, _global_time, _avg_vel, acc_vel): Self::Dependency<'_>,
anim_time: f32,
_rate: &mut f32,
s_a: &SkeletonAttr,

4
voxygen/anim/src/bird_large/alpha.rs
View File

@ -14,9 +14,9 @@ impl Animation for AlphaAnimation {
const UPDATE_FN: &'static [u8] = b"bird_large_alpha\0";
#[cfg_attr(feature = "be-dyn-lib", export_name = "bird_large_alpha")]
fn update_skeleton_inner<'a>(
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
(stage_section, global_time, timer, orientation, last_ori, on_ground): Self::Dependency<'a>,
(stage_section, global_time, timer, orientation, last_ori, on_ground): Self::Dependency<'_>,
anim_time: f32,
_rate: &mut f32,
s_a: &SkeletonAttr,

4
voxygen/anim/src/bird_large/breathe.rs
View File

@ -25,9 +25,9 @@ impl Animation for BreatheAnimation {
const UPDATE_FN: &'static [u8] = b"bird_large_breathe\0";
#[cfg_attr(feature = "be-dyn-lib", export_name = "bird_large_breathe")]
fn update_skeleton_inner<'a>(
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
(velocity,global_time, _orientation, _last_ori, stage_section, timer, look_dir, on_ground): Self::Dependency<'a>,
(velocity,global_time, _orientation, _last_ori, stage_section, timer, look_dir, on_ground): Self::Dependency<'_>,
anim_time: f32,
_rate: &mut f32,
s_a: &SkeletonAttr,

4
voxygen/anim/src/bird_large/dash.rs
View File

@ -24,9 +24,9 @@ impl Animation for DashAnimation {
const UPDATE_FN: &'static [u8] = b"bird_large_dash\0";
#[cfg_attr(feature = "be-dyn-lib", export_name = "bird_large_dash")]
fn update_skeleton_inner<'a>(
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
(velocity, orientation, last_ori, acc_vel, stage_section, global_time, timer): Self::Dependency<'a>,
(velocity, orientation, last_ori, acc_vel, stage_section, global_time, timer): Self::Dependency<'_>,
anim_time: f32,
rate: &mut f32,
s_a: &SkeletonAttr,

4
voxygen/anim/src/bird_large/feed.rs
View File

@ -14,9 +14,9 @@ impl Animation for FeedAnimation {
const UPDATE_FN: &'static [u8] = b"bird_large_feed\0";
#[cfg_attr(feature = "be-dyn-lib", export_name = "bird_large_feed")]
fn update_skeleton_inner<'a>(
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
global_time: Self::Dependency<'a>,
global_time: Self::Dependency<'_>,
anim_time: f32,
_rate: &mut f32,
s_a: &SkeletonAttr,

4
voxygen/anim/src/bird_large/fly.rs
View File

@ -13,9 +13,9 @@ impl Animation for FlyAnimation {
const UPDATE_FN: &'static [u8] = b"bird_large_fly\0";
#[cfg_attr(feature = "be-dyn-lib", export_name = "bird_large_fly")]
fn update_skeleton_inner<'a>(
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
(velocity, orientation, last_ori): Self::Dependency<'a>,
(velocity, orientation, last_ori): Self::Dependency<'_>,
anim_time: f32,
_rate: &mut f32,
s_a: &SkeletonAttr,

4
voxygen/anim/src/bird_large/idle.rs
View File

@ -14,9 +14,9 @@ impl Animation for IdleAnimation {
const UPDATE_FN: &'static [u8] = b"bird_large_idle\0";
#[cfg_attr(feature = "be-dyn-lib", export_name = "bird_large_idle")]
fn update_skeleton_inner<'a>(
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
global_time: Self::Dependency<'a>,
global_time: Self::Dependency<'_>,
anim_time: f32,
_rate: &mut f32,
s_a: &SkeletonAttr,

4
voxygen/anim/src/bird_large/run.rs
View File

@ -14,9 +14,9 @@ impl Animation for RunAnimation {
const UPDATE_FN: &'static [u8] = b"bird_large_run\0";
#[cfg_attr(feature = "be-dyn-lib", export_name = "bird_large_run")]
fn update_skeleton_inner<'a>(
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
(velocity, orientation, last_ori, avg_vel, acc_vel): Self::Dependency<'a>,
(velocity, orientation, last_ori, avg_vel, acc_vel): Self::Dependency<'_>,
anim_time: f32,
rate: &mut f32,
s_a: &SkeletonAttr,

4
voxygen/anim/src/bird_large/shockwave.rs
View File

@ -14,9 +14,9 @@ impl Animation for ShockwaveAnimation {
const UPDATE_FN: &'static [u8] = b"bird_large_shockwave\0";
#[cfg_attr(feature = "be-dyn-lib", export_name = "bird_large_shockwave")]
fn update_skeleton_inner<'a>(
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
(stage_section, on_ground): Self::Dependency<'a>,
(stage_section, on_ground): Self::Dependency<'_>,
anim_time: f32,
_rate: &mut f32,
s_a: &SkeletonAttr,

4
voxygen/anim/src/bird_large/shoot.rs
View File

@ -16,9 +16,9 @@ impl Animation for ShootAnimation {
const UPDATE_FN: &'static [u8] = b"bird_large_shoot\0";
#[cfg_attr(feature = "be-dyn-lib", export_name = "bird_large_shoot")]
fn update_skeleton_inner<'a>(
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
(velocity, global_time, stage_section, timer, look_dir, on_ground): Self::Dependency<'a>,
(velocity, global_time, stage_section, timer, look_dir, on_ground): Self::Dependency<'_>,
anim_time: f32,
_rate: &mut f32,
s_a: &SkeletonAttr,

4
voxygen/anim/src/bird_large/stunned.rs
View File

@ -14,9 +14,9 @@ impl Animation for StunnedAnimation {
const UPDATE_FN: &'static [u8] = b"bird_large_stunned\0";
#[cfg_attr(feature = "be-dyn-lib", export_name = "bird_large_stunned")]
fn update_skeleton_inner<'a>(
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
(global_time, stage_section, timer): Self::Dependency<'a>,
(global_time, stage_section, timer): Self::Dependency<'_>,
anim_time: f32,
_rate: &mut f32,
s_a: &SkeletonAttr,

4
voxygen/anim/src/bird_large/summon.rs
View File

@ -16,9 +16,9 @@ impl Animation for SummonAnimation {
const UPDATE_FN: &'static [u8] = b"bird_large_summon\0";
#[cfg_attr(feature = "be-dyn-lib", export_name = "bird_large_summon")]
fn update_skeleton_inner<'a>(
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
(global_time, stage_section, timer, look_dir, on_ground): Self::Dependency<'a>,
(global_time, stage_section, timer, look_dir, on_ground): Self::Dependency<'_>,
anim_time: f32,
rate: &mut f32,
s_a: &SkeletonAttr,

4
voxygen/anim/src/bird_large/swim.rs
View File

@ -14,9 +14,9 @@ impl Animation for SwimAnimation {
const UPDATE_FN: &'static [u8] = b"bird_large_swim\0";
#[cfg_attr(feature = "be-dyn-lib", export_name = "bird_large_swim")]
fn update_skeleton_inner<'a>(
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
global_time: Self::Dependency<'a>,
global_time: Self::Dependency<'_>,
anim_time: f32,
_rate: &mut f32,
s_a: &SkeletonAttr,

4
voxygen/anim/src/bird_medium/feed.rs
View File

@ -15,9 +15,9 @@ impl Animation for FeedAnimation {
#[cfg_attr(feature = "be-dyn-lib", export_name = "bird_medium_feed")]
fn update_skeleton_inner<'a>(
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
global_time: Self::Dependency<'a>,
global_time: Self::Dependency<'_>,
anim_time: f32,
_rate: &mut f32,
s_a: &SkeletonAttr,

4
voxygen/anim/src/bird_medium/fly.rs
View File

@ -14,9 +14,9 @@ impl Animation for FlyAnimation {
const UPDATE_FN: &'static [u8] = b"bird_medium_fly\0";
#[cfg_attr(feature = "be-dyn-lib", export_name = "bird_medium_fly")]
fn update_skeleton_inner<'a>(
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
_global_time: Self::Dependency<'a>,
_global_time: Self::Dependency<'_>,
anim_time: f32,
_rate: &mut f32,
s_a: &SkeletonAttr,

4
voxygen/anim/src/bird_medium/idle.rs
View File

@ -15,9 +15,9 @@ impl Animation for IdleAnimation {
#[cfg_attr(feature = "be-dyn-lib", export_name = "bird_medium_idle")]
fn update_skeleton_inner<'a>(
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
global_time: Self::Dependency<'a>,
global_time: Self::Dependency<'_>,
anim_time: f32,
_rate: &mut f32,
s_a: &SkeletonAttr,

4
voxygen/anim/src/bird_medium/run.rs
View File

@ -14,9 +14,9 @@ impl Animation for RunAnimation {
const UPDATE_FN: &'static [u8] = b"bird_medium_run\0";
#[cfg_attr(feature = "be-dyn-lib", export_name = "bird_medium_run")]
fn update_skeleton_inner<'a>(
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
(_velocity, _global_time): Self::Dependency<'a>,
(_velocity, _global_time): Self::Dependency<'_>,
anim_time: f32,
_rate: &mut f32,
s_a: &SkeletonAttr,

4
voxygen/anim/src/character/alpha.rs
View File

@ -23,9 +23,9 @@ impl Animation for AlphaAnimation {
const UPDATE_FN: &'static [u8] = b"character_alpha\0";
#[cfg_attr(feature = "be-dyn-lib", export_name = "character_alpha")]
fn update_skeleton_inner<'a>(
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
(hands, stage_section, ability_info): Self::Dependency<'a>,
(hands, stage_section, ability_info): Self::Dependency<'_>,
anim_time: f32,
rate: &mut f32,
s_a: &SkeletonAttr,

4
voxygen/anim/src/character/beam.rs
View File

@ -24,9 +24,9 @@ impl Animation for BeamAnimation {
const UPDATE_FN: &'static [u8] = b"character_beam\0";
#[cfg_attr(feature = "be-dyn-lib", export_name = "character_beam")]
fn update_skeleton_inner<'a>(
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
(ability_info, hands, _global_time, velocity, stage_section): Self::Dependency<'a>,
(ability_info, hands, _global_time, velocity, stage_section): Self::Dependency<'_>,
anim_time: f32,
rate: &mut f32,
s_a: &SkeletonAttr,

4
voxygen/anim/src/character/beta.rs
View File

@ -24,10 +24,10 @@ impl Animation for BetaAnimation {
const UPDATE_FN: &'static [u8] = b"character_beta\0";
#[cfg_attr(feature = "be-dyn-lib", export_name = "character_beta")]
fn update_skeleton_inner<'a>(
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
(hands, _ability_id, _velocity, _global_time, stage_section, ability_info): Self::Dependency<
'a,
'_,
>,
anim_time: f32,
rate: &mut f32,

4
voxygen/anim/src/character/block.rs
View File

@ -27,7 +27,7 @@ impl Animation for BlockAnimation {
const UPDATE_FN: &'static [u8] = b"character_block\0";
#[cfg_attr(feature = "be-dyn-lib", export_name = "character_block")]
fn update_skeleton_inner<'a>(
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
(
hands,
@ -37,7 +37,7 @@ impl Animation for BlockAnimation {
ability_id,
stage_section,
_ability_info,
): Self::Dependency<'a>,
): Self::Dependency<'_>,
anim_time: f32,
rate: &mut f32,
s_a: &SkeletonAttr,

4
voxygen/anim/src/character/chargeswing.rs
View File

@ -25,9 +25,9 @@ impl Animation for ChargeswingAnimation {
const UPDATE_FN: &'static [u8] = b"character_chargeswing\0";
#[cfg_attr(feature = "be-dyn-lib", export_name = "character_chargeswing")]
fn update_skeleton_inner<'a>(
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
(hands, ability_id, stage_section, ability_info): Self::Dependency<'a>,
(hands, ability_id, stage_section, ability_info): Self::Dependency<'_>,
anim_time: f32,
rate: &mut f32,
s_a: &SkeletonAttr,

4
voxygen/anim/src/character/climb.rs
View File

@ -21,9 +21,9 @@ impl Animation for ClimbAnimation {
const UPDATE_FN: &'static [u8] = b"character_climb\0";
#[cfg_attr(feature = "be-dyn-lib", export_name = "character_climb")]
fn update_skeleton_inner<'a>(
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
(_active_tool_kind, _second_tool_kind, velocity, _orientation, global_time): Self::Dependency<'a>,
(_active_tool_kind, _second_tool_kind, velocity, _orientation, global_time): Self::Dependency<'_>,
anim_time: f32,
rate: &mut f32,
s_a: &SkeletonAttr,

4
voxygen/anim/src/character/collect.rs
View File

@ -15,9 +15,9 @@ impl Animation for CollectAnimation {
const UPDATE_FN: &'static [u8] = b"character_collect\0";
#[cfg_attr(feature = "be-dyn-lib", export_name = "character_collect")]
fn update_skeleton_inner<'a>(
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
(position, _global_time, stage_section, sprite_pos): Self::Dependency<'a>,
(position, _global_time, stage_section, sprite_pos): Self::Dependency<'_>,
anim_time: f32,
rate: &mut f32,
s_a: &SkeletonAttr,

4
voxygen/anim/src/character/combomelee.rs
View File

@ -20,9 +20,9 @@ impl Animation for ComboAnimation {
const UPDATE_FN: &'static [u8] = b"character_combo\0";
#[cfg_attr(feature = "be-dyn-lib", export_name = "character_combo")]
fn update_skeleton_inner<'a>(
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
(ability_id, stage_section, _ability_info, current_strike, move_dir): Self::Dependency<'a>,
(ability_id, stage_section, _ability_info, current_strike, move_dir): Self::Dependency<'_>,
anim_time: f32,
rate: &mut f32,
s_a: &SkeletonAttr,

4
voxygen/anim/src/character/consume.rs
View File

@ -17,9 +17,9 @@ impl Animation for ConsumeAnimation {
const UPDATE_FN: &'static [u8] = b"character_consume\0";
#[cfg_attr(feature = "be-dyn-lib", export_name = "character_consume")]
fn update_skeleton_inner<'a>(
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
(_global_time, stage_section, item_kind): Self::Dependency<'a>,
(_global_time, stage_section, item_kind): Self::Dependency<'_>,
anim_time: f32,
_rate: &mut f32,
s_a: &SkeletonAttr,

4
voxygen/anim/src/character/dance.rs
View File

@ -15,9 +15,9 @@ impl Animation for DanceAnimation {
const UPDATE_FN: &'static [u8] = b"character_dance\0";
#[cfg_attr(feature = "be-dyn-lib", export_name = "character_dance")]
fn update_skeleton_inner<'a>(
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
(_active_tool_kind, _second_tool_kind, global_time): Self::Dependency<'a>,
(_active_tool_kind, _second_tool_kind, global_time): Self::Dependency<'_>,
anim_time: f32,
rate: &mut f32,
s_a: &SkeletonAttr,

4
voxygen/anim/src/character/dash.rs
View File

@ -25,9 +25,9 @@ impl Animation for DashAnimation {
#[cfg_attr(feature = "be-dyn-lib", export_name = "character_dash")]
#[allow(clippy::single_match)] // TODO: Pending review in #587
fn update_skeleton_inner<'a>(
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
(_hands, ability_id, _global_time, stage_section, _ability_info): Self::Dependency<'a>,
(_hands, ability_id, _global_time, stage_section, _ability_info): Self::Dependency<'_>,
anim_time: f32,
rate: &mut f32,
s_a: &SkeletonAttr,

4
voxygen/anim/src/character/divemelee.rs
View File

@ -18,9 +18,9 @@ impl Animation for DiveMeleeAnimation {
const UPDATE_FN: &'static [u8] = b"character_dive_melee\0";
#[cfg_attr(feature = "be-dyn-lib", export_name = "character_dive_melee")]
fn update_skeleton_inner<'a>(
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
(ability_id, stage_section, ground_dist, _ability_info): Self::Dependency<'a>,
(ability_id, stage_section, ground_dist, _ability_info): Self::Dependency<'_>,
anim_time: f32,
rate: &mut f32,
s_a: &SkeletonAttr,

4
voxygen/anim/src/character/equip.rs
View File

@ -15,9 +15,9 @@ impl Animation for EquipAnimation {
const UPDATE_FN: &'static [u8] = b"character_equip\0";
#[cfg_attr(feature = "be-dyn-lib", export_name = "character_equip")]
fn update_skeleton_inner<'a>(
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
(active_tool_kind, _second_tool_kind, _velocity, _global_time): Self::Dependency<'a>,
(active_tool_kind, _second_tool_kind, _velocity, _global_time): Self::Dependency<'_>,
anim_time: f32,
rate: &mut f32,
_s_a: &SkeletonAttr,

4
voxygen/anim/src/character/finishermelee.rs
View File

@ -14,9 +14,9 @@ impl Animation for FinisherMeleeAnimation {
const UPDATE_FN: &'static [u8] = b"character_finisher_melee\0";
#[cfg_attr(feature = "be-dyn-lib", export_name = "character_finisher_melee")]
fn update_skeleton_inner<'a>(
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
(ability_id, stage_section, _ability_info): Self::Dependency<'a>,
(ability_id, stage_section, _ability_info): Self::Dependency<'_>,
anim_time: f32,
rate: &mut f32,
s_a: &SkeletonAttr,

4
voxygen/anim/src/character/glidewield.rs
View File

@ -15,9 +15,9 @@ impl Animation for GlideWieldAnimation {
#[cfg_attr(feature = "be-dyn-lib", export_name = "character_glidewield")]
fn update_skeleton_inner<'a>(
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
(orientation, glider_orientation): Self::Dependency<'a>,
(orientation, glider_orientation): Self::Dependency<'_>,
_anim_time: f32,
rate: &mut f32,
s_a: &SkeletonAttr,

4
voxygen/anim/src/character/gliding.rs
View File

@ -17,9 +17,9 @@ impl Animation for GlidingAnimation {
#[cfg_attr(feature = "be-dyn-lib", export_name = "character_gliding")]
fn update_skeleton_inner<'a>(
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
(velocity, orientation, glider_orientation, global_time, acc_vel): Self::Dependency<'a>,
(velocity, orientation, glider_orientation, global_time, acc_vel): Self::Dependency<'_>,
anim_time: f32,
_rate: &mut f32,
s_a: &SkeletonAttr,

4
voxygen/anim/src/character/idle.rs
View File

@ -21,9 +21,9 @@ impl Animation for IdleAnimation {
const UPDATE_FN: &'static [u8] = b"character_idle\0";
#[cfg_attr(feature = "be-dyn-lib", export_name = "character_idle")]
fn update_skeleton_inner<'a>(
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
(active_tool_kind, second_tool_kind, hands, global_time): Self::Dependency<'a>,
(active_tool_kind, second_tool_kind, hands, global_time): Self::Dependency<'_>,
anim_time: f32,
_rate: &mut f32,
s_a: &SkeletonAttr,

4
voxygen/anim/src/character/jump.rs
View File

@ -23,9 +23,9 @@ impl Animation for JumpAnimation {
#[cfg_attr(feature = "be-dyn-lib", export_name = "character_jump")]
fn update_skeleton_inner<'a>(
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
(active_tool_kind, second_tool_kind, hands, velocity, orientation, last_ori, global_time): Self::Dependency<'a>,
(active_tool_kind, second_tool_kind, hands, velocity, orientation, last_ori, global_time): Self::Dependency<'_>,
anim_time: f32,
_rate: &mut f32,
s_a: &SkeletonAttr,

4
voxygen/anim/src/character/leapmelee.rs
View File

@ -25,9 +25,9 @@ impl Animation for LeapAnimation {
const UPDATE_FN: &'static [u8] = b"character_leapmelee\0";
#[cfg_attr(feature = "be-dyn-lib", export_name = "character_leapmelee")]
fn update_skeleton_inner<'a>(
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
(hands, _velocity, _global_time, stage_section, ability_info): Self::Dependency<'a>,
(hands, _velocity, _global_time, stage_section, ability_info): Self::Dependency<'_>,
anim_time: f32,
rate: &mut f32,
s_a: &SkeletonAttr,

4
voxygen/anim/src/character/mount.rs
View File

@ -24,7 +24,7 @@ impl Animation for MountAnimation {
const UPDATE_FN: &'static [u8] = b"character_mount\0";
#[cfg_attr(feature = "be-dyn-lib", export_name = "character_mount")]
fn update_skeleton_inner<'a>(
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
(
active_tool_kind,
@ -35,7 +35,7 @@ impl Animation for MountAnimation {
avg_vel,
orientation,
last_ori,
): Self::Dependency<'a>,
): Self::Dependency<'_>,
anim_time: f32,
_rate: &mut f32,
s_a: &SkeletonAttr,

4
voxygen/anim/src/character/music.rs
View File

@ -23,9 +23,9 @@ impl Animation for MusicAnimation {
const UPDATE_FN: &'static [u8] = b"character_music\0";
#[cfg_attr(feature = "be-dyn-lib", export_name = "character_music")]
fn update_skeleton_inner<'a>(
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
(_hands, (ability_info, active_tool_spec, global_time), rel_vel): Self::Dependency<'a>,
(_hands, (ability_info, active_tool_spec, global_time), rel_vel): Self::Dependency<'_>,
anim_time: f32,
rate: &mut f32,
s_a: &SkeletonAttr,

4
voxygen/anim/src/character/rapidmelee.rs
View File

@ -19,10 +19,10 @@ impl Animation for RapidMeleeAnimation {
const UPDATE_FN: &'static [u8] = b"character_rapid_melee\0";
#[cfg_attr(feature = "be-dyn-lib", export_name = "character_rapid_melee")]
fn update_skeleton_inner<'a>(
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
(ability_id, stage_section, (current_strike, max_strikes), _ability_info): Self::Dependency<
'a,
'_,
>,
anim_time: f32,
rate: &mut f32,

4
voxygen/anim/src/character/repeater.rs
View File

@ -27,9 +27,9 @@ impl Animation for RepeaterAnimation {
const UPDATE_FN: &'static [u8] = b"character_repeater\0";
#[cfg_attr(feature = "be-dyn-lib", export_name = "character_repeater")]
fn update_skeleton_inner<'a>(
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
(ability_info, hands, orientation,look_dir, velocity, _global_time, stage_section): Self::Dependency<'a>,
(ability_info, hands, orientation,look_dir, velocity, _global_time, stage_section): Self::Dependency<'_>,
anim_time: f32,
rate: &mut f32,
s_a: &SkeletonAttr,

4
voxygen/anim/src/character/ripostemelee.rs
View File

@ -13,9 +13,9 @@ impl Animation for RiposteMeleeAnimation {
const UPDATE_FN: &'static [u8] = b"character_riposte_melee\0";
#[cfg_attr(feature = "be-dyn-lib", export_name = "character_riposte_melee")]
fn update_skeleton_inner<'a>(
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
(ability_id, stage_section, _ability_info): Self::Dependency<'a>,
(ability_id, stage_section, _ability_info): Self::Dependency<'_>,
anim_time: f32,
rate: &mut f32,
s_a: &SkeletonAttr,

4
voxygen/anim/src/character/roll.rs
View File

@ -30,7 +30,7 @@ impl Animation for RollAnimation {
#[cfg_attr(feature = "be-dyn-lib", export_name = "character_roll")]
fn update_skeleton_inner<'a>(
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
(
active_tool_kind,
@ -41,7 +41,7 @@ impl Animation for RollAnimation {
last_ori,
_global_time,
stage_section,
): Self::Dependency<'a>,
): Self::Dependency<'_>,
anim_time: f32,
rate: &mut f32,
s_a: &SkeletonAttr,

4
voxygen/anim/src/character/run.rs
View File

@ -29,7 +29,7 @@ impl Animation for RunAnimation {
#[cfg_attr(feature = "be-dyn-lib", export_name = "character_run")]
fn update_skeleton_inner<'a>(
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
(
active_tool_kind,
@ -42,7 +42,7 @@ impl Animation for RunAnimation {
avg_vel,
acc_vel,
wall,
): Self::Dependency<'a>,
): Self::Dependency<'_>,
anim_time: f32,
rate: &mut f32,
s_a: &SkeletonAttr,

4
voxygen/anim/src/character/selfbuff.rs
View File

@ -13,9 +13,9 @@ impl Animation for SelfBuffAnimation {
const UPDATE_FN: &'static [u8] = b"character_self_buff\0";
#[cfg_attr(feature = "be-dyn-lib", export_name = "character_self_buff")]
fn update_skeleton_inner<'a>(
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
(ability_id, stage_section, _ability_info): Self::Dependency<'a>,
(ability_id, stage_section, _ability_info): Self::Dependency<'_>,
anim_time: f32,
rate: &mut f32,
s_a: &SkeletonAttr,

4
voxygen/anim/src/character/shockwave.rs
View File

@ -26,9 +26,9 @@ impl Animation for ShockwaveAnimation {
const UPDATE_FN: &'static [u8] = b"character_shockwave\0";
#[cfg_attr(feature = "be-dyn-lib", export_name = "character_shockwave")]
fn update_skeleton_inner<'a>(
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
(_ability_info, hands, _global_time, velocity, stage_section): Self::Dependency<'a>,
(_ability_info, hands, _global_time, velocity, stage_section): Self::Dependency<'_>,
anim_time: f32,
rate: &mut f32,
s_a: &SkeletonAttr,

4
voxygen/anim/src/character/shoot.rs
View File

@ -29,7 +29,7 @@ impl Animation for ShootAnimation {
const UPDATE_FN: &'static [u8] = b"character_shoot\0";
#[cfg_attr(feature = "be-dyn-lib", export_name = "character_shoot")]
fn update_skeleton_inner<'a>(
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
(
ability_info,
@ -40,7 +40,7 @@ impl Animation for ShootAnimation {
look_dir,
_global_time,
stage_section,
): Self::Dependency<'a>,
): Self::Dependency<'_>,
anim_time: f32,
rate: &mut f32,
s_a: &SkeletonAttr,

4
voxygen/anim/src/character/sit.rs
View File

@ -15,9 +15,9 @@ impl Animation for SitAnimation {
const UPDATE_FN: &'static [u8] = b"character_sit\0";
#[cfg_attr(feature = "be-dyn-lib", export_name = "character_sit")]
fn update_skeleton_inner<'a>(
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
(_active_tool_kind, _second_tool_kind, global_time): Self::Dependency<'a>,
(_active_tool_kind, _second_tool_kind, global_time): Self::Dependency<'_>,
anim_time: f32,
_rate: &mut f32,
s_a: &SkeletonAttr,

4
voxygen/anim/src/character/sneak.rs
View File

@ -16,9 +16,9 @@ impl Animation for SneakAnimation {
#[cfg_attr(feature = "be-dyn-lib", export_name = "character_sneak")]
fn update_skeleton_inner<'a>(
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
(_active_tool_kind, velocity, orientation, last_ori, global_time): Self::Dependency<'a>,
(_active_tool_kind, velocity, orientation, last_ori, global_time): Self::Dependency<'_>,
anim_time: f32,
rate: &mut f32,
s_a: &SkeletonAttr,

4
voxygen/anim/src/character/sneakequip.rs
View File

@ -15,9 +15,9 @@ impl Animation for SneakEquipAnimation {
const UPDATE_FN: &'static [u8] = b"character_sneakequip\0";
#[cfg_attr(feature = "be-dyn-lib", export_name = "character_sneakequip")]
fn update_skeleton_inner<'a>(
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
(active_tool_kind, velocity, orientation, last_ori, global_time): Self::Dependency<'a>,
(active_tool_kind, velocity, orientation, last_ori, global_time): Self::Dependency<'_>,
anim_time: f32,
rate: &mut f32,
s_a: &SkeletonAttr,

4
voxygen/anim/src/character/sneakwield.rs
View File

@ -23,7 +23,7 @@ impl Animation for SneakWieldAnimation {
const UPDATE_FN: &'static [u8] = b"character_sneakwield\0";
#[cfg_attr(feature = "be-dyn-lib", export_name = "character_sneakwield")]
fn update_skeleton_inner<'a>(
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
(
(active_tool_kind, active_tool_spec),
@ -33,7 +33,7 @@ impl Animation for SneakWieldAnimation {
orientation,
last_ori,
global_time,
): Self::Dependency<'a>,
): Self::Dependency<'_>,
anim_time: f32,
rate: &mut f32,
s_a: &SkeletonAttr,

4
voxygen/anim/src/character/spin.rs
View File

@ -25,9 +25,9 @@ impl Animation for SpinAnimation {
const UPDATE_FN: &'static [u8] = b"character_spin\0";
#[cfg_attr(feature = "be-dyn-lib", export_name = "character_spin")]
fn update_skeleton_inner<'a>(
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
(hands, _velocity, _global_time, stage_section, ability_info): Self::Dependency<'a>,
(hands, _velocity, _global_time, stage_section, ability_info): Self::Dependency<'_>,
anim_time: f32,
rate: &mut f32,
s_a: &SkeletonAttr,

4
voxygen/anim/src/character/spinmelee.rs
View File

@ -25,9 +25,9 @@ impl Animation for SpinMeleeAnimation {
const UPDATE_FN: &'static [u8] = b"character_spinmelee\0";
#[cfg_attr(feature = "be-dyn-lib", export_name = "character_spinmelee")]
fn update_skeleton_inner<'a>(
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
(hands, _velocity, _global_time, stage_section, ability_info): Self::Dependency<'a>,
(hands, _velocity, _global_time, stage_section, ability_info): Self::Dependency<'_>,
anim_time: f32,
rate: &mut f32,
s_a: &SkeletonAttr,

4
voxygen/anim/src/character/staggered.rs
View File

@ -28,7 +28,7 @@ impl Animation for StaggeredAnimation {
const UPDATE_FN: &'static [u8] = b"character_staggered\0";
#[cfg_attr(feature = "be-dyn-lib", export_name = "character_staggered")]
fn update_skeleton_inner<'a>(
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
(
active_tool_kind,
@ -39,7 +39,7 @@ impl Animation for StaggeredAnimation {
stage_section,
timer,
wield_status,
): Self::Dependency<'a>,
): Self::Dependency<'_>,
anim_time: f32,
rate: &mut f32,
s_a: &SkeletonAttr,

4
voxygen/anim/src/character/stand.rs
View File

@ -24,9 +24,9 @@ impl Animation for StandAnimation {
const UPDATE_FN: &'static [u8] = b"character_stand\0";
#[cfg_attr(feature = "be-dyn-lib", export_name = "character_stand")]
fn update_skeleton_inner<'a>(
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
(active_tool_kind, second_tool_kind, hands, orientation, last_ori, global_time, avg_vel): Self::Dependency<'a>,
(active_tool_kind, second_tool_kind, hands, orientation, last_ori, global_time, avg_vel): Self::Dependency<'_>,
anim_time: f32,
_rate: &mut f32,
s_a: &SkeletonAttr,

4
voxygen/anim/src/character/stunned.rs
View File

@ -28,7 +28,7 @@ impl Animation for StunnedAnimation {
const UPDATE_FN: &'static [u8] = b"character_stunned\0";
#[cfg_attr(feature = "be-dyn-lib", export_name = "character_stunned")]
fn update_skeleton_inner<'a>(
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
(
active_tool_kind,
@ -39,7 +39,7 @@ impl Animation for StunnedAnimation {
stage_section,
timer,
wield_status,
): Self::Dependency<'a>,
): Self::Dependency<'_>,
anim_time: f32,
rate: &mut f32,
s_a: &SkeletonAttr,

4
voxygen/anim/src/character/swim.rs
View File

@ -27,7 +27,7 @@ impl Animation for SwimAnimation {
#[cfg_attr(feature = "be-dyn-lib", export_name = "character_swim")]
fn update_skeleton_inner<'a>(
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
(
active_tool_kind,
@ -38,7 +38,7 @@ impl Animation for SwimAnimation {
last_ori,
global_time,
avg_vel,
): Self::Dependency<'a>,
): Self::Dependency<'_>,
anim_time: f32,
rate: &mut f32,
s_a: &SkeletonAttr,

Some files were not shown because too many files have changed in this diff Show More