Bump unwinding crate

Signed-off-by: Nick Spinale <[email protected]>
seL4 · Sep 25, 2024 · 82d5591 · 82d5591
1 parent 27e0d29
commit 82d5591
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 17 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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";