reorganize native-support exports

This commit is contained in:
Robert Habermeier
2018-01-23 16:51:04 +01:00
parent 3402f169a7
commit ce5f4da907
14 changed files with 53 additions and 37 deletions
@@ -16,7 +16,8 @@
//! Serialisation.
use runtime_support::{Vec, size_of, transmute, uninitialized, slice};
use runtime_support::vec::Vec;
use runtime_support::{mem, slice};
use joiner::Joiner;
use endiansensitive::EndianSensitive;
@@ -45,10 +46,11 @@ pub trait NonTrivialSlicable: Slicable {}
impl<T: EndianSensitive> Slicable for T {
fn set_as_slice<F: FnOnce(&mut[u8]) -> bool>(fill_slice: F) -> Option<Self> {
let size = size_of::<T>();
let mut result: T = unsafe { uninitialized() };
let size = mem::size_of::<T>();
let mut result: T = unsafe { mem::uninitialized() };
let result_slice = unsafe {
slice::from_raw_parts_mut(transmute::<*mut T, *mut u8>(&mut result), size)
let ptr = &mut result as *mut _ as *mut u8;
slice::from_raw_parts_mut(ptr, size)
};
if fill_slice(result_slice) {
Some(result.from_le())
@@ -57,16 +59,17 @@ impl<T: EndianSensitive> Slicable for T {
}
}
fn as_slice_then<R, F: FnOnce(&[u8]) -> R>(&self, f: F) -> R {
let size = size_of::<Self>();
let size = mem::size_of::<Self>();
self.as_le_then(|le| {
let value_slice = unsafe {
slice::from_raw_parts(transmute::<*const Self, *const u8>(le), size)
let ptr = le as *const _ as *const u8;
slice::from_raw_parts(ptr, size)
};
f(value_slice)
})
}
fn size_of(_value: &[u8]) -> Option<usize> {
Some(size_of::<Self>())
Some(mem::size_of::<Self>())
}
}