diff --git a/13_integrated_testing/README.md b/13_integrated_testing/README.md index 94a52ebf..bb2942bd 100644 --- a/13_integrated_testing/README.md +++ b/13_integrated_testing/README.md @@ -1096,7 +1096,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,170 @@ +@@ -0,0 +1,169 @@ +// SPDX-License-Identifier: MIT OR Apache-2.0 +// +// Copyright (c) 2018-2020 Andre Richter @@ -1217,7 +1217,6 @@ diff -uNr 12_exceptions_part1_groundwork/src/lib.rs 13_integrated_testing/src/li +#![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 82a8981d..5bd45be4 100644 --- a/13_integrated_testing/src/lib.rs +++ b/13_integrated_testing/src/lib.rs @@ -118,7 +118,6 @@ #![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 41486728..61280808 100644 --- a/14_exceptions_part2_peripheral_IRQs/README.md +++ b/14_exceptions_part2_peripheral_IRQs/README.md @@ -2414,7 +2414,7 @@ diff -uNr 13_integrated_testing/src/lib.rs 14_exceptions_part2_peripheral_IRQs/s #![feature(format_args_nl)] #![feature(global_asm)] #![feature(linkage)] -@@ -137,6 +144,7 @@ +@@ -136,6 +143,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 51516f52..ddb7f67f 100644 --- a/14_exceptions_part2_peripheral_IRQs/src/lib.rs +++ b/14_exceptions_part2_peripheral_IRQs/src/lib.rs @@ -125,7 +125,6 @@ #![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/README.CN.md b/README.CN.md index 7ace7d62..c8906086 100644 --- a/README.CN.md +++ b/README.CN.md @@ -52,8 +52,8 @@ _带上我最诚挚的问候,
Andre ([@andre-richter])_ 3. 安装正确的`Rust`工具链: 1. 如果你已经安装了一个版本的Rust: ```bash - rustup toolchain add nightly-2020-09-24 - rustup default nightly-2020-09-24 + rustup toolchain add nightly-2020-10-04 + rustup default nightly-2020-10-04 rustup component add llvm-tools-preview rustup target add aarch64-unknown-none-softfloat cargo install cargo-binutils @@ -62,7 +62,7 @@ _带上我最诚挚的问候,
Andre ([@andre-richter])_ 2. 如果你想要全新安装: ```bash curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- \ - --default-toolchain nightly-2020-09-24 \ + --default-toolchain nightly-2020-10-04 \ --component llvm-tools-preview source $HOME/.cargo/env diff --git a/README.md b/README.md index a38a4e8c..dc034b1d 100644 --- a/README.md +++ b/README.md @@ -68,8 +68,8 @@ other Unix flavors such as **macOS**, but this is only _experimental_. 1. Install a suitable `Rust` toolchain: 1. If you already have a version of Rust installed: ```bash - rustup toolchain add nightly-2020-09-24 - rustup default nightly-2020-09-24 + rustup toolchain add nightly-2020-10-04 + rustup default nightly-2020-10-04 rustup component add llvm-tools-preview rustup target add aarch64-unknown-none-softfloat cargo install cargo-binutils @@ -78,7 +78,7 @@ other Unix flavors such as **macOS**, but this is only _experimental_. 2. If you need a fresh install: ```bash curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- \ - --default-toolchain nightly-2020-09-24 \ + --default-toolchain nightly-2020-10-04 \ --component llvm-tools-preview source $HOME/.cargo/env