rollup merge of #23176: huonw/rm-bounds

[rust.git] / src / libstd / sync / rwlock.rs

diff --git a/src/libstd/sync/rwlock.rs b/src/libstd/sync/rwlock.rs
index d32eae15a1bca82bd7683f5243e61c44032758f9..d70350bc7d6512d40a975dd8dd1da2637c6afa4c 100644 (file)
--- a/src/libstd/sync/rwlock.rs
+++ b/src/libstd/sync/rwlock.rs
@@ -74,9 +74,10 @@ unsafe impl<T: Send + Sync> Sync for RwLock<T> {}
 /// automatic global access as well as lazy initialization. The internal
 /// resources of this RwLock, however, must be manually deallocated.
 ///
-/// # Example
+/// # Examples
 ///
 /// ```
+/// # #![feature(std_misc)]
 /// use std::sync::{StaticRwLock, RW_LOCK_INIT};
 ///
 /// static LOCK: StaticRwLock = RW_LOCK_INIT;
@@ -550,7 +551,7 @@ fn test_rw_arc_access_in_unwind() {
         let arc2 = arc.clone();
         let _ = thread::spawn(move|| -> () {
             struct Unwinder {
-                i: Arc<RwLock<int>>,
+                i: Arc<RwLock<isize>>,
             }
             impl Drop for Unwinder {
                 fn drop(&mut self) {