From 40a07cfb75037d07f9f3b2f9a3087d5cfc463989 Mon Sep 17 00:00:00 2001 From: NikVolf Date: Wed, 14 Jun 2017 18:00:59 +0300 Subject: [PATCH] fix warnings --- src/interpreter/memory.rs | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/interpreter/memory.rs b/src/interpreter/memory.rs index 2b8995b..0bca676 100644 --- a/src/interpreter/memory.rs +++ b/src/interpreter/memory.rs @@ -19,7 +19,7 @@ pub struct MemoryInstance { } struct CheckedRegion<'a, B: 'a> where B: ::std::ops::Deref> { - _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> fn range(&self) -> ::std::ops::Range { 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();