Skip to content

Commit 4253d26

Browse files
committed
Update to a new nightly version
Includes rust-lang/rust#83592, rust-lang/rust#85276 and rust-lang/rust#85700 which are needed to build correctly again after rustc's upgrade to LLVM 12. Signed-off-by: Boris-Chengbiao Zhou <bobo1239@web.de>
1 parent 45d79fc commit 4253d26

File tree

4 files changed

+8
-11
lines changed

4 files changed

+8
-11
lines changed

.github/workflows/ci.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
arch: [arm, arm64, ppc64le, riscv64, x86_64]
1414
toolchain: [gcc, clang, llvm]
1515
config: [debug, release]
16-
rustc: [2021-02-20]
16+
rustc: [2021-05-29]
1717
output: [src] # [src, build]
1818
install: [rustup] # [rustup, standalone]
1919
sysroot: [common] # [common, custom]
@@ -37,23 +37,23 @@ jobs:
3737
- arch: arm64
3838
toolchain: gcc
3939
config: debug
40-
rustc: 2021-02-20
40+
rustc: 2021-05-29
4141
output: build
4242
install: rustup
4343
sysroot: custom
4444

4545
- arch: ppc64le
4646
toolchain: clang
4747
config: release
48-
rustc: 2021-02-20
48+
rustc: 2021-05-29
4949
output: build
5050
install: standalone
5151
sysroot: common
5252

5353
- arch: x86_64
5454
toolchain: llvm
5555
config: debug
56-
rustc: 2021-02-20
56+
rustc: 2021-05-29
5757
output: build
5858
install: standalone
5959
sysroot: custom

Documentation/rust/quick-start.rst

+2-5
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,12 @@ rustc
2424
*****
2525

2626
A recent *nightly* Rust toolchain (with, at least, ``rustc``) is required,
27-
e.g. ``nightly-2021-02-20``. Our goal is to use a stable toolchain as soon
27+
e.g. ``nightly-2021-05-29``. Our goal is to use a stable toolchain as soon
2828
as possible, but for the moment we depend on a handful of nightly features.
2929

3030
If you are using ``rustup``, run::
3131

32-
rustup default nightly-2021-02-20
33-
34-
Please avoid the very latest nightlies (>= nightly-2021-03-05) until
35-
https://github.com/Rust-for-Linux/linux/issues/135 is resolved.
32+
rustup default nightly-2021-05-29
3633

3734
Otherwise, fetch a standalone installer or install ``rustup`` from:
3835

rust/kernel/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
allocator_api,
1717
alloc_error_handler,
1818
associated_type_defaults,
19-
const_fn,
19+
const_fn_trait_bound,
2020
const_mut_refs,
2121
const_panic,
2222
try_reserve

samples/rust/rust_stack_probing.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
55
#![no_std]
66
#![feature(allocator_api, global_asm)]
7-
#![feature(test)]
7+
#![feature(bench_black_box)]
88

99
use kernel::prelude::*;
1010

0 commit comments

Comments
 (0)