Merge branch 'post-02' into post-03

This commit is contained in:
Philipp Oppermann
2020-10-02 23:15:32 +02:00
4 changed files with 1 additions and 10 deletions

View File

@@ -1,5 +1,6 @@
[unstable]
build-std = ["core", "compiler_builtins"]
build-std-features = ["compiler-builtins-mem"]
[build]
target = "x86_64-blog_os.json"

7
Cargo.lock generated
View File

@@ -6,7 +6,6 @@ version = "0.1.0"
dependencies = [
"bootloader",
"lazy_static",
"rlibc",
"spin",
"volatile",
]
@@ -26,12 +25,6 @@ dependencies = [
"spin",
]
[[package]]
name = "rlibc"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fc874b127765f014d792f16763a81245ab80500e2ad921ed4ee9e82481ee08fe"
[[package]]
name = "spin"
version = "0.5.2"

View File

@@ -6,7 +6,6 @@ edition = "2018"
[dependencies]
bootloader = "0.9.8"
rlibc = "1.0.0"
volatile = "0.2.6"
spin = "0.5.2"

View File

@@ -1,8 +1,6 @@
#![no_std]
#![no_main]
extern crate rlibc;
use core::panic::PanicInfo;
mod vga_buffer;