diff --git a/.github/workflows/container-build.yml b/.github/workflows/container-build.yml index 1ffad2d..f3378cb 100644 --- a/.github/workflows/container-build.yml +++ b/.github/workflows/container-build.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest env: ZEPHYR_VERSION: ${{ matrix.zephyr_version }} - RUST_VERSION: 1.72.0 + RUST_VERSION: 1.75.0 permissions: contents: read diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e0aad94..20cadbf 100644 --- a/.github/workflows/main.yml +++ b/.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.72.0 + image: ghcr.io/${{ github.repository }}:zephyr-rust-${{ matrix.zephyr_version }}-1.75.0 credentials: username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} diff --git a/README.rst b/README.rst index a9a17e1..1efc037 100644 --- a/README.rst +++ b/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.72.0 +**Rust**: exactly 1.75.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.72.0. Rustup is the default workflow, and the +The current base is stable-1.75.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.72.0 + rustup toolchain install 1.75.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. diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 3b744d9..31f1ac6 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,3 +1,3 @@ [toolchain] -channel = "1.72.0" +channel = "1.75.0" profile = "minimal" diff --git a/rust/build.sh b/rust/build.sh index ca447bc..f1b789c 100755 --- a/rust/build.sh +++ b/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.72" +VERSION="1.75" CURRENT_RUSTC_VERSION=$(rustc -vV | grep ^release: | cut -d ' ' -f 2 | cut -d '.' -f '1,2') # Assert cargo version matches the certified version diff --git a/rust/libc b/rust/libc index 2876f78..e9d6ca5 160000 --- a/rust/libc +++ b/rust/libc @@ -1 +1 @@ -Subproject commit 2876f782d540017d38a9a24ad332cfc47fb3f000 +Subproject commit e9d6ca5351ddfcf088b5329e63db637217f220f0 diff --git a/rust/rust b/rust/rust index 3faab42..6187e27 160000 --- a/rust/rust +++ b/rust/rust @@ -1 +1 @@ -Subproject commit 3faab42c9027baf7938298534052b6b241dd2bff +Subproject commit 6187e27699b7efb5996196d07429d837d9d2306d diff --git a/rust/sysroot-stage1/Cargo.lock b/rust/sysroot-stage1/Cargo.lock index 451ba56..04e629e 100644 --- a/rust/sysroot-stage1/Cargo.lock +++ b/rust/sysroot-stage1/Cargo.lock @@ -16,12 +16,6 @@ version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" -[[package]] -name = "cc" -version = "1.0.79" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" - [[package]] name = "cfg-if" version = "1.0.0" @@ -34,9 +28,9 @@ dependencies = [ [[package]] name = "compiler_builtins" -version = "0.1.95" +version = "0.1.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6866e0f3638013234db3c89ead7a14d278354338e7237257407500009012b23f" +checksum = "a3b73c3443a5fd2438d7ba4853c64e4c8efc2404a9e28a9234cc2d5eebc6c242" dependencies = [ "rustc-std-workspace-core", ] @@ -103,7 +97,7 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.146" +version = "0.2.150" dependencies = [ "rustc-std-workspace-core", ] @@ -137,6 +131,27 @@ dependencies = [ "proc-macro2", ] +[[package]] +name = "r-efi" +version = "4.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9e935efc5854715dfc0a4c9ef18dc69dee0ec3bf9cc3ab740db831c0fdd86a3" +dependencies = [ + "compiler_builtins", + "rustc-std-workspace-core", +] + +[[package]] +name = "r-efi-alloc" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31d6f09fe2b6ad044bc3d2c34ce4979796581afd2f1ebc185837e02421e02fd7" +dependencies = [ + "compiler_builtins", + "r-efi", + "rustc-std-workspace-core", +] + [[package]] name = "rustc-demangle" version = "0.1.21" @@ -199,6 +214,8 @@ dependencies = [ "hermit-abi", "libc", "panic_abort", + "r-efi", + "r-efi-alloc", "rustc-demangle", "std_detect", "unwind", @@ -253,7 +270,6 @@ checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" name = "unwind" version = "0.0.0" dependencies = [ - "cc", "cfg-if", "compiler_builtins", "core",