From: teor <teor@torproject.org>
Date: Mon, 15 Apr 2019 00:15:02 +0000 (+1000)
Subject: Merge branch 'rust-panic1' into rust-panic1-034
X-Git-Tag: tor-0.4.1.1-alpha~4^2~3^2~1^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5ab5c8ec15de7a54c9196b9adcfda6042d4db5e4;p=thirdparty%2Ftor.git

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

5ab5c8ec15de7a54c9196b9adcfda6042d4db5e4
diff --cc src/rust/Cargo.toml
index c3e44d2a79,c22eea984d..de8693ea33
--- 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"