From 13146c3ac99a0be6fcfa0c3b3cbe686f92b53c7a Mon Sep 17 00:00:00 2001 From: toku-sa-n Date: Tue, 29 Sep 2020 11:50:35 +0900 Subject: [PATCH 1/2] Fix build error on latest nightly --- src/lib.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lib.rs b/src/lib.rs index 056623316..0466925bf 100644 --- 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))] From ce4afba69f4be629fbb9159ab830a86fe90303e1 Mon Sep 17 00:00:00 2001 From: Joe Richey Date: Mon, 28 Sep 2020 23:35:37 -0700 Subject: [PATCH 2/2] Force use of the parent directory for indirect dependancies Signed-off-by: Joe Richey --- testing/Cargo.toml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/testing/Cargo.toml b/testing/Cargo.toml index ef69bc56c..fe08cc67c 100644 --- 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"