Update backtrace to 0.3.46backtrace

https://github.com/rust-lang/backtrace-rs/pull/299

7 files changed, 11 insertions, 10 deletions

diff --git a/Cargo.lock b/Cargo.lock
index e5ef56bb0de..249c7c7da26 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -206,8 +206,9 @@ dependencies = [
 
 [[package]]
 name = "backtrace"
-version = "0.3.40"
-source = "git+https://github.com/MeFisto94/backtrace-rs?branch=fix-strtab-freeing-crash#91a0aa4a5d649151878cddd883b92ba7057ca41c"
+version = "0.3.46"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1e692897359247cc6bb902933361652380af0f1b7651ae5c5013407f30e109e"
 dependencies = [
  "backtrace-sys",
  "cfg-if",
@@ -217,8 +218,9 @@ dependencies = [
 
 [[package]]
 name = "backtrace-sys"
-version = "0.1.32"
-source = "git+https://github.com/MeFisto94/backtrace-rs?branch=fix-strtab-freeing-crash#91a0aa4a5d649151878cddd883b92ba7057ca41c"
+version = "0.1.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7de8aba10a69c8e8d7622c5710229485ec32e9d55fdad160ea559c086fdcd118"
 dependencies = [
  "cc",
  "libc",
diff --git a/Cargo.toml b/Cargo.toml
index 253038351bd..7c18dd0d023 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -31,4 +31,3 @@ mio = { git = "https://github.com/servo/mio.git", branch = "servo" }
 # https://github.com/retep998/winapi-rs/pull/816
 winapi = { git = "https://github.com/servo/winapi-rs", branch = "patch-1" }
 spirv_cross = { git = "https://github.com/servo/spirv_cross", branch = "wgpu-servo" }
-backtrace = { git = "https://github.com/MeFisto94/backtrace-rs", branch = "fix-strtab-freeing-crash" }
diff --git a/components/background_hang_monitor/Cargo.toml b/components/background_hang_monitor/Cargo.toml
index 0214d73fc1b..cc386234c15 100644
--- a/components/background_hang_monitor/Cargo.toml
+++ b/components/background_hang_monitor/Cargo.toml
@@ -13,7 +13,7 @@ test = false
 doctest = false
 
 [dependencies]
-backtrace = "0.3"
+backtrace = "0.3.46"
 ipc-channel = "0.14"
 libc = "0.2"
 log = "0.4"
diff --git a/components/constellation/Cargo.toml b/components/constellation/Cargo.toml
index c91c7313424..50d8dd0e42c 100644
--- a/components/constellation/Cargo.toml
+++ b/components/constellation/Cargo.toml
@@ -12,7 +12,7 @@ path = "lib.rs"
 
 [dependencies]
 background_hang_monitor = { path = "../background_hang_monitor"}
-backtrace = "0.3"
+backtrace = "0.3.46"
 bluetooth_traits = { path = "../bluetooth_traits" }
 canvas_traits = {path = "../canvas_traits"}
 compositing = {path = "../compositing"}
diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml
index cbbab110c2b..cbde5c1b178 100644
--- a/components/script/Cargo.toml
+++ b/components/script/Cargo.toml
@@ -32,7 +32,7 @@ serde_json = "1.0"
 [dependencies]
 accountable-refcell = {version = "0.2.0", optional = true}
 app_units = "0.7"
-backtrace = {version = "0.3", optional = true}
+backtrace = {version = "0.3.46", optional = true}
 base64 = "0.10.1"
 bincode = "1"
 bitflags = "1.0"
diff --git a/ports/glutin/Cargo.toml b/ports/glutin/Cargo.toml
index 91ecdbd7eb1..2cf9c1d55d8 100644
--- a/ports/glutin/Cargo.toml
+++ b/ports/glutin/Cargo.toml
@@ -48,7 +48,7 @@ vslatestinstalled = ["libservo/vslatestinstalled"]
 xr-profile = ["libservo/xr-profile"]
 
 [target.'cfg(not(target_os = "android"))'.dependencies]
-backtrace = "0.3"
+backtrace = "0.3.46"
 clipboard = "0.5"
 euclid = "0.20"
 getopts = "0.2.11"
diff --git a/ports/libsimpleservo/capi/Cargo.toml b/ports/libsimpleservo/capi/Cargo.toml
index ecd76fcaaec..6da0ab3e1b5 100644
--- a/ports/libsimpleservo/capi/Cargo.toml
+++ b/ports/libsimpleservo/capi/Cargo.toml
@@ -13,7 +13,7 @@ test = false
 bench = false
 
 [dependencies]
-backtrace = "0.3"
+backtrace = "0.3.46"
 env_logger = "0.7"
 lazy_static = "1"
 log = "0.4"