about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorAaron Gallagher <_@habnab.it>2016-07-08 22:48:04 -0700
committerAaron Gallagher <_@habnab.it>2016-07-10 15:22:15 -0700
commitc11540587f45826c76f33b7fbbb9a919a5af8ebd (patch)
treef8d091056a02bc0660c4e19f67737ce166e8887b /src/libstd
parentd40c593f42fafbac1ff3d827f6df96338b5b7d8b (diff)
downloadrust-c11540587f45826c76f33b7fbbb9a919a5af8ebd.tar.gz
rust-c11540587f45826c76f33b7fbbb9a919a5af8ebd.zip
Mutex and RwLock need RefUnwindSafe too.
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/panic.rs6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/libstd/panic.rs b/src/libstd/panic.rs
index d8cadf09cb2..d5699fca85d 100644
--- a/src/libstd/panic.rs
+++ b/src/libstd/panic.rs
@@ -227,6 +227,12 @@ impl<T: ?Sized> !RefUnwindSafe for UnsafeCell<T> {}
 #[stable(feature = "catch_unwind", since = "1.9.0")]
 impl<T> RefUnwindSafe for AssertUnwindSafe<T> {}
 
+// XXX: Obviously wrong, but what should it be?
+#[stable(feature = "catch_unwind", since = "1.9.0")]
+impl<T: ?Sized> RefUnwindSafe for Mutex<T> {}
+#[stable(feature = "catch_unwind", since = "1.9.0")]
+impl<T: ?Sized> RefUnwindSafe for RwLock<T> {}
+
 #[stable(feature = "catch_unwind", since = "1.9.0")]
 impl<T> Deref for AssertUnwindSafe<T> {
     type Target = T;