diff --git a/fighters/common/src/function_hooks/vtables/demon.rs b/fighters/common/src/function_hooks/vtables/demon.rs index fb7f764046..3e062f740d 100644 --- a/fighters/common/src/function_hooks/vtables/demon.rs +++ b/fighters/common/src/function_hooks/vtables/demon.rs @@ -11,7 +11,7 @@ pub unsafe extern "C" fn demon_on_attack(vtable: u64, fighter: &mut Fighter, log *FIGHTER_DEMON_STATUS_KIND_ATTACK_STEP_2S, ].contains(&status) && VarModule::is_flag(battle_object, vars::demon::status::CHECK_STEP_CANCEL) { - let collision_log: &mut CollisionLog = std::mem::transmute(log); + let collision_log: &CollisionLog = &*std::ptr::with_exposed_provenance::(log as usize); if [ *COLLISION_KIND_ATTACK as u8, *COLLISION_KIND_HIT as u8, diff --git a/src/matchup/containers.rs b/src/matchup/containers.rs index f4446fe977..097280be65 100644 --- a/src/matchup/containers.rs +++ b/src/matchup/containers.rs @@ -81,11 +81,11 @@ impl CppVector { } } - pub fn iter(&self) -> CppVectorIterator { + pub fn iter(&self) -> CppVectorIterator<'_, T> { self.into_iter() } - pub fn iter_mut(&mut self) -> CppVectorIteratorMut { + pub fn iter_mut(&mut self) -> CppVectorIteratorMut<'_, T> { self.into_iter() } @@ -326,7 +326,7 @@ impl ResList { } } - pub fn node_iter(&self) -> NodeIter { + pub fn node_iter(&self) -> NodeIter<'_> { NodeIter { list: self, count: 0,