From 514bbb20b4202dde5c6d1d1801beffab934d864b Mon Sep 17 00:00:00 2001
From: Nick Fitzgerald <fitzgen@gmail.com>
Date: Mon, 26 Jul 2021 12:05:44 -0700
Subject: [PATCH] Update `backtrace` to 0.3.61

---
 Cargo.lock                 | 60 +++++++++++++++++---------------------
 crates/fiber/Cargo.toml    |  2 +-
 crates/runtime/Cargo.toml  |  2 +-
 crates/wasmtime/Cargo.toml |  2 +-
 4 files changed, 30 insertions(+), 36 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f2024c767c..6a062c841e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2,22 +2,13 @@
 # It is not intended for manual editing.
 version = 3
 
-[[package]]
-name = "addr2line"
-version = "0.15.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03345e98af8f3d786b6d9f656ccfa6ac316d954e92bc4841f0bba20789d5fb5a"
-dependencies = [
- "gimli 0.24.0",
-]
-
 [[package]]
 name = "addr2line"
 version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3e61f2b7f93d2c7d2b08263acaa4a363b3e276806c68af6134c44f523bf1aacd"
 dependencies = [
- "gimli 0.25.0",
+ "gimli",
 ]
 
 [[package]]
@@ -176,16 +167,16 @@ checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
 
 [[package]]
 name = "backtrace"
-version = "0.3.60"
+version = "0.3.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7815ea54e4d821e791162e078acbebfd6d8c8939cd559c9335dceb1c8ca7282"
+checksum = "e7a905d892734eea339e896738c14b9afce22b5318f64b951e70bf3844419b01"
 dependencies = [
- "addr2line 0.15.1",
+ "addr2line",
  "cc",
  "cfg-if 1.0.0",
  "libc",
  "miniz_oxide",
- "object",
+ "object 0.26.0",
  "rustc-demangle",
 ]
 
@@ -591,7 +582,7 @@ dependencies = [
  "cranelift-codegen-shared",
  "cranelift-entity",
  "criterion",
- "gimli 0.25.0",
+ "gimli",
  "hashbrown",
  "log",
  "peepmatic",
@@ -640,7 +631,7 @@ dependencies = [
  "cranelift-reader",
  "file-per-thread-logger",
  "filecheck",
- "gimli 0.25.0",
+ "gimli",
  "log",
  "memmap2",
  "num_cpus",
@@ -731,7 +722,7 @@ dependencies = [
  "cranelift-frontend",
  "cranelift-module",
  "log",
- "object",
+ "object 0.25.3",
  "target-lexicon",
 ]
 
@@ -1347,12 +1338,6 @@ dependencies = [
  "polyval",
 ]
 
-[[package]]
-name = "gimli"
-version = "0.24.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e4075386626662786ddb0ec9081e7c7eeb1ba31951f447ca780ef9f5d568189"
-
 [[package]]
 name = "gimli"
 version = "0.25.0"
@@ -1914,6 +1899,15 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "object"
+version = "0.26.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c55827317fb4c08822499848a14237d2874d6f139828893017237e7ab93eb386"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "once_cell"
 version = "1.7.2"
@@ -3632,7 +3626,7 @@ dependencies = [
  "log",
  "more-asserts",
  "num_cpus",
- "object",
+ "object 0.25.3",
  "pretty_env_logger",
  "rayon",
  "structopt",
@@ -3677,9 +3671,9 @@ name = "wasmtime-debug"
 version = "0.28.0"
 dependencies = [
  "anyhow",
- "gimli 0.25.0",
+ "gimli",
  "more-asserts",
- "object",
+ "object 0.25.3",
  "target-lexicon",
  "thiserror",
  "wasmparser",
@@ -3694,7 +3688,7 @@ dependencies = [
  "cranelift-codegen",
  "cranelift-entity",
  "cranelift-wasm",
- "gimli 0.25.0",
+ "gimli",
  "indexmap",
  "log",
  "more-asserts",
@@ -3754,7 +3748,7 @@ dependencies = [
 name = "wasmtime-jit"
 version = "0.28.0"
 dependencies = [
- "addr2line 0.16.0",
+ "addr2line",
  "anyhow",
  "cfg-if 1.0.0",
  "cranelift-codegen",
@@ -3762,10 +3756,10 @@ dependencies = [
  "cranelift-frontend",
  "cranelift-native",
  "cranelift-wasm",
- "gimli 0.25.0",
+ "gimli",
  "log",
  "more-asserts",
- "object",
+ "object 0.25.3",
  "rayon",
  "region",
  "serde",
@@ -3798,7 +3792,7 @@ version = "0.28.0"
 dependencies = [
  "anyhow",
  "more-asserts",
- "object",
+ "object 0.25.3",
  "target-lexicon",
  "wasmtime-debug",
  "wasmtime-environ",
@@ -3810,11 +3804,11 @@ version = "0.28.0"
 dependencies = [
  "anyhow",
  "cfg-if 1.0.0",
- "gimli 0.25.0",
+ "gimli",
  "ittapi-rs",
  "lazy_static",
  "libc",
- "object",
+ "object 0.25.3",
  "scroll",
  "serde",
  "target-lexicon",
diff --git a/crates/fiber/Cargo.toml b/crates/fiber/Cargo.toml
index 9ff7671695..c148c021d8 100644
--- a/crates/fiber/Cargo.toml
+++ b/crates/fiber/Cargo.toml
@@ -27,4 +27,4 @@ features = [
 cc = "1.0"
 
 [dev-dependencies]
-backtrace = "0.3"
+backtrace = "0.3.61"
diff --git a/crates/runtime/Cargo.toml b/crates/runtime/Cargo.toml
index 8e36917b47..3cc6a646ad 100644
--- a/crates/runtime/Cargo.toml
+++ b/crates/runtime/Cargo.toml
@@ -21,7 +21,7 @@ indexmap = "1.0.2"
 thiserror = "1.0.4"
 more-asserts = "0.2.1"
 cfg-if = "1.0"
-backtrace = "0.3.55"
+backtrace = "0.3.61"
 lazy_static = "1.3.0"
 rand = "0.8.3"
 anyhow = "1.0.38"
diff --git a/crates/wasmtime/Cargo.toml b/crates/wasmtime/Cargo.toml
index 906b745d2f..1e1ebe34ca 100644
--- a/crates/wasmtime/Cargo.toml
+++ b/crates/wasmtime/Cargo.toml
@@ -25,7 +25,7 @@ anyhow = "1.0.19"
 region = "2.2.0"
 libc = "0.2"
 cfg-if = "1.0"
-backtrace = "0.3.42"
+backtrace = "0.3.61"
 rustc-demangle = "0.1.16"
 cpp_demangle = "0.3.2"
 log = "0.4.8"