From 6454ebbb03088d3e75cd6082c0194e0bbe40d424 Mon Sep 17 00:00:00 2001
From: Tyler Hall <tylerwhall@gmail.com>
Date: Wed, 9 Oct 2024 02:27:47 -0400
Subject: [PATCH] Update to Rust 1.72

---
 .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        | 17 ++++++++++++-----
 8 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/container-build.yml b/.github/workflows/container-build.yml
index 51985ff..1ffad2d 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.71.0
+      RUST_VERSION: 1.72.0
 
     permissions:
       contents: read
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 23165b7..e0aad94 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.71.0
+      image: ghcr.io/${{ github.repository }}:zephyr-rust-${{ matrix.zephyr_version }}-1.72.0
       credentials:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
diff --git a/README.rst b/README.rst
index f1d569f..a9a17e1 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.71.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.71.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.71.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.
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index d218ca7..3b744d9 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,3 +1,3 @@
 [toolchain]
-channel = "1.71.0"
+channel = "1.72.0"
 profile = "minimal"
diff --git a/rust/build.sh b/rust/build.sh
index f5f5ea5..ca447bc 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.71"
+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
diff --git a/rust/libc b/rust/libc
index 92df4e5..7e2cdbd 160000
--- a/rust/libc
+++ b/rust/libc
@@ -1 +1 @@
-Subproject commit 92df4e57811d43bfa434272376b8816bdd59ef03
+Subproject commit 7e2cdbd2860124c0d6d0bc14f007921973df6b7d
diff --git a/rust/rust b/rust/rust
index 92f25c0..3faab42 160000
--- a/rust/rust
+++ b/rust/rust
@@ -1 +1 @@
-Subproject commit 92f25c0de88138b85cc0e13142b867c51d48abea
+Subproject commit 3faab42c9027baf7938298534052b6b241dd2bff
diff --git a/rust/sysroot-stage1/Cargo.lock b/rust/sysroot-stage1/Cargo.lock
index d09a9cf..451ba56 100644
--- a/rust/sysroot-stage1/Cargo.lock
+++ b/rust/sysroot-stage1/Cargo.lock
@@ -10,6 +10,12 @@ dependencies = [
  "core",
 ]
 
+[[package]]
+name = "allocator-api2"
+version = "0.2.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f"
+
 [[package]]
 name = "cc"
 version = "1.0.79"
@@ -28,9 +34,9 @@ dependencies = [
 
 [[package]]
 name = "compiler_builtins"
-version = "0.1.92"
+version = "0.1.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64518f1ae689f74db058bbfb3238dfe6eb53f59f4ae712f1ff4348628522e190"
+checksum = "6866e0f3638013234db3c89ead7a14d278354338e7237257407500009012b23f"
 dependencies = [
  "rustc-std-workspace-core",
 ]
@@ -74,10 +80,11 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.13.2"
+version = "0.14.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
 dependencies = [
+ "allocator-api2",
  "compiler_builtins",
  "rustc-std-workspace-alloc",
  "rustc-std-workspace-core",
@@ -96,7 +103,7 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.143"
+version = "0.2.146"
 dependencies = [
  "rustc-std-workspace-core",
 ]