From ba12ad4f1d57208d0fc889bf17a9f43eda7150fb Mon Sep 17 00:00:00 2001
From: Tyler Hall <tylerwhall@gmail.com>
Date: Sun, 20 Oct 2024 21:55:59 -0400
Subject: [PATCH 1/3] Update to Rust 1.73

---
 .github/workflows/container-build.yml | 2 +-
 .github/workflows/main.yml            | 2 +-
 README.rst                            | 6 +++---
 rust-toolchain.toml                   | 2 +-
 rust/build.sh                         | 2 +-
 rust/rust                             | 2 +-
 rust/sysroot-stage1/Cargo.lock        | 4 ++--
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/container-build.yml b/.github/workflows/container-build.yml
index 1ffad2d..935a863 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.73.0
 
     permissions:
       contents: read
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index e0aad94..f28866a 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.73.0
       credentials:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
diff --git a/README.rst b/README.rst
index a9a17e1..2e914cc 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.73.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.73.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.73.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..9e09111 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,3 +1,3 @@
 [toolchain]
-channel = "1.72.0"
+channel = "1.73.0"
 profile = "minimal"
diff --git a/rust/build.sh b/rust/build.sh
index ca447bc..be78cba 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.73"
 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/rust b/rust/rust
index 3faab42..87c9837 160000
--- a/rust/rust
+++ b/rust/rust
@@ -1 +1 @@
-Subproject commit 3faab42c9027baf7938298534052b6b241dd2bff
+Subproject commit 87c9837cf757a2406b46dad8a81ee954217cff36
diff --git a/rust/sysroot-stage1/Cargo.lock b/rust/sysroot-stage1/Cargo.lock
index 451ba56..2fda7a0 100644
--- a/rust/sysroot-stage1/Cargo.lock
+++ b/rust/sysroot-stage1/Cargo.lock
@@ -34,9 +34,9 @@ dependencies = [
 
 [[package]]
 name = "compiler_builtins"
-version = "0.1.95"
+version = "0.1.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6866e0f3638013234db3c89ead7a14d278354338e7237257407500009012b23f"
+checksum = "d6c0f24437059853f0fa64afc51f338f93647a3de4cf3358ba1bb4171a199775"
 dependencies = [
  "rustc-std-workspace-core",
 ]

From 6ddb7961332a13646dd625ecb68578c0077ef977 Mon Sep 17 00:00:00 2001
From: Tyler Hall <tylerwhall@gmail.com>
Date: Sun, 20 Oct 2024 22:08:46 -0400
Subject: [PATCH 2/3] Update to Rust 1.74

---
 .github/workflows/container-build.yml |  2 +-
 .github/workflows/main.yml            |  2 +-
 README.rst                            |  6 +++---
 rust-toolchain.toml                   |  2 +-
 rust/build.sh                         |  2 +-
 rust/libc                             |  2 +-
 rust/rust                             |  2 +-
 rust/sysroot-stage1/Cargo.lock        | 25 ++++++++++++++++++++++++-
 8 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/container-build.yml b/.github/workflows/container-build.yml
index 935a863..367f822 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.73.0
+      RUST_VERSION: 1.74.0
 
     permissions:
       contents: read
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index f28866a..404d345 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.73.0
+      image: ghcr.io/${{ github.repository }}:zephyr-rust-${{ matrix.zephyr_version }}-1.74.0
       credentials:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
diff --git a/README.rst b/README.rst
index 2e914cc..10ed097 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.73.0
+**Rust**: exactly 1.74.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.73.0. Rustup is the default workflow, and the
+The current base is stable-1.74.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.73.0
+    rustup toolchain install 1.74.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 9e09111..cdf516e 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,3 +1,3 @@
 [toolchain]
-channel = "1.73.0"
+channel = "1.74.0"
 profile = "minimal"
diff --git a/rust/build.sh b/rust/build.sh
index be78cba..a923c36 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.73"
+VERSION="1.74"
 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..c51d2d2 160000
--- a/rust/libc
+++ b/rust/libc
@@ -1 +1 @@
-Subproject commit 2876f782d540017d38a9a24ad332cfc47fb3f000
+Subproject commit c51d2d26adb2144d16bd17ef83ad9fe4eb3cb8b2
diff --git a/rust/rust b/rust/rust
index 87c9837..d0c3877 160000
--- a/rust/rust
+++ b/rust/rust
@@ -1 +1 @@
-Subproject commit 87c9837cf757a2406b46dad8a81ee954217cff36
+Subproject commit d0c3877f47b69cb03d1aee15fb1b19a72ef2fb36
diff --git a/rust/sysroot-stage1/Cargo.lock b/rust/sysroot-stage1/Cargo.lock
index 2fda7a0..dd7163d 100644
--- a/rust/sysroot-stage1/Cargo.lock
+++ b/rust/sysroot-stage1/Cargo.lock
@@ -103,7 +103,7 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.146"
+version = "0.2.148"
 dependencies = [
  "rustc-std-workspace-core",
 ]
@@ -137,6 +137,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 +220,8 @@ dependencies = [
  "hermit-abi",
  "libc",
  "panic_abort",
+ "r-efi",
+ "r-efi-alloc",
  "rustc-demangle",
  "std_detect",
  "unwind",

From 6c83c67dfd84396408366602b1d1793ccf66aa7a Mon Sep 17 00:00:00 2001
From: Tyler Hall <tylerwhall@gmail.com>
Date: Sun, 20 Oct 2024 22:19:55 -0400
Subject: [PATCH 3/3] Update to Rust 1.75

---
 .github/workflows/container-build.yml |  2 +-
 .github/workflows/main.yml            |  2 +-
 README.rst                            |  6 +++---
 rust-toolchain.toml                   |  2 +-
 rust/build.sh                         |  2 +-
 rust/libc                             |  2 +-
 rust/rust                             |  2 +-
 rust/sysroot-stage1/Cargo.lock        | 13 +++----------
 8 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/container-build.yml b/.github/workflows/container-build.yml
index 367f822..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.74.0
+      RUST_VERSION: 1.75.0
 
     permissions:
       contents: read
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 404d345..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.74.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 10ed097..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.74.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.74.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.74.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 cdf516e..31f1ac6 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,3 +1,3 @@
 [toolchain]
-channel = "1.74.0"
+channel = "1.75.0"
 profile = "minimal"
diff --git a/rust/build.sh b/rust/build.sh
index a923c36..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.74"
+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 c51d2d2..e9d6ca5 160000
--- a/rust/libc
+++ b/rust/libc
@@ -1 +1 @@
-Subproject commit c51d2d26adb2144d16bd17ef83ad9fe4eb3cb8b2
+Subproject commit e9d6ca5351ddfcf088b5329e63db637217f220f0
diff --git a/rust/rust b/rust/rust
index d0c3877..6187e27 160000
--- a/rust/rust
+++ b/rust/rust
@@ -1 +1 @@
-Subproject commit d0c3877f47b69cb03d1aee15fb1b19a72ef2fb36
+Subproject commit 6187e27699b7efb5996196d07429d837d9d2306d
diff --git a/rust/sysroot-stage1/Cargo.lock b/rust/sysroot-stage1/Cargo.lock
index dd7163d..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.100"
+version = "0.1.103"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6c0f24437059853f0fa64afc51f338f93647a3de4cf3358ba1bb4171a199775"
+checksum = "a3b73c3443a5fd2438d7ba4853c64e4c8efc2404a9e28a9234cc2d5eebc6c242"
 dependencies = [
  "rustc-std-workspace-core",
 ]
@@ -103,7 +97,7 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.148"
+version = "0.2.150"
 dependencies = [
  "rustc-std-workspace-core",
 ]
@@ -276,7 +270,6 @@ checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
 name = "unwind"
 version = "0.0.0"
 dependencies = [
- "cc",
  "cfg-if",
  "compiler_builtins",
  "core",