Remove/reshuffle features

pull/84/head
Andre Richter 4 years ago
parent 7b0ae693c7
commit 6a5f3758fa
No known key found for this signature in database
GPG Key ID: 2116C1AB102F615E

@ -1095,7 +1095,7 @@ diff -uNr 12_exceptions_part1_groundwork/src/exception.rs 13_integrated_testing/
diff -uNr 12_exceptions_part1_groundwork/src/lib.rs 13_integrated_testing/src/lib.rs diff -uNr 12_exceptions_part1_groundwork/src/lib.rs 13_integrated_testing/src/lib.rs
--- 12_exceptions_part1_groundwork/src/lib.rs --- 12_exceptions_part1_groundwork/src/lib.rs
+++ 13_integrated_testing/src/lib.rs +++ 13_integrated_testing/src/lib.rs
@@ -0,0 +1,171 @@ @@ -0,0 +1,170 @@
+// SPDX-License-Identifier: MIT OR Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0
+// +//
+// Copyright (c) 2018-2020 Andre Richter <andre.o.richter@gmail.com> +// Copyright (c) 2018-2020 Andre Richter <andre.o.richter@gmail.com>
@ -1207,17 +1207,16 @@ diff -uNr 12_exceptions_part1_groundwork/src/lib.rs 13_integrated_testing/src/li
+#![allow(incomplete_features)] +#![allow(incomplete_features)]
+#![feature(const_generics)] +#![feature(const_generics)]
+#![feature(const_panic)] +#![feature(const_panic)]
+#![feature(custom_inner_attributes)]
+#![feature(format_args_nl)] +#![feature(format_args_nl)]
+#![feature(global_asm)] +#![feature(global_asm)]
+#![feature(linkage)] +#![feature(linkage)]
+#![feature(naked_functions)] +#![feature(naked_functions)]
+#![feature(panic_info_message)] +#![feature(panic_info_message)]
+#![feature(slice_ptr_range)]
+#![feature(trait_alias)] +#![feature(trait_alias)]
+#![no_std] +#![no_std]
+// Testing +// Testing
+#![cfg_attr(test, no_main)] +#![cfg_attr(test, no_main)]
+#![cfg_attr(test, feature(slice_ptr_range))]
+#![feature(custom_test_frameworks)] +#![feature(custom_test_frameworks)]
+#![reexport_test_harness_main = "test_main"] +#![reexport_test_harness_main = "test_main"]
+#![test_runner(crate::test_runner)] +#![test_runner(crate::test_runner)]

@ -109,17 +109,16 @@
#![allow(incomplete_features)] #![allow(incomplete_features)]
#![feature(const_generics)] #![feature(const_generics)]
#![feature(const_panic)] #![feature(const_panic)]
#![feature(custom_inner_attributes)]
#![feature(format_args_nl)] #![feature(format_args_nl)]
#![feature(global_asm)] #![feature(global_asm)]
#![feature(linkage)] #![feature(linkage)]
#![feature(naked_functions)] #![feature(naked_functions)]
#![feature(panic_info_message)] #![feature(panic_info_message)]
#![feature(slice_ptr_range)]
#![feature(trait_alias)] #![feature(trait_alias)]
#![no_std] #![no_std]
// Testing // Testing
#![cfg_attr(test, no_main)] #![cfg_attr(test, no_main)]
#![cfg_attr(test, feature(slice_ptr_range))]
#![feature(custom_test_frameworks)] #![feature(custom_test_frameworks)]
#![reexport_test_harness_main = "test_main"] #![reexport_test_harness_main = "test_main"]
#![test_runner(crate::test_runner)] #![test_runner(crate::test_runner)]

@ -2419,20 +2419,18 @@ diff -uNr 13_integrated_testing/src/lib.rs 14_exceptions_part2_peripheral_IRQs/s
//! [timer interface]: ../libkernel/time/interface/trait.TimeManager.html //! [timer interface]: ../libkernel/time/interface/trait.TimeManager.html
//! //!
//! # Code organization and architecture //! # Code organization and architecture
@@ -107,9 +112,11 @@ @@ -107,8 +112,10 @@
//! - `crate::bsp::memory::*` //! - `crate::bsp::memory::*`
#![allow(incomplete_features)] #![allow(incomplete_features)]
+#![feature(asm)] +#![feature(asm)]
+#![feature(const_fn)]
#![feature(const_generics)] #![feature(const_generics)]
#![feature(const_panic)] #![feature(const_panic)]
-#![feature(custom_inner_attributes)]
+#![feature(core_intrinsics)] +#![feature(core_intrinsics)]
#![feature(format_args_nl)] #![feature(format_args_nl)]
#![feature(global_asm)] #![feature(global_asm)]
#![feature(linkage)] #![feature(linkage)]
@@ -138,6 +145,7 @@ @@ -137,6 +144,7 @@
pub mod exception; pub mod exception;
pub mod memory; pub mod memory;
pub mod print; pub mod print;

@ -113,7 +113,6 @@
#![allow(incomplete_features)] #![allow(incomplete_features)]
#![feature(asm)] #![feature(asm)]
#![feature(const_fn)]
#![feature(const_generics)] #![feature(const_generics)]
#![feature(const_panic)] #![feature(const_panic)]
#![feature(core_intrinsics)] #![feature(core_intrinsics)]
@ -122,11 +121,11 @@
#![feature(linkage)] #![feature(linkage)]
#![feature(naked_functions)] #![feature(naked_functions)]
#![feature(panic_info_message)] #![feature(panic_info_message)]
#![feature(slice_ptr_range)]
#![feature(trait_alias)] #![feature(trait_alias)]
#![no_std] #![no_std]
// Testing // Testing
#![cfg_attr(test, no_main)] #![cfg_attr(test, no_main)]
#![cfg_attr(test, feature(slice_ptr_range))]
#![feature(custom_test_frameworks)] #![feature(custom_test_frameworks)]
#![reexport_test_harness_main = "test_main"] #![reexport_test_harness_main = "test_main"]
#![test_runner(crate::test_runner)] #![test_runner(crate::test_runner)]

Loading…
Cancel
Save