auto merge of #17268 : aturon/rust/mut-conventions, r=alexcrichton

As per [RFC 52](https://github.com/rust-lang/rfcs/blob/master/active/0052-ownership-variants.md), use `_mut` suffixes to mark mutable variants, and `into_iter` for moving iterators. Additional details and motivation in the RFC.

Note that the iterator *type* names are not changed by this RFC; those are awaiting a separate RFC for standardization.

Closes #13660
Closes #16810

[breaking-change]

5 files changed, 26 insertions, 26 deletions

diff --git a/src/libsync/comm/mod.rs b/src/libsync/comm/mod.rs
index 9177fa4a6b4..4e66dd69a60 100644
--- a/src/libsync/comm/mod.rs
+++ b/src/libsync/comm/mod.rs
@@ -449,7 +449,7 @@ enum Flavor<T> {
 #[doc(hidden)]
 trait UnsafeFlavor<T> {
     fn inner_unsafe<'a>(&'a self) -> &'a UnsafeCell<Flavor<T>>;
-    unsafe fn mut_inner<'a>(&'a self) -> &'a mut Flavor<T> {
+    unsafe fn inner_mut<'a>(&'a self) -> &'a mut Flavor<T> {
         &mut *self.inner_unsafe().get()
     }
     unsafe fn inner<'a>(&'a self) -> &'a Flavor<T> {
@@ -654,7 +654,7 @@ impl<T: Send> Sender<T> {
 
         unsafe {
             let tmp = Sender::new(Stream(new_inner));
-            mem::swap(self.mut_inner(), tmp.mut_inner());
+            mem::swap(self.inner_mut(), tmp.inner_mut());
         }
         return ret;
     }
@@ -695,7 +695,7 @@ impl<T: Send> Clone for Sender<T> {
             (*packet.get()).inherit_blocker(sleeper);
 
             let tmp = Sender::new(Shared(packet.clone()));
-            mem::swap(self.mut_inner(), tmp.mut_inner());
+            mem::swap(self.inner_mut(), tmp.inner_mut());
         }
         Sender::new(Shared(packet))
     }
@@ -704,7 +704,7 @@ impl<T: Send> Clone for Sender<T> {
 #[unsafe_destructor]
 impl<T: Send> Drop for Sender<T> {
     fn drop(&mut self) {
-        match *unsafe { self.mut_inner() } {
+        match *unsafe { self.inner_mut() } {
             Oneshot(ref mut p) => unsafe { (*p.get()).drop_chan(); },
             Stream(ref mut p) => unsafe { (*p.get()).drop_chan(); },
             Shared(ref mut p) => unsafe { (*p.get()).drop_chan(); },
@@ -895,8 +895,8 @@ impl<T: Send> Receiver<T> {
                 }
             };
             unsafe {
-                mem::swap(self.mut_inner(),
-                          new_port.mut_inner());
+                mem::swap(self.inner_mut(),
+                          new_port.inner_mut());
             }
         }
     }
@@ -943,7 +943,7 @@ impl<T: Send> Receiver<T> {
                 Sync(ref p) => return unsafe { (*p.get()).recv() }
             };
             unsafe {
-                mem::swap(self.mut_inner(), new_port.mut_inner());
+                mem::swap(self.inner_mut(), new_port.inner_mut());
             }
         }
     }
@@ -980,8 +980,8 @@ impl<T: Send> select::Packet for Receiver<T> {
                 }
             };
             unsafe {
-                mem::swap(self.mut_inner(),
-                          new_port.mut_inner());
+                mem::swap(self.inner_mut(),
+                          new_port.inner_mut());
             }
         }
     }
@@ -1012,8 +1012,8 @@ impl<T: Send> select::Packet for Receiver<T> {
             };
             task = t;
             unsafe {
-                mem::swap(self.mut_inner(),
-                          new_port.mut_inner());
+                mem::swap(self.inner_mut(),
+                          new_port.inner_mut());
             }
         }
     }
@@ -1036,8 +1036,8 @@ impl<T: Send> select::Packet for Receiver<T> {
             let new_port = match result { Ok(b) => return b, Err(p) => p };
             was_upgrade = true;
             unsafe {
-                mem::swap(self.mut_inner(),
-                          new_port.mut_inner());
+                mem::swap(self.inner_mut(),
+                          new_port.inner_mut());
             }
         }
     }
@@ -1051,7 +1051,7 @@ impl<'a, T: Send> Iterator<T> for Messages<'a, T> {
 #[unsafe_destructor]
 impl<T: Send> Drop for Receiver<T> {
     fn drop(&mut self) {
-        match *unsafe { self.mut_inner() } {
+        match *unsafe { self.inner_mut() } {
             Oneshot(ref mut p) => unsafe { (*p.get()).drop_port(); },
             Stream(ref mut p) => unsafe { (*p.get()).drop_port(); },
             Shared(ref mut p) => unsafe { (*p.get()).drop_port(); },
diff --git a/src/libsync/deque.rs b/src/libsync/deque.rs
index 521a7d0bd73..6204b54fba4 100644
--- a/src/libsync/deque.rs
+++ b/src/libsync/deque.rs
@@ -513,7 +513,7 @@ mod tests {
             }
         }
 
-        for thread in threads.move_iter() {
+        for thread in threads.into_iter() {
             thread.join();
         }
     }
@@ -536,7 +536,7 @@ mod tests {
             })
         }).collect::<Vec<Thread<()>>>();
 
-        for thread in threads.move_iter() {
+        for thread in threads.into_iter() {
             thread.join();
         }
     }
@@ -592,7 +592,7 @@ mod tests {
             DONE.store(true, SeqCst);
         }
 
-        for thread in threads.move_iter() {
+        for thread in threads.into_iter() {
             thread.join();
         }
 
@@ -657,7 +657,7 @@ mod tests {
 
         unsafe { DONE.store(true, SeqCst); }
 
-        for thread in threads.move_iter() {
+        for thread in threads.into_iter() {
             thread.join();
         }
     }
diff --git a/src/libsync/lock.rs b/src/libsync/lock.rs
index 08421d24fbb..951a945f73a 100644
--- a/src/libsync/lock.rs
+++ b/src/libsync/lock.rs
@@ -636,7 +636,7 @@ mod tests {
         }
 
         // Wait for children to pass their asserts
-        for r in children.mut_iter() {
+        for r in children.iter_mut() {
             assert!(r.get_ref().is_ok());
         }
 
@@ -722,12 +722,12 @@ mod tests {
         assert_eq!(*lock, 42);
         *lock = 31337;
         // send to other readers
-        for &(ref mut rc, _) in reader_convos.mut_iter() {
+        for &(ref mut rc, _) in reader_convos.iter_mut() {
             rc.send(())
         }
         let lock = lock.downgrade();
         // complete handshake with other readers
-        for &(_, ref mut rp) in reader_convos.mut_iter() {
+        for &(_, ref mut rp) in reader_convos.iter_mut() {
             rp.recv()
         }
         tx1.send(()); // tell writer to try again
diff --git a/src/libsync/mpmc_bounded_queue.rs b/src/libsync/mpmc_bounded_queue.rs
index 949ef3bc34c..fa29bb6088a 100644
--- a/src/libsync/mpmc_bounded_queue.rs
+++ b/src/libsync/mpmc_bounded_queue.rs
@@ -210,7 +210,7 @@ mod tests {
             });
         }
 
-        for rx in completion_rxs.mut_iter() {
+        for rx in completion_rxs.iter_mut() {
             assert_eq!(nmsgs, rx.recv());
         }
         for _ in range(0, nthreads) {
diff --git a/src/libsync/raw.rs b/src/libsync/raw.rs
index b259eb7e579..81ae8dbb98f 100644
--- a/src/libsync/raw.rs
+++ b/src/libsync/raw.rs
@@ -804,14 +804,14 @@ mod tests {
         }
 
         // wait until all children get in the mutex
-        for rx in rxs.mut_iter() { rx.recv(); }
+        for rx in rxs.iter_mut() { rx.recv(); }
         {
             let lock = m.lock();
             let num_woken = lock.cond.broadcast();
             assert_eq!(num_woken, num_waiters);
         }
         // wait until all children wake up
-        for rx in rxs.mut_iter() { rx.recv(); }
+        for rx in rxs.iter_mut() { rx.recv(); }
     }
     #[test]
     fn test_mutex_cond_broadcast() {
@@ -1058,13 +1058,13 @@ mod tests {
         }
 
         // wait until all children get in the mutex
-        for rx in rxs.mut_iter() { let _ = rx.recv(); }
+        for rx in rxs.iter_mut() { let _ = rx.recv(); }
         lock_cond(&x, |cond| {
             let num_woken = cond.broadcast();
             assert_eq!(num_woken, num_waiters);
         });
         // wait until all children wake up
-        for rx in rxs.mut_iter() { let _ = rx.recv(); }
+        for rx in rxs.iter_mut() { let _ = rx.recv(); }
     }
     #[test]
     fn test_rwlock_cond_broadcast() {