From 07b5449d056d6f4991212641d1bc4123e5398ad6 Mon Sep 17 00:00:00 2001
From: Boris-Chengbiao Zhou <bobo1239@web.de>
Date: Sat, 29 May 2021 04:51:34 +0200
Subject: [PATCH] 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>
---
 .github/workflows/ci.yaml          | 8 ++++----
 Documentation/rust/quick-start.rst | 7 ++-----
 rust/kernel/lib.rs                 | 2 +-
 samples/rust/rust_stack_probing.rs | 2 +-
 4 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index ffe91c6beb7417..335f857bf56b8c 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -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-29]
         output: [src] # [src, build]
         install: [rustup] # [rustup, standalone]
         sysroot: [common] # [common, custom]
@@ -37,7 +37,7 @@ jobs:
           - arch: arm64
             toolchain: gcc
             config: debug
-            rustc: 2021-02-20
+            rustc: 2021-05-29
             output: build
             install: rustup
             sysroot: custom
@@ -45,7 +45,7 @@ jobs:
           - arch: ppc64le
             toolchain: clang
             config: release
-            rustc: 2021-02-20
+            rustc: 2021-05-29
             output: build
             install: standalone
             sysroot: common
@@ -53,7 +53,7 @@ jobs:
           - arch: x86_64
             toolchain: llvm
             config: debug
-            rustc: 2021-02-20
+            rustc: 2021-05-29
             output: build
             install: standalone
             sysroot: custom
diff --git a/Documentation/rust/quick-start.rst b/Documentation/rust/quick-start.rst
index 43965f8535ee8c..5cf2be3c845ed9 100644
--- a/Documentation/rust/quick-start.rst
+++ b/Documentation/rust/quick-start.rst
@@ -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-29``. 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-29
 
 Otherwise, fetch a standalone installer or install ``rustup`` from:
 
diff --git a/rust/kernel/lib.rs b/rust/kernel/lib.rs
index 6a3593c4f8569b..05a459a00faf48 100644
--- a/rust/kernel/lib.rs
+++ b/rust/kernel/lib.rs
@@ -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
diff --git a/samples/rust/rust_stack_probing.rs b/samples/rust/rust_stack_probing.rs
index 56f96e1e05b17e..fcb87a53ce7f1c 100644
--- a/samples/rust/rust_stack_probing.rs
+++ b/samples/rust/rust_stack_probing.rs
@@ -4,7 +4,7 @@
 
 #![no_std]
 #![feature(allocator_api, global_asm)]
-#![feature(test)]
+#![feature(bench_black_box)]
 
 use kernel::prelude::*;