CI: test no_std on stable rust

As of rust 1.80, we no longer need any unstable features to test `no_std` compatibility.
bamler-lab · Oct 20, 2024 · 3045761 · 3045761
1 parent f8dfa14
commit 3045761
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 32 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -49,13 +49,19 @@ jobs:
         env:
           RUSTFLAGS: "-D warnings"
         run: cargo test
+
       - name: Test in release mode
         env:
           RUSTFLAGS: "-D warnings"
         run: cargo test --release
 
+      - name: Test `no_std` compatibility
+        shell: bash
+        working-directory: ensure_no_std
+        run: cargo build
+
   miri-test:
-    name: no_std and miri
+    name: miri
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
@@ -94,11 +100,6 @@ jobs:
           toolchain: ${{ steps.rust-version.outputs.rustc }}
           components: miri, rust-src
 
-      - name: Test `no_std` compatibility
-        shell: bash
-        working-directory: ensure_no_std
-        run: cargo +${{ steps.rust-version.outputs.rustc }} build
-
       - name: Run tests in miri
         env:
           RUSTFLAGS: "-Zrandomize-layout"

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -67,8 +67,13 @@ jobs:
           RUSTFLAGS: "-D warnings"
         run: cargo test --release
 
+      - name: Test `no_std` compatibility
+        shell: bash
+        working-directory: ensure_no_std
+        run: cargo build
+
   miri-test:
-    name: no_std and miri
+    name: miri
     runs-on: ${{ matrix.os }}
     needs: rust-test
     strategy:
@@ -120,11 +125,6 @@ jobs:
           toolchain: ${{ steps.rust-version.outputs.rustc }}
           components: miri, rust-src
 
-      - name: Test `no_std` compatibility
-        shell: bash
-        working-directory: ensure_no_std
-        run: cargo +${{ steps.rust-version.outputs.rustc }} build
-
       - name: Run tests in miri
         env:
           RUSTFLAGS: "-Zrandomize-layout"

diff --git a/ensure_no_std/Cargo.toml b/ensure_no_std/Cargo.toml
@@ -10,13 +10,14 @@
 edition = "2021"
 name = "ensure_no_std"
 version = "0.1.0"
+rust-version = "1.80.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
 constriction = {path = "..", default-features = false}
 spin = "0.9.8"
-talc = "4.2.0"
+emma = "0.0.1"
 
 [profile.dev]
 panic = "abort"

diff --git a/ensure_no_std/src/main.rs b/ensure_no_std/src/main.rs
@@ -1,36 +1,20 @@
 #![no_std]
 #![no_main]
-#![feature(alloc_error_handler)]
-#![feature(const_mut_refs)]
 
+use constriction::stream::{Decode, Encode};
 use core::panic::PanicInfo;
 
-use talc::*;
-
-static mut ARENA: [u8; 10000] = [0; 10000];
-
 #[global_allocator]
-static ALLOCATOR: Talck<spin::Mutex<()>, ClaimOnOom> =
-    Talc::new(unsafe { ClaimOnOom::new(Span::from_const_array(core::ptr::addr_of!(ARENA))) })
-        .lock();
-
-#[allow(unused_imports)]
-use constriction;
+static EMMA: emma::DefaultEmma = emma::DefaultEmma::new();
 
 #[panic_handler]
 fn panic(_info: &PanicInfo) -> ! {
+    #[allow(clippy::empty_loop)]
     loop {}
 }
 
-#[alloc_error_handler]
-fn alloc_error_handler(layout: core::alloc::Layout) -> ! {
-    panic!("Can't handle allocation: layout = {:?}", layout);
-}
-
 #[no_mangle]
 pub extern "C" fn _start() -> ! {
-    use constriction::stream::{Decode, Encode};
-
     let model = constriction::stream::model::DefaultUniformModel::new(10);
 
     let mut encoder = constriction::stream::stack::DefaultAnsCoder::new();
@@ -43,5 +27,6 @@ pub extern "C" fn _start() -> ! {
     assert_eq!(decoder.decode_symbol(model), Ok(5));
     assert_eq!(decoder.decode_symbol(model), Ok(3));
 
+    #[allow(clippy::empty_loop)]
     loop {}
 }