Bump toolchain version

pull/84/head
Andre Richter 4 years ago
parent 677b274a1f
commit 64658a6ce9
No known key found for this signature in database
GPG Key ID: 2116C1AB102F615E

@ -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 <andre.o.richter@gmail.com>
@ -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)]

@ -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)]

@ -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;

@ -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)]

@ -52,8 +52,8 @@ _带上我最诚挚的问候,<br>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 @@ _带上我最诚挚的问候,<br>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

@ -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

Loading…
Cancel
Save