Code cleaning

This commit is contained in:
Paul Masurel
2017-05-11 20:47:30 +09:00
parent 54ab897755
commit 6fd17e0ead
16 changed files with 91 additions and 75 deletions

View File

@@ -45,11 +45,6 @@ impl Heap {
pub fn capacity(&self,) -> u32 {
self.inner().capacity()
}
/// Return the amount of memory that has been allocated so far.
pub fn len(&self,) -> u32 {
self.inner().len()
}
/// Return amount of free space, in bytes.
pub fn num_free_bytes(&self,) -> u32 {
@@ -90,10 +85,6 @@ impl Heap {
pub fn get_mut_ref<Item>(&self, addr: u32) -> &mut Item {
self.inner().get_mut_ref(addr)
}
pub fn get_ref<Item>(&self, addr: u32) -> &Item {
self.inner().get_mut_ref(addr)
}
}
@@ -108,8 +99,9 @@ struct InnerHeap {
impl InnerHeap {
pub fn with_capacity(num_bytes: usize) -> InnerHeap {
let buffer: Vec<u8> = vec![0u8; num_bytes];
InnerHeap {
buffer: vec![0u8; num_bytes],
buffer: buffer,
buffer_len: num_bytes as u32,
next_heap: None,
used: 0u32,
@@ -124,10 +116,6 @@ impl InnerHeap {
pub fn capacity(&self,) -> u32 {
self.buffer.len() as u32
}
pub fn len(&self,) -> u32 {
self.used
}
// Returns the number of free bytes. If the buffer
// has reached it's capacity and overflowed to another buffer, return 0.
@@ -195,8 +183,6 @@ impl InnerHeap {
}
}
fn get_mut_ref<Item>(&mut self, addr: u32) -> &mut Item {
if addr >= self.buffer_len {
self.next_heap.as_mut().unwrap().get_mut_ref(addr - self.buffer_len)