Merge pull request #6 from stefandisch/master

[rust-101.git] / workspace / src / part16.rs

diff --git a/workspace/src/part16.rs b/workspace/src/part16.rs
index 21cd60fe1d79db910e1483c4ad96afdc0811e2bd..fa5b1845f595632b7bf5ce506e5d365881c1db46 100644 (file)
--- a/workspace/src/part16.rs
+++ b/workspace/src/part16.rs
@@ -80,7 +80,7 @@ impl<'a, T> Iterator for IterMut<'a, T> {
         if self.next.is_null() {
             None
         } else {
         if self.next.is_null() {
             None
         } else {

-            // Otherwise, we can convert the next pointer to a borrow, get a borrow to the data
+            // Otherwise, we can convert the next pointer to a reference, get a reference to the data

             // and update the iterator.
             let next = unsafe { &mut *self.next };
             let ret = &mut next.data;
             // and update the iterator.
             let next = unsafe { &mut *self.next };
             let ret = &mut next.data;


@@ -90,14 +90,14 @@ impl<'a, T> Iterator for IterMut<'a, T> {
 }
 
 
 }
 
 

-// **Exercise 16.2**: Add a method `iter` and a type `Iter` providing iteration for shared borrows.
+// **Exercise 16.2**: Add a method `iter` and a type `Iter` providing iteration for shared references.

 // Add testcases for both kinds of iterators.
 
 // ## `Drop`
 
 impl<T> Drop for LinkedList<T> {
     // The destructor itself is a method which takes `self` in mutably borrowed form. It cannot own `self`, because then
 // Add testcases for both kinds of iterators.
 
 // ## `Drop`
 
 impl<T> Drop for LinkedList<T> {
     // The destructor itself is a method which takes `self` in mutably borrowed form. It cannot own `self`, because then

-    // the destructor of `self` would be called at the end of the function, resulting in endless recursion...
+    // the destructor of `self` would be called at the end of the function, resulting in endless recursion.

     fn drop(&mut self) {
         let mut cur_ptr = self.first;
         while !cur_ptr.is_null() {
     fn drop(&mut self) {
         let mut cur_ptr = self.first;
         while !cur_ptr.is_null() {