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

Fixed turbofish issues

Browse Source
This commit is contained in:
ccgauche 2021-02-18 18:04:47 +01:00 committed by Marcel Märtens
parent a12e554266
commit f85e79af07
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/sys/src/plugin/memory_manager.rs
View File

@ -14,7 +14,7 @@ pub struct EcsAccessManager {
impl Default for EcsAccessManager { impl Default for EcsAccessManager {
fn default() -> Self { fn default() -> Self {
Self { Self {
ecs_pointer: AtomicPtr::new(std::ptr::null_mut::<_>()), ecs_pointer: AtomicPtr::new(std::ptr::null_mut()),
} }
} }
} }
@ -27,7 +27,7 @@ impl EcsAccessManager {
.store(world as *const _ as *mut _, Ordering::Relaxed); .store(world as *const _ as *mut _, Ordering::Relaxed);
let out = func(); let out = func();
self.ecs_pointer self.ecs_pointer
.store(std::ptr::null_mut::<_>(), Ordering::Relaxed); .store(std::ptr::null_mut(), Ordering::Relaxed);
out out
} }
@ -124,5 +124,5 @@ pub fn read_bytes(memory: &Memory, position: i32, length: u32) -> Vec<u8> {
memory.view()[(position as usize)..(position as usize) + length as usize] memory.view()[(position as usize)..(position as usize) + length as usize]
.iter() .iter()
.map(|x| x.get()) .map(|x| x.get())
.collect::<Vec<_>>() .collect()
} }