Skip to content

Fix warnings picked up by properly configured rust-analyzer #2676

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Savestate2A03 wants to merge 1 commit into
base: pre-release
Choose a base branch
from
+4 −4
Open

Fix warnings picked up by properly configured rust-analyzer #2676

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion fighters/common/src/function_hooks/vtables/demon.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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::<CollisionLog>(log as usize);
if [
*COLLISION_KIND_ATTACK as u8,
*COLLISION_KIND_HIT as u8,
Expand Down
6 changes: 3 additions & 3 deletions src/matchup/containers.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,11 +81,11 @@ impl<T> CppVector<T> {
}
}

pub fn iter(&self) -> CppVectorIterator<T> {
pub fn iter(&self) -> CppVectorIterator<'_, T> {
self.into_iter()
}

pub fn iter_mut(&mut self) -> CppVectorIteratorMut<T> {
pub fn iter_mut(&mut self) -> CppVectorIteratorMut<'_, T> {
self.into_iter()
}

Expand Down Expand Up @@ -326,7 +326,7 @@ impl ResList {
}
}

pub fn node_iter(&self) -> NodeIter {
pub fn node_iter(&self) -> NodeIter<'_> {
NodeIter {
list: self,
count: 0,
Expand Down
Loading