From e1d94cf764a78e129d0eb2facc81a19ebf363459 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Kr=C3=B6ning?= <mkroening@posteo.net>
Date: Wed, 24 Nov 2021 13:00:19 +0100
Subject: [PATCH] Revert "Upgrade to recent nightly channel"
---
.cargo/config.toml | 1 -
.github/workflows/x86.yml | 2 +-
rust-toolchain.toml | 2 +-
3 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/.cargo/config.toml b/.cargo/config.toml
index 4b1b35d41..334b3e8f5 100644
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@@ -1,5 +1,4 @@
[unstable]
-# Keep in sync with CI!
build-std = ["core", "alloc"]
build-std-features = ["compiler-builtins-mem"]
diff --git a/.github/workflows/x86.yml b/.github/workflows/x86.yml
index 04b3a29cc..554fd66f6 100644
--- a/.github/workflows/x86.yml
+++ b/.github/workflows/x86.yml
@@ -39,7 +39,7 @@ jobs:
run: rustup show
- name: Build minimal kernel
working-directory: libhermit-rs
- run: cargo build --no-default-features -Z build-std=core,alloc
+ run: cargo build --no-default-features
- name: Build dev profile
run: cargo build
- name: Unittests on host (ubuntu)
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index 37093c294..fe707619c 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,5 +1,5 @@
[toolchain]
-channel = "nightly-2021-10-20"
+channel = "nightly-2021-09-29"
components = [
"rust-src",
"llvm-tools-preview",
--
GitLab