rollup merge of #17355 : gamazeps/issue17210

[rust.git] / src / librustrt / exclusive.rs

diff --git a/src/librustrt/exclusive.rs b/src/librustrt/exclusive.rs
index 179d050f598bfb1f63bdff86a3377c02c7210275..d40f149a2a1f8316a5cd4514efae81eb26d00d14 100644 (file)
--- a/src/librustrt/exclusive.rs
+++ b/src/librustrt/exclusive.rs
@@ -27,7 +27,7 @@ pub struct Exclusive<T> {
 }
 
 /// An RAII guard returned via `lock`
-pub struct ExclusiveGuard<'a, T> {
+pub struct ExclusiveGuard<'a, T:'a> {
     // FIXME #12808: strange name to try to avoid interfering with
     // field accesses of the contained type via Deref
     _data: &'a mut T,
@@ -107,7 +107,7 @@ fn exclusive_new_arc() {
                 });
             };
 
-            for f in futures.mut_iter() { f.recv() }
+            for f in futures.iter_mut() { f.recv() }
 
             assert_eq!(**total.lock(), num_tasks * count);
         }