From 9b82998f9daf60c3125028da2d01b78b81b9ae7c Mon Sep 17 00:00:00 2001
From: Nick Spinale <nick@nickspinale.com>
Date: Tue, 24 Sep 2024 17:08:11 -0700
Subject: [PATCH] Bump unwinding crate

Signed-off-by: Nick Spinale <nick@nickspinale.com>
---
 Cargo.lock                                       | 16 +++++-----------
 crates/sel4-backtrace/Cargo.toml                 |  2 +-
 crates/sel4-backtrace/src/lib.rs                 |  2 +-
 crates/sel4-panicking/Cargo.toml                 |  2 +-
 crates/sel4-runtime-common/Cargo.toml            |  2 +-
 crates/sel4-runtime-common/src/unwinding.rs      |  2 +-
 .../cargo-manifest-management/manifest-scope.nix |  2 +-
 7 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e84da0f07..767d74461 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -39,7 +39,7 @@ checksum = "7b9d03130b08257bc8110b0df827d8b137fdf67a95e2459eaace2e13fecf1d72"
 dependencies = [
  "cpp_demangle",
  "fallible-iterator 0.3.0",
- "gimli 0.30.0",
+ "gimli",
  "rustc-demangle",
  "smallvec",
 ]
@@ -798,12 +798,6 @@ dependencies = [
  "wasi",
 ]
 
-[[package]]
-name = "gimli"
-version = "0.26.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d"
-
 [[package]]
 name = "gimli"
 version = "0.30.0"
@@ -1977,7 +1971,7 @@ name = "sel4-backtrace-addr2line-context-helper"
 version = "0.1.0"
 dependencies = [
  "addr2line",
- "gimli 0.30.0",
+ "gimli",
  "object",
  "stable_deref_trait",
 ]
@@ -3353,11 +3347,11 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
 
 [[package]]
 name = "unwinding"
-version = "0.1.7"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf10020069685fe1046038e07aec0b92b087ed282aa620c9afd9671b7f26ce9d"
+checksum = "dc55842d0db6329a669d55a623c674b02d677b16bfb2d24857d4089d41eba882"
 dependencies = [
- "gimli 0.26.2",
+ "gimli",
 ]
 
 [[package]]
diff --git a/crates/sel4-backtrace/Cargo.toml b/crates/sel4-backtrace/Cargo.toml
index 62f7d96d5..46b44b4cd 100644
--- a/crates/sel4-backtrace/Cargo.toml
+++ b/crates/sel4-backtrace/Cargo.toml
@@ -29,7 +29,7 @@ sel4-backtrace-types = { path = "types" }
 serde = { version = "1.0.147", default-features = false, optional = true }
 
 [dependencies.unwinding]
-version = "0.1.6"
+version = "0.2.1"
 default-features = false
 features = ["unwinder", "fde-custom", "hide-trace"]
 optional = true
diff --git a/crates/sel4-backtrace/src/lib.rs b/crates/sel4-backtrace/src/lib.rs
index b3248c38f..270eb8c3c 100644
--- a/crates/sel4-backtrace/src/lib.rs
+++ b/crates/sel4-backtrace/src/lib.rs
@@ -27,7 +27,7 @@ cfg_if::cfg_if! {
             }
 
             extern "C" fn callback<F1: FnMut(Entry) -> Result<(), E1>, E1>(
-                unwind_ctx: &mut UnwindContext,
+                unwind_ctx: &UnwindContext,
                 arg: *mut c_void,
             ) -> UnwindReasonCode {
                 let data = unsafe { &mut *(arg as *mut CallbackData<F1>) };
diff --git a/crates/sel4-panicking/Cargo.toml b/crates/sel4-panicking/Cargo.toml
index 95253e4a2..e39020a57 100644
--- a/crates/sel4-panicking/Cargo.toml
+++ b/crates/sel4-panicking/Cargo.toml
@@ -28,7 +28,7 @@ sel4-panicking-env = { path = "env" }
 rustc_version = "0.4.0"
 
 [target."cfg(not(target_arch = \"arm\"))".dependencies.unwinding]
-version = "0.1.6"
+version = "0.2.1"
 default-features = false
 features = ["unwinder", "fde-custom", "hide-trace", "personality"]
 optional = true
diff --git a/crates/sel4-runtime-common/Cargo.toml b/crates/sel4-runtime-common/Cargo.toml
index fc8a81b16..a118f4717 100644
--- a/crates/sel4-runtime-common/Cargo.toml
+++ b/crates/sel4-runtime-common/Cargo.toml
@@ -29,7 +29,7 @@ sel4-panicking-env = { path = "../sel4-panicking/env" }
 sel4-stack = { path = "../sel4-stack" }
 
 [target."cfg(not(target_arch = \"arm\"))".dependencies.unwinding]
-version = "0.1.6"
+version = "0.2.1"
 default-features = false
 features = ["unwinder", "fde-custom", "hide-trace"]
 optional = true
diff --git a/crates/sel4-runtime-common/src/unwinding.rs b/crates/sel4-runtime-common/src/unwinding.rs
index 3a3362b2c..b86baed85 100644
--- a/crates/sel4-runtime-common/src/unwinding.rs
+++ b/crates/sel4-runtime-common/src/unwinding.rs
@@ -37,7 +37,7 @@ unsafe impl EhFrameFinder for EhFrameFinderImpl {
         })?;
 
         Some(FrameInfo {
-            text_base,
+            text_base: Some(text_base),
             kind: FrameInfoKind::EhFrameHdr(eh_frame_hdr),
         })
     }
diff --git a/hacking/cargo-manifest-management/manifest-scope.nix b/hacking/cargo-manifest-management/manifest-scope.nix
index a4f8175ca..0ac38dd6c 100644
--- a/hacking/cargo-manifest-management/manifest-scope.nix
+++ b/hacking/cargo-manifest-management/manifest-scope.nix
@@ -124,7 +124,7 @@ in rec {
     synstructure = "0.12.6";
     thiserror = "1.0";
     tock-registers = "0.8.1";
-    unwinding = "0.1.6";
+    unwinding = "0.2.1";
     virtio-drivers = "0.7.2";
     webpki-roots = "0.26";
     zerocopy = "0.7.32";