michaelkuc6/blog_os
1
0
Fork 0
mirror of https://github.com/phil-opp/blog_os.git synced 2025-12-16 22:37:49 +00:00
Code Issues Projects Releases Wiki Activity

Link bump_allocator and alloc and collections crates

Browse Source
This commit is contained in:
Philipp Oppermann
2016-04-11 22:03:37 +02:00
parent c6981c2f24
commit f25cb599c2
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Cargo.toml
View File

@@ -9,6 +9,7 @@ crate-type = ["staticlib"]
[dependencies] [dependencies]
rlibc = "0.1.4" rlibc = "0.1.4"
spin = "0.3.4" spin = "0.3.4"
bump_allocator = {path="libs/bump_allocator"}
[dependencies.x86] [dependencies.x86]
version = "0.6.0" version = "0.6.0"

6
src/lib.rs
View File

@@ -9,6 +9,7 @@
#![feature(lang_items)] #![feature(lang_items)]
#![feature(const_fn, unique)] #![feature(const_fn, unique)]
#![feature(alloc, collections)]
#![no_std] #![no_std]
extern crate rlibc; extern crate rlibc;
@@ -18,6 +19,11 @@ extern crate multiboot2;
extern crate bitflags; extern crate bitflags;
extern crate x86; extern crate x86;
extern crate bump_allocator;
extern crate alloc;
#[macro_use]
extern crate collections;
#[macro_use] #[macro_use]
mod vga_buffer; mod vga_buffer;
mod memory; mod memory;