diff --git a/14_exceptions_part2_peripheral_IRQs/README.md b/14_exceptions_part2_peripheral_IRQs/README.md index 3646b384..ee7f1597 100644 --- a/14_exceptions_part2_peripheral_IRQs/README.md +++ b/14_exceptions_part2_peripheral_IRQs/README.md @@ -2568,7 +2568,7 @@ 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,8 +112,12 @@ +@@ -107,8 +112,11 @@ //! - `crate::bsp::memory::*` #![allow(incomplete_features)] @@ -2576,13 +2576,12 @@ diff -uNr 13_integrated_testing/src/lib.rs 14_exceptions_part2_peripheral_IRQs/s +#![feature(const_fn)] #![feature(const_generics)] -#![feature(custom_inner_attributes)] -+#![feature(const_if_match)] +#![feature(const_panic)] +#![feature(core_intrinsics)] #![feature(format_args_nl)] #![feature(global_asm)] #![feature(linkage)] -@@ -137,6 +146,7 @@ +@@ -137,6 +145,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 c6a431c3..e171017c 100644 --- a/14_exceptions_part2_peripheral_IRQs/src/lib.rs +++ b/14_exceptions_part2_peripheral_IRQs/src/lib.rs @@ -115,7 +115,6 @@ #![feature(asm)] #![feature(const_fn)] #![feature(const_generics)] -#![feature(const_if_match)] #![feature(const_panic)] #![feature(core_intrinsics)] #![feature(format_args_nl)] diff --git a/README.CN.md b/README.CN.md index ca4b1cf4..7617a6b8 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-06-28 - rustup default nightly-2020-06-28 + rustup toolchain add nightly-2020-06-30 + rustup default nightly-2020-06-30 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-06-28 \ + --default-toolchain nightly-2020-06-30 \ --component llvm-tools-preview source $HOME/.cargo/env diff --git a/README.md b/README.md index a4456ddd..1db0f5ca 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-06-28 - rustup default nightly-2020-06-28 + rustup toolchain add nightly-2020-06-30 + rustup default nightly-2020-06-30 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-06-28 \ + --default-toolchain nightly-2020-06-30 \ --component llvm-tools-preview source $HOME/.cargo/env