mirror of
https://github.com/phil-opp/blog_os.git
synced 2025-12-16 14:27:49 +00:00
Merge branch 'post-10' into post-11
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
[unstable]
|
||||
build-std = ["core", "compiler_builtins", "alloc"]
|
||||
build-std-features = ["compiler-builtins-mem"]
|
||||
|
||||
[build]
|
||||
target = "x86_64-blog_os.json"
|
||||
|
||||
7
Cargo.lock
generated
7
Cargo.lock
generated
@@ -21,7 +21,6 @@ dependencies = [
|
||||
"linked_list_allocator",
|
||||
"pc-keyboard",
|
||||
"pic8259_simple",
|
||||
"rlibc",
|
||||
"spin",
|
||||
"uart_16550",
|
||||
"volatile",
|
||||
@@ -82,12 +81,6 @@ dependencies = [
|
||||
"cpuio",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rlibc"
|
||||
version = "1.0.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "fc874b127765f014d792f16763a81245ab80500e2ad921ed4ee9e82481ee08fe"
|
||||
|
||||
[[package]]
|
||||
name = "scopeguard"
|
||||
version = "1.1.0"
|
||||
|
||||
@@ -14,7 +14,6 @@ harness = false
|
||||
|
||||
[dependencies]
|
||||
bootloader = { version = "0.9.8", features = ["map_physical_memory"]}
|
||||
rlibc = "1.0.0"
|
||||
volatile = "0.2.6"
|
||||
spin = "0.5.2"
|
||||
x86_64 = "0.12.1"
|
||||
|
||||
@@ -9,8 +9,6 @@
|
||||
#![reexport_test_harness_main = "test_main"]
|
||||
|
||||
extern crate alloc;
|
||||
extern crate rlibc;
|
||||
|
||||
use core::panic::PanicInfo;
|
||||
|
||||
pub mod allocator;
|
||||
|
||||
Reference in New Issue
Block a user