diff options
| author | teor <teor@torproject.org> | 2019-04-15 10:18:01 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-04-15 10:18:01 +1000 |
| commit | a6d0420f7cfe899d8953fdaee6ba3c0714b297b8 (patch) | |
| tree | 39871be041b554a5987f46145c1868cb65d41bcb | |
| parent | 9f3f99938e441c09c1b3bf64510b8fb682dba007 (diff) | |
| parent | 5ab5c8ec15de7a54c9196b9adcfda6042d4db5e4 (diff) | |
| download | tor-a6d0420f7cfe899d8953fdaee6ba3c0714b297b8.tar.gz tor-a6d0420f7cfe899d8953fdaee6ba3c0714b297b8.zip | |
Merge branch 'rust-panic1-034' into rust-panic1-035
Trivial merge: a blank line was removed between 0.3.4 and 0.3.5.
| -rw-r--r-- | changes/bug27199 | 3 | ||||
| -rw-r--r-- | src/rust/Cargo.toml | 11 |
2 files changed, 14 insertions, 0 deletions
diff --git a/changes/bug27199 b/changes/bug27199 new file mode 100644 index 0000000000..f9d2a422f9 --- /dev/null +++ b/changes/bug27199 @@ -0,0 +1,3 @@ + o Minor bugfixes (rust): + - Abort on panic in all build profiles, instead of potentially unwinding + into C code. Fixes bug 27199; bugfix on 0.3.3.1-alpha. diff --git a/src/rust/Cargo.toml b/src/rust/Cargo.toml index 83f9629660..de8693ea33 100644 --- a/src/rust/Cargo.toml +++ b/src/rust/Cargo.toml @@ -10,6 +10,17 @@ members = [ "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" + +[profile.test] +panic = "abort" + +[profile.bench] +panic = "abort" |