Skip to content

Commit

Permalink
Update to a new nightly version
Browse files Browse the repository at this point in the history
Includes rust-lang/rust#83592 and rust-lang/rust#85276 which were needed
to build correctly again after rustc's upgrade to LLVM 12.

Signed-off-by: Boris-Chengbiao Zhou <[email protected]>
  • Loading branch information
Bobo1239 committed May 22, 2021
1 parent 45d79fc commit 7ca25ce
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 11 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
arch: [arm, arm64, ppc64le, riscv64, x86_64]
toolchain: [gcc, clang, llvm]
config: [debug, release]
rustc: [2021-02-20]
rustc: [2021-05-22]
output: [src] # [src, build]
install: [rustup] # [rustup, standalone]
sysroot: [common] # [common, custom]
Expand All @@ -37,23 +37,23 @@ jobs:
- arch: arm64
toolchain: gcc
config: debug
rustc: 2021-02-20
rustc: 2021-05-22
output: build
install: rustup
sysroot: custom

- arch: ppc64le
toolchain: clang
config: release
rustc: 2021-02-20
rustc: 2021-05-22
output: build
install: standalone
sysroot: common

- arch: x86_64
toolchain: llvm
config: debug
rustc: 2021-02-20
rustc: 2021-05-22
output: build
install: standalone
sysroot: custom
Expand Down
7 changes: 2 additions & 5 deletions Documentation/rust/quick-start.rst
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,12 @@ rustc
*****

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

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

rustup default nightly-2021-02-20

Please avoid the very latest nightlies (>= nightly-2021-03-05) until
https://github.com/Rust-for-Linux/linux/issues/135 is resolved.
rustup default nightly-2021-05-22

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

Expand Down
2 changes: 1 addition & 1 deletion rust/kernel/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
allocator_api,
alloc_error_handler,
associated_type_defaults,
const_fn,
const_fn_trait_bound,
const_mut_refs,
const_panic,
try_reserve
Expand Down
2 changes: 1 addition & 1 deletion samples/rust/rust_stack_probing.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#![no_std]
#![feature(allocator_api, global_asm)]
#![feature(test)]
#![feature(bench_black_box)]

use kernel::prelude::*;

Expand Down

0 comments on commit 7ca25ce

Please sign in to comment.