---

yaml
---
r: 143803
b: refs/heads/try2
c: e053bff
h: refs/heads/master
i:
  143801: e90e332
  143799: b211004
v: v3

Author: erickt

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 5eaa4d1d2f6eafc4233892d3d1dafb0d05799ac3
+refs/heads/try2: e053bff5d0c83a5b36afcaf4c58a40a27162ec0f
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/libstd/c_str.rs

@@ -148,10 +148,10 @@ pub struct CStringIterator<'self> {
 
 impl<'self> Iterator<libc::c_char> for CStringIterator<'self> {
     fn next(&mut self) -> Option<libc::c_char> {
-        if self.ptr.is_null() {
+        let ch = unsafe { *self.ptr };
+        if ch == 0 {
             None
         } else {
-            let ch = unsafe { *self.ptr };
             self.ptr = ptr::offset(self.ptr, 1);
             Some(ch)
         }
@@ -163,6 +163,7 @@ mod tests {
     use super::*;
     use libc;
     use ptr;
+    use option::{Some, None};
 
     #[test]
     fn test_to_c_str() {
@@ -210,7 +211,23 @@ mod tests {
     #[should_fail]
     #[ignore(cfg(windows))]
     fn test_with_ref_empty_fail() {
-        let c_str = CString::new(ptr::null(), false);
+        let c_str = unsafe { CString::new(ptr::null(), false) };
         c_str.with_ref(|_| ());
     }
+
+    #[test]
+    fn test_iterator() {
+        let c_str = "".to_c_str();
+        let mut iter = c_str.iter();
+        assert_eq!(iter.next(), None);
+
+        let c_str = "hello".to_c_str();
+        let mut iter = c_str.iter();
+        assert_eq!(iter.next(), Some('h' as libc::c_char));
+        assert_eq!(iter.next(), Some('e' as libc::c_char));
+        assert_eq!(iter.next(), Some('l' as libc::c_char));
+        assert_eq!(iter.next(), Some('l' as libc::c_char));
+        assert_eq!(iter.next(), Some('o' as libc::c_char));
+        assert_eq!(iter.next(), None);
+    }
 }