about summary refs log tree commit diff
path: root/src/libpanic_unwind
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2020-03-19 00:28:33 +0000
committerbors <bors@rust-lang.org>2020-03-19 00:28:33 +0000
commit57e1da59cd0761330b4ea8d47b16340a78eeafa9 (patch)
tree0dc41b23dbe3fda1dbc8e69548e7060adcea0fd1 /src/libpanic_unwind
parentf509b26a7730d721ef87423a72b3fdf8724b4afa (diff)
parent94ed0719f7ab083e4c94651a608ae49e14653e6a (diff)
downloadrust-57e1da59cd0761330b4ea8d47b16340a78eeafa9.tar.gz
rust-57e1da59cd0761330b4ea8d47b16340a78eeafa9.zip
Auto merge of #70118 - pietroalbini:rollup-pgjc90i, r=pietroalbini
Rollup of 2 pull requests

Successful merges:

 - #70112 (Rollup of 10 pull requests)
 - #70116 (ci: use python from the correct path)

Failed merges:

r? @ghost
Diffstat (limited to 'src/libpanic_unwind')
-rw-r--r--src/libpanic_unwind/emcc.rs2
-rw-r--r--src/libpanic_unwind/gcc.rs2
-rw-r--r--src/libpanic_unwind/seh.rs1
3 files changed, 0 insertions, 5 deletions
diff --git a/src/libpanic_unwind/emcc.rs b/src/libpanic_unwind/emcc.rs
index c7144fe16cd..a0bdb1481c6 100644
--- a/src/libpanic_unwind/emcc.rs
+++ b/src/libpanic_unwind/emcc.rs
@@ -6,8 +6,6 @@
 //! Emscripten's runtime always implements those APIs and does not
 //! implement libunwind.
 
-#![allow(private_no_mangle_fns)]
-
 use alloc::boxed::Box;
 use core::any::Any;
 use core::mem;
diff --git a/src/libpanic_unwind/gcc.rs b/src/libpanic_unwind/gcc.rs
index 9c032b30341..1622442a5eb 100644
--- a/src/libpanic_unwind/gcc.rs
+++ b/src/libpanic_unwind/gcc.rs
@@ -36,8 +36,6 @@
 //! Once stack has been unwound down to the handler frame level, unwinding stops
 //! and the last personality routine transfers control to the catch block.
 
-#![allow(private_no_mangle_fns)]
-
 use alloc::boxed::Box;
 use core::any::Any;
 
diff --git a/src/libpanic_unwind/seh.rs b/src/libpanic_unwind/seh.rs
index c294fe26327..10b765a5b41 100644
--- a/src/libpanic_unwind/seh.rs
+++ b/src/libpanic_unwind/seh.rs
@@ -45,7 +45,6 @@
 //! [llvm]: http://llvm.org/docs/ExceptionHandling.html#background-on-windows-exceptions
 
 #![allow(nonstandard_style)]
-#![allow(private_no_mangle_fns)]
 
 use alloc::boxed::Box;
 use core::any::Any;