Merge branch 'post-11' into post-12

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

7
Cargo.lock generated
View File

@@ -30,7 +30,6 @@ dependencies = [
"linked_list_allocator",
"pc-keyboard",
"pic8259_simple",
"rlibc",
"spin",
"uart_16550",
"volatile",
@@ -207,12 +206,6 @@ dependencies = [
"proc-macro2",
]
[[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"