Skip to content

Commit 64658a6

Browse files
committed
Bump toolchain version
1 parent 677b274 commit 64658a6

File tree

6 files changed

+8
-11
lines changed

6 files changed

+8
-11
lines changed

13_integrated_testing/README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1096,7 +1096,7 @@ diff -uNr 12_exceptions_part1_groundwork/src/exception.rs 13_integrated_testing/
10961096
diff -uNr 12_exceptions_part1_groundwork/src/lib.rs 13_integrated_testing/src/lib.rs
10971097
--- 12_exceptions_part1_groundwork/src/lib.rs
10981098
+++ 13_integrated_testing/src/lib.rs
1099-
@@ -0,0 +1,170 @@
1099+
@@ -0,0 +1,169 @@
11001100
+// SPDX-License-Identifier: MIT OR Apache-2.0
11011101
+//
11021102
+// 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
12171217
+#![no_std]
12181218
+// Testing
12191219
+#![cfg_attr(test, no_main)]
1220-
+#![cfg_attr(test, feature(slice_ptr_range))]
12211220
+#![feature(custom_test_frameworks)]
12221221
+#![reexport_test_harness_main = "test_main"]
12231222
+#![test_runner(crate::test_runner)]

13_integrated_testing/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,6 @@
118118
#![no_std]
119119
// Testing
120120
#![cfg_attr(test, no_main)]
121-
#![cfg_attr(test, feature(slice_ptr_range))]
122121
#![feature(custom_test_frameworks)]
123122
#![reexport_test_harness_main = "test_main"]
124123
#![test_runner(crate::test_runner)]

14_exceptions_part2_peripheral_IRQs/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2414,7 +2414,7 @@ diff -uNr 13_integrated_testing/src/lib.rs 14_exceptions_part2_peripheral_IRQs/s
24142414
#![feature(format_args_nl)]
24152415
#![feature(global_asm)]
24162416
#![feature(linkage)]
2417-
@@ -137,6 +144,7 @@
2417+
@@ -136,6 +143,7 @@
24182418
pub mod exception;
24192419
pub mod memory;
24202420
pub mod print;

14_exceptions_part2_peripheral_IRQs/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,6 @@
125125
#![no_std]
126126
// Testing
127127
#![cfg_attr(test, no_main)]
128-
#![cfg_attr(test, feature(slice_ptr_range))]
129128
#![feature(custom_test_frameworks)]
130129
#![reexport_test_harness_main = "test_main"]
131130
#![test_runner(crate::test_runner)]

README.CN.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ _带上我最诚挚的问候,<br>Andre ([@andre-richter])_
5252
3. 安装正确的`Rust`工具链:
5353
1. 如果你已经安装了一个版本的Rust:
5454
```bash
55-
rustup toolchain add nightly-2020-09-24
56-
rustup default nightly-2020-09-24
55+
rustup toolchain add nightly-2020-10-04
56+
rustup default nightly-2020-10-04
5757
rustup component add llvm-tools-preview
5858
rustup target add aarch64-unknown-none-softfloat
5959
cargo install cargo-binutils
@@ -62,7 +62,7 @@ _带上我最诚挚的问候,<br>Andre ([@andre-richter])_
6262
2. 如果你想要全新安装:
6363
```bash
6464
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- \
65-
--default-toolchain nightly-2020-09-24 \
65+
--default-toolchain nightly-2020-10-04 \
6666
--component llvm-tools-preview
6767
6868
source $HOME/.cargo/env

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ other Unix flavors such as **macOS**, but this is only _experimental_.
6868
1. Install a suitable `Rust` toolchain:
6969
1. If you already have a version of Rust installed:
7070
```bash
71-
rustup toolchain add nightly-2020-09-24
72-
rustup default nightly-2020-09-24
71+
rustup toolchain add nightly-2020-10-04
72+
rustup default nightly-2020-10-04
7373
rustup component add llvm-tools-preview
7474
rustup target add aarch64-unknown-none-softfloat
7575
cargo install cargo-binutils
@@ -78,7 +78,7 @@ other Unix flavors such as **macOS**, but this is only _experimental_.
7878
2. If you need a fresh install:
7979
```bash
8080
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- \
81-
--default-toolchain nightly-2020-09-24 \
81+
--default-toolchain nightly-2020-10-04 \
8282
--component llvm-tools-preview
8383
8484
source $HOME/.cargo/env

0 commit comments

Comments
 (0)