From dd6a783773948b06b3e8b01e778e9d1e6c778fd4 Mon Sep 17 00:00:00 2001
From: Davis Vaughan <davis@posit.co>
Date: Wed, 6 Mar 2024 16:56:02 -0500
Subject: [PATCH] Bump anyhow to 1.0.80 and drop backtrace crate

---
 Cargo.lock                 | 64 ++------------------------------------
 crates/amalthea/Cargo.toml |  2 +-
 crates/ark/Cargo.toml      |  3 +-
 crates/ark/src/traps.rs    |  2 +-
 crates/harp/Cargo.toml     |  2 +-
 5 files changed, 7 insertions(+), 66 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a92deb35c..853370046 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -181,15 +181,6 @@ dependencies = [
  "syn 2.0.29",
 ]
 
-[[package]]
-name = "addr2line"
-version = "0.19.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97"
-dependencies = [
- "gimli",
-]
-
 [[package]]
 name = "adler"
 version = "1.0.2"
@@ -275,12 +266,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.71"
+version = "1.0.80"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8"
-dependencies = [
- "backtrace",
-]
+checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1"
 
 [[package]]
 name = "ark"
@@ -290,7 +278,6 @@ dependencies = [
  "amalthea",
  "anyhow",
  "async-trait",
- "backtrace",
  "base64",
  "bus",
  "cfg-if",
@@ -364,21 +351,6 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
-[[package]]
-name = "backtrace"
-version = "0.3.67"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca"
-dependencies = [
- "addr2line",
- "cc",
- "cfg-if",
- "libc",
- "miniz_oxide 0.6.2",
- "object",
- "rustc-demangle",
-]
-
 [[package]]
 name = "base64"
 version = "0.21.0"
@@ -919,7 +891,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010"
 dependencies = [
  "crc32fast",
- "miniz_oxide 0.7.1",
+ "miniz_oxide",
 ]
 
 [[package]]
@@ -1110,12 +1082,6 @@ dependencies = [
  "wasi 0.11.0+wasi-snapshot-preview1",
 ]
 
-[[package]]
-name = "gimli"
-version = "0.27.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4"
-
 [[package]]
 name = "h2"
 version = "0.3.19"
@@ -1639,15 +1605,6 @@ version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
 
-[[package]]
-name = "miniz_oxide"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa"
-dependencies = [
- "adler",
-]
-
 [[package]]
 name = "miniz_oxide"
 version = "0.7.1"
@@ -1760,15 +1717,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "object"
-version = "0.30.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439"
-dependencies = [
- "memchr",
-]
-
 [[package]]
 name = "once_cell"
 version = "1.17.1"
@@ -2296,12 +2244,6 @@ dependencies = [
  "walkdir",
 ]
 
-[[package]]
-name = "rustc-demangle"
-version = "0.1.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
-
 [[package]]
 name = "rustc_version"
 version = "0.4.0"
diff --git a/crates/amalthea/Cargo.toml b/crates/amalthea/Cargo.toml
index 2ce6c4f4c..e151fb025 100644
--- a/crates/amalthea/Cargo.toml
+++ b/crates/amalthea/Cargo.toml
@@ -25,7 +25,7 @@ zmq = "0.10.0"
 strum = "0.24"
 strum_macros = "0.24"
 crossbeam = { version = "0.8.2", features = ["crossbeam-channel"] }
-anyhow = "1.0.71"
+anyhow = "1.0.80"
 serde_with = "3.0.0"
 serde_repr = "0.1.17"
 
diff --git a/crates/ark/Cargo.toml b/crates/ark/Cargo.toml
index c1a2d8f40..92976588a 100644
--- a/crates/ark/Cargo.toml
+++ b/crates/ark/Cargo.toml
@@ -11,9 +11,8 @@ authors = ["Posit, PBC"]
 [dependencies]
 actix-web = "4.4.0"
 amalthea = { path = "../amalthea" }
-anyhow = { version = "^1.0", features = ["backtrace"] }
+anyhow = "1.0.80"
 async-trait = "0.1.66"
-backtrace = "0.3.67"
 base64 = "0.21.0"
 bus = "2.3.0"
 cfg-if = "1.0.0"
diff --git a/crates/ark/src/traps.rs b/crates/ark/src/traps.rs
index 27d7b4b2b..feba78d68 100644
--- a/crates/ark/src/traps.rs
+++ b/crates/ark/src/traps.rs
@@ -37,6 +37,6 @@ pub extern "C" fn backtrace_handler(signum: libc::c_int) {
     // Unlike asynchronous signals, SIGSEGV and SIGBUS are synchronous and
     // always delivered to the thread that caused it, so we can just
     // capture the current thread's backtrace
-    let bt = backtrace::Backtrace::new();
+    let bt = std::backtrace::Backtrace::capture();
     log::info!("{}\n{:?}", header, bt);
 }
diff --git a/crates/harp/Cargo.toml b/crates/harp/Cargo.toml
index ef20e0ffb..5d6f07c64 100644
--- a/crates/harp/Cargo.toml
+++ b/crates/harp/Cargo.toml
@@ -8,7 +8,7 @@ Tools for integrating R and Rust.
 """
 
 [dependencies]
-anyhow = "1.0.71"
+anyhow = "1.0.80"
 c2rust-bitfields = "0.17.0"
 cfg-if = "1.0.0"
 ctor = "0.1.26"