Rust 1.72

.github/workflows/container-build.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       ZEPHYR_VERSION: ${{ matrix.zephyr_version }}
-      RUST_VERSION: 1.70.0
+      RUST_VERSION: 1.72.0
 
     permissions:
       contents: read

.github/workflows/main.yml

@@ -35,7 +35,7 @@ jobs:
           - run: false
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/${{ github.repository }}:zephyr-rust-${{ matrix.zephyr_version }}-1.70.0
+      image: ghcr.io/${{ github.repository }}:zephyr-rust-${{ matrix.zephyr_version }}-1.72.0
       credentials:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}

README.rst

@@ -12,7 +12,7 @@ Version Compatibility
 =====================
 **Zephyr**: v2.3, v2.7.3, v3.7. 3.0-3.6 not supported.
 
-**Rust**: exactly 1.70.0
+**Rust**: exactly 1.72.0
 
 Please use one of the above Zephyr releases before reporting issues! At the
 time you are reading this, Zephyr's main branch will likely not work, though it
@@ -79,13 +79,13 @@ included as a submodule of this project. In practice, using a different
 compiler version often fails to compile because of Rust internally making heavy
 use of unstable compiler features.
 
-The current base is stable-1.70.0. Rustup is the default workflow, and the
+The current base is stable-1.72.0. Rustup is the default workflow, and the
 rust-toolchain file in this repo should cause rustup to automatically install
 and use the right version. If not, manually install:
 
 .. code-block:: console
 
-    rustup toolchain install 1.70.0
+    rustup toolchain install 1.72.0
 
 If supplying your own rustc and cargo, make sure they are the version above.
 The build will fail if it detects a version mismatch.

ci/env.sh

@@ -1,9 +1,10 @@
 #!/bin/bash
 
 ZEPHYR_RUST="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )/.."
-RUST_VERSION="$( rustc --version | awk '{print $2}' )"
+RUST_VERSION="${RUST_VERSION:-$( rustc --version | awk '{print $2}' )}"
 ZEPHYR_VERSION=${ZEPHYR_VERSION:-3.7.0}
 # Set CONTAINER_REGISTRY to something like "zephyr-rust:" to use local images
+CONTAINER_REGISTRY="zephyr-rust:"
 CONTAINER_REGISTRY=${CONTAINER_REGISTRY:-ghcr.io/tylerwhall/zephyr-rust:zephyr-rust-}
 
 echo RUST_VERSION=$RUST_VERSION

rust-toolchain.toml

@@ -1,3 +1,3 @@
 [toolchain]
-channel = "1.70.0"
+channel = "1.72.0"
 profile = "minimal"

rust/build.sh

@@ -2,7 +2,7 @@
 
 HOST=$(rustc -vV | grep host: | cut -d ' ' -f 2)
 CARGO_ARGS="-v build --target=${RUST_TARGET_SPEC} --release"
-VERSION="1.70"
+VERSION="1.72"
 CURRENT_RUSTC_VERSION=$(rustc -vV | grep ^release: | cut -d ' ' -f 2 | cut -d '.' -f '1,2')
 
 # Assert cargo version matches the certified version

rust/zephyr-core/src/thread.rs

@@ -10,6 +10,10 @@ impl ThreadId {
         self.0.as_ptr()
     }
 
+    pub fn k_thread_suspend<C: ThreadSyscalls>(&self) {
+        C::k_thread_suspend(*self)
+    }
+
     pub fn k_wakeup<C: ThreadSyscalls>(&self) {
         C::k_wakeup(*self)
     }
@@ -20,6 +24,7 @@ impl ThreadId {
 }
 
 pub trait ThreadSyscalls {
+    fn k_thread_suspend(thread: ThreadId);
     fn k_wakeup(thread: ThreadId);
     fn k_current_get() -> crate::thread::ThreadId;
     fn k_object_access_grant<K: KObj>(kobj: &K, thread: ThreadId);
@@ -28,6 +33,10 @@ pub trait ThreadSyscalls {
 macro_rules! trait_impl {
     ($context:ident, $context_struct:path) => {
         impl ThreadSyscalls for $context_struct {
+            fn k_thread_suspend(thread: ThreadId) {
+                unsafe { zephyr_sys::syscalls::$context::k_thread_suspend(thread.tid()) }
+            }
+
             fn k_wakeup(thread: ThreadId) {
                 unsafe { zephyr_sys::syscalls::$context::k_wakeup(thread.tid()) }
             }