fix warnings

This commit is contained in:
NikVolf
2017-06-14 18:00:59 +03:00
parent e9ad59d9da
commit 40a07cfb75

View File

@ -19,7 +19,7 @@ pub struct MemoryInstance {
}
struct CheckedRegion<'a, B: 'a> where B: ::std::ops::Deref<Target=Vec<u8>> {
_buffer: &'a B,
buffer: &'a B,
offset: 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> {
self.offset..self.offset+self.size
}
fn slice(&self) -> &[u8] {
&*self.buffer
}
}
impl MemoryInstance {
@ -63,7 +67,7 @@ impl MemoryInstance {
let buffer = self.buffer.read();
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.
@ -102,12 +106,13 @@ impl MemoryInstance {
}
Ok(CheckedRegion {
_buffer: buffer,
buffer: buffer,
offset: offset,
size: size,
})
}
/// Copy memory region
pub fn copy(&self, src_offset: usize, dst_offset: usize, len: usize) -> Result<(), Error> {
let buffer = self.buffer.write();