---

yaml
---
r: 63171
b: refs/heads/snap-stage3
c: ebefe42
h: refs/heads/master
i:
  63169: 1f2f9fa
  63167: d53b7b8
v: v3

Author: huonw

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 8c59d920a12fe40398a0033438ff426bb3387fd0
+refs/heads/snap-stage3: ebefe425b962d3914cc523d7f539fdb2244cec06
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/librustpkg/version.rs

@@ -143,8 +143,7 @@ fn try_parsing_version(s: &str) -> Option<Version> {
     let s = s.trim();
     debug!("Attempting to parse: %s", s);
     let mut parse_state = Start;
-    // I gave up on using external iterators (tjc)
-    for str::to_chars(s).each() |&c| {
+    for s.iter().advance |&c| {
         if char::is_digit(c) {
             parse_state = SawDigit;
         }
@@ -172,7 +171,7 @@ fn is_url_like(p: &RemotePath) -> bool {
 /// Otherwise, return None.
 pub fn split_version<'a>(s: &'a str) -> Option<(&'a str, Version)> {
     // reject strings with multiple '#'s
-    if { let mut i: uint = 0; for str::to_chars(s).each |&c| { if c == '#' { i += 1; } }; i > 1 } {
+    if s.splitn_iter('#', 2).count() > 1 {
         return None;
     }
     match s.rfind('#') {

branches/snap-stage3/src/libstd/str.rs

@@ -432,11 +432,6 @@ pub fn byte_slice_no_callback<'a>(s: &'a str) -> &'a [u8] {
     }
 }
 
-/// Convert a string to a unique vector of characters
-pub fn to_chars(s: &str) -> ~[char] {
-    s.iter().collect()
-}
-
 /**
  * Take a substring of another.
  *

branches/snap-stage3/src/test/run-pass/utf8_chars.rs

@@ -10,18 +10,20 @@
 
 extern mod extra;
 
+use std::iterator::IteratorUtil;
 use std::str;
 use std::vec;
 
 pub fn main() {
     // Chars of 1, 2, 3, and 4 bytes
     let chs: ~[char] = ~['e', 'é', '€', 0x10000 as char];
     let s: ~str = str::from_chars(chs);
+    let schs: ~[char] = s.iter().collect();
 
     assert!(s.len() == 10u);
     assert!(str::char_len(s) == 4u);
-    assert!(str::to_chars(s).len() == 4u);
-    assert!(str::from_chars(str::to_chars(s)) == s);
+    assert!(schs.len() == 4u);
+    assert!(str::from_chars(schs) == s);
     assert!(s.char_at(0u) == 'e');
     assert!(s.char_at(1u) == 'é');