From 2881ec71de4309070104d7546fd38a65723321f6 Mon Sep 17 00:00:00 2001
From: Niklas Sombert <niklas@ytvwld.de>
Date: Mon, 17 Oct 2022 15:29:32 +0200
Subject: [PATCH] Don't explicitly require compiler-builtins(-mem)

They are implicit on uefi as of
https://github.com/rust-lang/compiler-builtins/pull/473.

The first nightly version where this is working is 2022-08-08.
---
 .github/workflows/msrv_toolchain.toml | 2 +-
 README.md                             | 2 +-
 book/src/tutorial/building.md         | 6 ++----
 template/.cargo/config                | 3 +--
 xtask/src/cargo.rs                    | 7 +------
 5 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/msrv_toolchain.toml b/.github/workflows/msrv_toolchain.toml
index 640fc4616..e95bd0892 100644
--- a/.github/workflows/msrv_toolchain.toml
+++ b/.github/workflows/msrv_toolchain.toml
@@ -1,4 +1,4 @@
 [toolchain]
 # Oldest nightly that currently works with `cargo xtask build`.
-channel = "nightly-2022-04-18"
+channel = "nightly-2022-08-08"
 components = ["rust-src"]
diff --git a/README.md b/README.md
index 2006bb7ef..e676afbb6 100644
--- a/README.md
+++ b/README.md
@@ -104,7 +104,7 @@ prerequisites for running the tests.
 For instructions on how to create your own UEFI apps, see the [BUILDING.md](BUILDING.md) file.
 
 The uefi-rs crates currently require some [unstable features].
-The nightly MSRV is currently 2022-04-18.
+The nightly MSRV is currently 2022-08-08.
 
 [unstable features]: https://github.com/rust-osdev/uefi-rs/issues/452
 
diff --git a/book/src/tutorial/building.md b/book/src/tutorial/building.md
index 8938a8ec5..9130a9dda 100644
--- a/book/src/tutorial/building.md
+++ b/book/src/tutorial/building.md
@@ -24,8 +24,7 @@ Run this command to build the application:
 
 ```sh
 cargo build --target x86_64-unknown-uefi \
-    -Zbuild-std=core,compiler_builtins,alloc \
-    -Zbuild-std-features=compiler-builtins-mem
+    -Zbuild-std=core,alloc
 ```
 
 This will produce an x86-64 executable:
@@ -49,8 +48,7 @@ Create `.cargo/config.toml` with these contents:
 target = "x86_64-unknown-uefi"
 
 [unstable]
-build-std = ["core", "compiler_builtins", "alloc"]
-build-std-features = ["compiler-builtins-mem"]
+build-std = ["core", "alloc"]
 ```
 
 Now you can build much more simply:
diff --git a/template/.cargo/config b/template/.cargo/config
index 422bf9d2a..7317206c5 100644
--- a/template/.cargo/config
+++ b/template/.cargo/config
@@ -1,3 +1,2 @@
 [unstable]
-build-std = ["core", "compiler_builtins", "alloc"]
-build-std-features = ["compiler-builtins-mem"]
+build-std = ["core", "alloc"]
diff --git a/xtask/src/cargo.rs b/xtask/src/cargo.rs
index faef9d552..c28731602 100644
--- a/xtask/src/cargo.rs
+++ b/xtask/src/cargo.rs
@@ -221,12 +221,7 @@ impl Cargo {
         }
 
         if let Some(target) = self.target {
-            cmd.args([
-                "--target",
-                target.as_triple(),
-                "-Zbuild-std=core,compiler_builtins,alloc",
-                "-Zbuild-std-features=compiler-builtins-mem",
-            ]);
+            cmd.args(["--target", target.as_triple(), "-Zbuild-std=core,alloc"]);
         }
 
         if self.packages.is_empty() {