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

Removed unsafe unsage in favour of unwrap_or and get

Browse Source
This commit is contained in:
ccgauche 2020-12-12 12:40:45 +01:00 committed by Joshua Barretto
parent c95f57cafd
commit 05aee7df18
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/src/plugin/module.rs
View File

@ -1,4 +1,4 @@
use std::{collections::HashSet, marker::PhantomData, sync::Arc}; use std::{cell::Cell, collections::HashSet, marker::PhantomData, sync::Arc};
use error::RuntimeError; use error::RuntimeError;
use parking_lot::Mutex; use parking_lot::Mutex;
@ -84,7 +84,6 @@ impl<T: Event> PreparedEventQuery<T> {
const MEMORY_POS: usize = 100000; const MEMORY_POS: usize = 100000;
// This function is not public because this function should not be used without an interface to limit unsafe behaviours // This function is not public because this function should not be used without an interface to limit unsafe behaviours
#[allow(unsafe_code)]
fn execute_raw( fn execute_raw(
memory: &Memory, memory: &Memory,
function: &Function, function: &Function,
@ -101,10 +100,7 @@ fn execute_raw(
let mut new_len_bytes = [0u8; 4]; let mut new_len_bytes = [0u8; 4];
// TODO: It is probably better to dirrectly make the new_len_bytes // TODO: It is probably better to dirrectly make the new_len_bytes
for i in 0..4 { for i in 0..4 {
// Since memory view is a more than 11500 elements array we can get the [1;4] without any bound checks new_len_bytes[i] = view.get(i + 1).map(Cell::get).unwrap_or(0);
unsafe {
new_len_bytes[i] = view.get_unchecked(i + 1).get();
}
} }
let new_len = u32::from_ne_bytes(new_len_bytes) as usize; let new_len = u32::from_ne_bytes(new_len_bytes) as usize;
Ok(view[start..start + new_len] Ok(view[start..start + new_len]

2
rust-toolchain
View File

@ -1 +1 @@
nightly-2020-12-09 nightly-2020-12-10