fluencelabs/parity-wasm
1
0
Fork 0
mirror of https://github.com/fluencelabs/parity-wasm synced 2025-06-14 15:31:44 +00:00
Code Issues Projects Releases Wiki Activity

fix warnings

Browse Source
This commit is contained in:
NikVolf
2017-06-14 18:00:59 +03:00
parent e9ad59d9da
commit 40a07cfb75
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/interpreter/memory.rs
View File

@ -19,7 +19,7 @@ pub struct MemoryInstance {
} }
struct CheckedRegion<'a, B: 'a> where B: ::std::ops::Deref<Target=Vec<u8>> { struct CheckedRegion<'a, B: 'a> where B: ::std::ops::Deref<Target=Vec<u8>> {
_buffer: &'a B, buffer: &'a B,
offset: usize, offset: usize,
size: usize, size: usize,
} }
@ -28,6 +28,10 @@ impl<'a, B: 'a> CheckedRegion<'a, B> where B: ::std::ops::Deref<Target=Vec<u8>>
fn range(&self) -> ::std::ops::Range<usize> { fn range(&self) -> ::std::ops::Range<usize> {
self.offset..self.offset+self.size self.offset..self.offset+self.size
} }
fn slice(&self) -> &[u8] {
&*self.buffer
}
} }
impl MemoryInstance { impl MemoryInstance {
@ -63,7 +67,7 @@ impl MemoryInstance {
let buffer = self.buffer.read(); let buffer = self.buffer.read();
let region = self.checked_region(&buffer, offset as usize, size)?; let region = self.checked_region(&buffer, offset as usize, size)?;
Ok(buffer[region.range()].to_vec()) Ok(region.slice().to_vec())
} }
/// Set data at given offset. /// Set data at given offset.
@ -102,12 +106,13 @@ impl MemoryInstance {
} }
Ok(CheckedRegion { Ok(CheckedRegion {
_buffer: buffer, buffer: buffer,
offset: offset, offset: offset,
size: size, size: size,
}) })
} }
/// Copy memory region
pub fn copy(&self, src_offset: usize, dst_offset: usize, len: usize) -> Result<(), Error> { pub fn copy(&self, src_offset: usize, dst_offset: usize, len: usize) -> Result<(), Error> {
let buffer = self.buffer.write(); let buffer = self.buffer.write();