From f25cb599c2356039a1b955be1617f863b34ee0e5 Mon Sep 17 00:00:00 2001
From: Philipp Oppermann <dev@phil-opp.com>
Date: Mon, 11 Apr 2016 22:03:37 +0200
Subject: [PATCH] Link bump_allocator and alloc and collections crates

---
 Cargo.toml | 1 +
 src/lib.rs | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/Cargo.toml b/Cargo.toml
index 04c79bcd..e7f18f4f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -9,6 +9,7 @@ crate-type = ["staticlib"]
 [dependencies]
 rlibc = "0.1.4"
 spin = "0.3.4"
+bump_allocator = {path="libs/bump_allocator"}
 
 [dependencies.x86]
 version = "0.6.0"
diff --git a/src/lib.rs b/src/lib.rs
index 55987839..19a3f1ab 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -9,6 +9,7 @@
 
 #![feature(lang_items)]
 #![feature(const_fn, unique)]
+#![feature(alloc, collections)]
 #![no_std]
 
 extern crate rlibc;
@@ -18,6 +19,11 @@ extern crate multiboot2;
 extern crate bitflags;
 extern crate x86;
 
+extern crate bump_allocator;
+extern crate alloc;
+#[macro_use]
+extern crate collections;
+
 #[macro_use]
 mod vga_buffer;
 mod memory;