Merge pull request #186 from toku-sa-n/master

Fix build error on latest nightly
rust-osdev · Sep 29, 2020 · 885a5c0 · 885a5c0
2 parents cdeae7c + ce4afba
commit 885a5c0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/lib.rs b/src/lib.rs
@@ -4,6 +4,7 @@
 #![cfg_attr(not(test), no_std)]
 #![cfg_attr(feature = "const_fn", feature(const_fn))]
 #![cfg_attr(feature = "const_fn", feature(const_mut_refs))]
+#![cfg_attr(feature = "const_fn", feature(const_fn_fn_ptr_basics))]
 #![cfg_attr(feature = "const_fn", feature(const_in_array_repeat_expressions))]
 #![cfg_attr(feature = "inline_asm", feature(llvm_asm))]
 #![cfg_attr(feature = "abi_x86_interrupt", feature(abi_x86_interrupt))]

diff --git a/testing/Cargo.toml b/testing/Cargo.toml
@@ -17,12 +17,16 @@ name = "double_fault_stack_overflow"
 harness = false
 
 [dependencies]
-bootloader = "0.9.3"
-uart_16550 = "0.2.0"
+bootloader = "0.9.10"
+uart_16550 = "0.2.8"
 spin = "0.5.0"
 
+# Overwrite the x86_64 crate for both direct and indirect dependencies.
 [dependencies.x86_64]
 path = ".."
+[patch.crates-io]
+x86_64 = { path = ".." }
+
 
 [dependencies.lazy_static]
 version = "1.3.0"