From 9797665b286db3f34cc475560a68380012fadde7 Mon Sep 17 00:00:00 2001
From: Evan Simmons <esims89@gmail.com>
Date: Sun, 1 Jul 2018 14:30:16 -0700
Subject: Make Stdio handle UnwindSafe

---
 src/libstd/sys_common/remutex.rs | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/libstd/sys_common')

diff --git a/src/libstd/sys_common/remutex.rs b/src/libstd/sys_common/remutex.rs
index 022056f8a8a..071a3a25c7a 100644
--- a/src/libstd/sys_common/remutex.rs
+++ b/src/libstd/sys_common/remutex.rs
@@ -13,6 +13,7 @@ use marker;
 use ops::Deref;
 use sys_common::poison::{self, TryLockError, TryLockResult, LockResult};
 use sys::mutex as sys;
+use panic::{UnwindSafe, RefUnwindSafe};
 
 /// A re-entrant mutual exclusion
 ///
@@ -28,6 +29,9 @@ pub struct ReentrantMutex<T> {
 unsafe impl<T: Send> Send for ReentrantMutex<T> {}
 unsafe impl<T: Send> Sync for ReentrantMutex<T> {}
 
+impl<T> UnwindSafe for ReentrantMutex<T> {}
+impl<T> RefUnwindSafe for ReentrantMutex<T> {}
+
 
 /// An RAII implementation of a "scoped lock" of a mutex. When this structure is
 /// dropped (falls out of scope), the lock will be unlocked.
-- 
cgit 1.4.1-3-g733a5