Merge #297

297: Revert "Upgrade to recent nightly channel" r=stlankes a=mkroening Reverts #292 #292 this was not meant to be merged yet. See hermit-os/hermit-rs#170. I was sure, bors would play nicely with draft PRs nowadays. Sorry. bors r+ Co-authored-by: Martin Kröning <mkroening@posteo.net>
hermit-os · Nov 26, 2021 · df466cd · df466cd
2 parents e457538 + e1d94cf
commit df466cd
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git 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
@@ -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
@@ -1,5 +1,5 @@
 [toolchain]
-channel = "nightly-2021-10-20"
+channel = "nightly-2021-09-29"
 components = [
     "rust-src",
     "llvm-tools-preview",