Satisfy cargo fmt style remarks

This commit is contained in:
Michael Mueller 2019-06-19 18:44:26 +02:00
parent 81f34a6ab6
commit 70a2e612bc
No known key found for this signature in database
GPG Key ID: 95756F716F423159
4 changed files with 21 additions and 32 deletions

View File

@ -1,10 +1,6 @@
#[allow(unused_imports)]
use alloc::prelude::v1::*;
use core::{
cmp, fmt,
ops::Range,
u32,
};
use core::{cmp, fmt, ops::Range, u32};
use memory_units::{Bytes, Pages, RoundUpTo};
use parity_wasm::elements::ResizableLimits;
use value::LittleEndianConvert;
@ -202,8 +198,7 @@ impl MemoryInstance {
/// Get value from memory at given offset.
pub fn get_value<T: LittleEndianConvert>(&self, offset: u32) -> Result<T, Error> {
let region =
self.checked_region(offset as usize, ::core::mem::size_of::<T>())?;
let region = self.checked_region(offset as usize, ::core::mem::size_of::<T>())?;
let buffer = self.buffer.borrow();
Ok(T::from_little_endian(&buffer[region.range()]).expect("Slice size is checked"))
@ -238,9 +233,7 @@ impl MemoryInstance {
/// Copy data in the memory at given offset.
pub fn set(&self, offset: u32, value: &[u8]) -> Result<(), Error> {
let range = self
.checked_region(offset as usize, value.len())?
.range();
let range = self.checked_region(offset as usize, value.len())?.range();
if offset < self.lowest_used.get() {
self.lowest_used.set(offset);
@ -298,11 +291,7 @@ impl MemoryInstance {
Ok(size_before_grow)
}
fn checked_region(
&self,
offset: usize,
size: usize,
) -> Result<CheckedRegion, Error> {
fn checked_region(&self, offset: usize, size: usize) -> Result<CheckedRegion, Error> {
let mut buffer = self.buffer.borrow_mut();
let end = offset.checked_add(size).ok_or_else(|| {
Error::Memory(format!(
@ -472,12 +461,8 @@ impl MemoryInstance {
return src.copy(src_offset, dst_offset, len);
}
let src_range = src
.checked_region(src_offset, len)?
.range();
let dst_range = dst
.checked_region(dst_offset, len)?
.range();
let src_range = src.checked_region(src_offset, len)?.range();
let dst_range = dst.checked_region(dst_offset, len)?.range();
if dst_offset < dst.lowest_used.get() as usize {
dst.lowest_used.set(dst_offset as u32);

View File

@ -323,8 +323,11 @@ impl ModuleInstance {
locals: body.locals().to_vec(),
code: code,
};
let func_instance =
FuncInstance::alloc_internal(::MyRc::downgrade(&instance.0), signature, func_body);
let func_instance = FuncInstance::alloc_internal(
::MyRc::downgrade(&instance.0),
signature,
func_body,
);
instance.push_func(func_instance);
}
}

View File

@ -1,5 +1,5 @@
pub use alloc::rc::Rc as MyRc;
pub use alloc::rc::Weak as MyWeak;
pub use core::cell::Cell as MyCell;
pub use core::cell::RefCell as MyRefCell;
pub use core::cell::Ref as MyRef;
pub use core::cell::RefCell as MyRefCell;

View File

@ -2,12 +2,8 @@ extern crate atomic;
use alloc::sync::{Arc, Mutex};
pub use alloc::sync::{
Arc as MyRc, Weak as MyWeak, MutexGuard as MyRef,
};
pub use self::atomic::{
Atomic, Ordering::Relaxed as Ordering,
};
pub use self::atomic::{Atomic, Ordering::Relaxed as Ordering};
pub use alloc::sync::{Arc as MyRc, MutexGuard as MyRef, Weak as MyWeak};
/// Thread-safe wrapper which can be used in place of a `RefCell`.
#[derive(Debug)]
@ -32,9 +28,14 @@ impl<T> MyRefCell<T> {
/// Thread-safe wrapper which can be used in place of a `Cell`.
#[derive(Debug)]
pub struct MyCell<T>(Atomic<T>) where T: Copy;
pub struct MyCell<T>(Atomic<T>)
where
T: Copy;
impl<T> MyCell<T> where T: Copy {
impl<T> MyCell<T>
where
T: Copy,
{
/// Create new wrapper object.
pub fn new(obj: T) -> MyCell<T> {
MyCell(Atomic::new(obj))