From 2b85f38b415b5adc0d146c156507419076852876 Mon Sep 17 00:00:00 2001
From: Philipp Oppermann <dev@phil-opp.com>
Date: Tue, 12 Apr 2016 00:39:45 +0200
Subject: [PATCH] Use new hole_list_allocator instead of bump_allocator

---
 Cargo.toml        | 4 +++-
 src/lib.rs        | 6 +++++-
 src/memory/mod.rs | 4 ++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 7b7403e2..22eaf348 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -10,12 +10,14 @@ crate-type = ["staticlib"]
 once = "0.2.1"
 rlibc = "0.1.4"
 spin = "0.3.4"
-bump_allocator = {path="libs/bump_allocator"}
 
 [dependencies.x86]
 version = "0.6.0"
 default-features = false
 
+[dependencies.hole_list_allocator]
+path = "libs/hole_list_allocator"
+
 [dependencies.multiboot2]
 git = "https://github.com/phil-opp/multiboot2-elf64"
 
diff --git a/src/lib.rs b/src/lib.rs
index 1a77ad80..26262ae2 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -21,7 +21,7 @@ extern crate x86;
 #[macro_use]
 extern crate once;
 
-extern crate bump_allocator;
+extern crate hole_list_allocator;
 extern crate alloc;
 #[macro_use]
 extern crate collections;
@@ -46,6 +46,10 @@ pub extern "C" fn rust_main(multiboot_information_address: usize) {
     use alloc::boxed::Box;
     let heap_test = Box::new(42);
 
+    for i in 0..10000 {
+        format!("Some String");
+    }
+
     println!("It did not crash!");
 
     loop {}
diff --git a/src/memory/mod.rs b/src/memory/mod.rs
index 2dbeef9a..604399f7 100644
--- a/src/memory/mod.rs
+++ b/src/memory/mod.rs
@@ -46,8 +46,8 @@ pub fn init(boot_info: &BootInformation) {
     let mut active_table = paging::remap_the_kernel(&mut frame_allocator,
         boot_info);
 
-    use self::paging::{Page, WRITABLE};
-    use bump_allocator::{HEAP_START, HEAP_SIZE};
+    use self::paging::Page;
+    use hole_list_allocator::{HEAP_START, HEAP_SIZE};
 
     let heap_start_page = Page::containing_address(HEAP_START);
     let heap_end_page = Page::containing_address(HEAP_START + HEAP_SIZE-1);