From 68609e4214ebee4e7ccd5f729102a010f9d3ccb1 Mon Sep 17 00:00:00 2001 From: Trevor Gross Date: Wed, 11 Jun 2025 20:05:06 +0000 Subject: [PATCH] Upgrade the standard library `unwinding` version This comes with a `gimli` upgrade, so we no longer have two different versions. --- library/Cargo.lock | 19 ++++--------------- library/unwind/Cargo.toml | 2 +- 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/library/Cargo.lock b/library/Cargo.lock index 85c0e781d1fc..b6ef2126b44e 100644 --- a/library/Cargo.lock +++ b/library/Cargo.lock @@ -8,7 +8,7 @@ version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9acbfca36652500c911ddb767ed433e3ed99b032b5d935be73c6923662db1d43" dependencies = [ - "gimli 0.32.0", + "gimli", "rustc-std-workspace-alloc", "rustc-std-workspace-core", ] @@ -112,17 +112,6 @@ dependencies = [ "unicode-width", ] -[[package]] -name = "gimli" -version = "0.31.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" -dependencies = [ - "compiler_builtins", - "rustc-std-workspace-alloc", - "rustc-std-workspace-core", -] - [[package]] name = "gimli" version = "0.32.0" @@ -410,12 +399,12 @@ dependencies = [ [[package]] name = "unwinding" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8393f2782b6060a807337ff353780c1ca15206f9ba2424df18cb6e733bd7b345" +checksum = "7d80f6c2bfede213d9a90b4a14f3eb99b84e33c52df6c1a15de0a100f5a88751" dependencies = [ "compiler_builtins", - "gimli 0.31.1", + "gimli", "rustc-std-workspace-core", ] diff --git a/library/unwind/Cargo.toml b/library/unwind/Cargo.toml index ad373420a96f..f8da09f71931 100644 --- a/library/unwind/Cargo.toml +++ b/library/unwind/Cargo.toml @@ -22,7 +22,7 @@ cfg-if = "1.0" libc = { version = "0.2.140", features = ['rustc-dep-of-std'], default-features = false } [target.'cfg(target_os = "xous")'.dependencies] -unwinding = { version = "0.2.6", features = ['rustc-dep-of-std', 'unwinder', 'fde-custom'], default-features = false } +unwinding = { version = "0.2.7", features = ['rustc-dep-of-std', 'unwinder', 'fde-custom'], default-features = false } [features]