From 6a5f3758fad220026981200cc4c4a927746b8c93 Mon Sep 17 00:00:00 2001 From: Andre Richter Date: Tue, 29 Sep 2020 22:48:04 +0200 Subject: [PATCH] Remove/reshuffle features --- 13_integrated_testing/README.md | 5 ++--- 13_integrated_testing/src/lib.rs | 3 +-- 14_exceptions_part2_peripheral_IRQs/README.md | 6 ++---- 14_exceptions_part2_peripheral_IRQs/src/lib.rs | 3 +-- 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/13_integrated_testing/README.md b/13_integrated_testing/README.md index 16f179e5..997df3f7 100644 --- a/13_integrated_testing/README.md +++ b/13_integrated_testing/README.md @@ -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 --- 12_exceptions_part1_groundwork/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 +// +// Copyright (c) 2018-2020 Andre Richter @@ -1207,17 +1207,16 @@ diff -uNr 12_exceptions_part1_groundwork/src/lib.rs 13_integrated_testing/src/li +#![allow(incomplete_features)] +#![feature(const_generics)] +#![feature(const_panic)] -+#![feature(custom_inner_attributes)] +#![feature(format_args_nl)] +#![feature(global_asm)] +#![feature(linkage)] +#![feature(naked_functions)] +#![feature(panic_info_message)] -+#![feature(slice_ptr_range)] +#![feature(trait_alias)] +#![no_std] +// Testing +#![cfg_attr(test, no_main)] ++#![cfg_attr(test, feature(slice_ptr_range))] +#![feature(custom_test_frameworks)] +#![reexport_test_harness_main = "test_main"] +#![test_runner(crate::test_runner)] diff --git a/13_integrated_testing/src/lib.rs b/13_integrated_testing/src/lib.rs index 8c9603e4..82a8981d 100644 --- a/13_integrated_testing/src/lib.rs +++ b/13_integrated_testing/src/lib.rs @@ -109,17 +109,16 @@ #![allow(incomplete_features)] #![feature(const_generics)] #![feature(const_panic)] -#![feature(custom_inner_attributes)] #![feature(format_args_nl)] #![feature(global_asm)] #![feature(linkage)] #![feature(naked_functions)] #![feature(panic_info_message)] -#![feature(slice_ptr_range)] #![feature(trait_alias)] #![no_std] // Testing #![cfg_attr(test, no_main)] +#![cfg_attr(test, feature(slice_ptr_range))] #![feature(custom_test_frameworks)] #![reexport_test_harness_main = "test_main"] #![test_runner(crate::test_runner)] diff --git a/14_exceptions_part2_peripheral_IRQs/README.md b/14_exceptions_part2_peripheral_IRQs/README.md index 00bbc7dc..013ec600 100644 --- a/14_exceptions_part2_peripheral_IRQs/README.md +++ b/14_exceptions_part2_peripheral_IRQs/README.md @@ -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 //! //! # Code organization and architecture -@@ -107,9 +112,11 @@ +@@ -107,8 +112,10 @@ //! - `crate::bsp::memory::*` #![allow(incomplete_features)] +#![feature(asm)] -+#![feature(const_fn)] #![feature(const_generics)] #![feature(const_panic)] --#![feature(custom_inner_attributes)] +#![feature(core_intrinsics)] #![feature(format_args_nl)] #![feature(global_asm)] #![feature(linkage)] -@@ -138,6 +145,7 @@ +@@ -137,6 +144,7 @@ pub mod exception; pub mod memory; pub mod print; diff --git a/14_exceptions_part2_peripheral_IRQs/src/lib.rs b/14_exceptions_part2_peripheral_IRQs/src/lib.rs index e171017c..51516f52 100644 --- a/14_exceptions_part2_peripheral_IRQs/src/lib.rs +++ b/14_exceptions_part2_peripheral_IRQs/src/lib.rs @@ -113,7 +113,6 @@ #![allow(incomplete_features)] #![feature(asm)] -#![feature(const_fn)] #![feature(const_generics)] #![feature(const_panic)] #![feature(core_intrinsics)] @@ -122,11 +121,11 @@ #![feature(linkage)] #![feature(naked_functions)] #![feature(panic_info_message)] -#![feature(slice_ptr_range)] #![feature(trait_alias)] #![no_std] // Testing #![cfg_attr(test, no_main)] +#![cfg_attr(test, feature(slice_ptr_range))] #![feature(custom_test_frameworks)] #![reexport_test_harness_main = "test_main"] #![test_runner(crate::test_runner)]