about summary refs log tree commit diff
diff options
context:
space:
mode:
authorManish Goregaokar <manishsmail@gmail.com>2016-01-17 17:25:48 +0530
committerManish Goregaokar <manishsmail@gmail.com>2016-01-17 17:25:48 +0530
commitdbca989721febcb52e2597810196ae05388b153e (patch)
tree16afcd9dd5fda9fa614abb0f4ab7730cbcaaebe6
parenta993669a405613036d107fc50157308d225e3919 (diff)
parent5c6217865815fda78003001073705df65686c164 (diff)
downloadrust-dbca989721febcb52e2597810196ae05388b153e.tar.gz
rust-dbca989721febcb52e2597810196ae05388b153e.zip
Rollup merge of #30952 - jonastepe:nomicon_vec_zst_code_fix, r=Gankro
* Moved semicolon to the right place in the `let` statement in the ZST section.
* Fixed the missing ZST additions for `RawValIter<T>` from this section in the final code section.
-rw-r--r--src/doc/nomicon/vec-final.md12
-rw-r--r--src/doc/nomicon/vec-zsts.md8
2 files changed, 14 insertions, 6 deletions
diff --git a/src/doc/nomicon/vec-final.md b/src/doc/nomicon/vec-final.md
index 52c22f65076..1f4377a7ca3 100644
--- a/src/doc/nomicon/vec-final.md
+++ b/src/doc/nomicon/vec-final.md
@@ -226,7 +226,11 @@ impl<T> Iterator for RawValIter<T> {
         } else {
             unsafe {
                 let result = ptr::read(self.start);
-                self.start = self.start.offset(1);
+                self.start = if mem::size_of::<T>() == 0 {
+                    (self.start as usize + 1) as *const _
+                } else {
+                    self.start.offset(1)
+                };
                 Some(result)
             }
         }
@@ -246,7 +250,11 @@ impl<T> DoubleEndedIterator for RawValIter<T> {
             None
         } else {
             unsafe {
-                self.end = self.end.offset(-1);
+                self.end = if mem::size_of::<T>() == 0 {
+                    (self.end as usize - 1) as *const _
+                } else {
+                    self.end.offset(-1)
+                };
                 Some(ptr::read(self.end))
             }
         }
diff --git a/src/doc/nomicon/vec-zsts.md b/src/doc/nomicon/vec-zsts.md
index fb337a891a8..5f3b2a81364 100644
--- a/src/doc/nomicon/vec-zsts.md
+++ b/src/doc/nomicon/vec-zsts.md
@@ -140,8 +140,8 @@ impl<T> Iterator for RawValIter<T> {
                 self.start = if mem::size_of::<T>() == 0 {
                     (self.start as usize + 1) as *const _
                 } else {
-                    self.start.offset(1);
-                }
+                    self.start.offset(1)
+                };
                 Some(result)
             }
         }
@@ -164,8 +164,8 @@ impl<T> DoubleEndedIterator for RawValIter<T> {
                 self.end = if mem::size_of::<T>() == 0 {
                     (self.end as usize - 1) as *const _
                 } else {
-                    self.end.offset(-1);
-                }
+                    self.end.offset(-1)
+                };
                 Some(ptr::read(self.end))
             }
         }