[tor-commits] [tor/release-0.4.0] Merge branch 'rust-panic1' into rust-panic1-034

[asn at torproject.org]

commit 5ab5c8ec15de7a54c9196b9adcfda6042d4db5e4
Merge: 48e990359 fecd583c0
Author: teor <teor at torproject.org>
Date:   Mon Apr 15 10:15:02 2019 +1000

    Merge branch 'rust-panic1' into rust-panic1-034

 changes/bug27199    |  3 +++
 src/rust/Cargo.toml | 10 ++++++++++
 2 files changed, 13 insertions(+)

diff --cc src/rust/Cargo.toml
index c3e44d2a7,c22eea984..de8693ea3
--- a/src/rust/Cargo.toml
+++ b/src/rust/Cargo.toml
@@@ -1,15 -1,11 +1,20 @@@
  [workspace]
 -members = ["tor_util", "protover", "smartlist", "external", "tor_allocate", "tor_rust"]
 +members = [
 +    "crypto",
 +    "external",
 +    "protover",
 +    "smartlist",
 +    "tor_allocate",
 +    "tor_log",
 +    "tor_rust",
 +    "tor_util",
 +]
  
+ # Can remove panic="abort" when this issue is fixed:
+ # https://github.com/rust-lang/rust/issues/52652
+ [profile.dev]
+ panic = "abort"
+ 
  [profile.release]
  debug = true
  panic = "abort"