---

yaml
---
r: 63158
b: refs/heads/snap-stage3
c: ee41ad4
h: refs/heads/master
v: v3

Author: huonw

[refs]

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

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

@@ -15,6 +15,7 @@ extern mod std;
 
 use extra::semver;
 use core::prelude::*;
+use core::iterator::IteratorUtil;
 use core::{char, os, result, run, str};
 use package_path::RemotePath;
 use extra::tempfile::mkdtemp;
@@ -112,7 +113,7 @@ pub fn try_getting_version(remote_path: &RemotePath) -> Option<Version> {
                                             ~"tag", ~"-l"]);
             let output_text = str::from_bytes(outp.output);
             debug!("Full output: ( %s ) [%?]", output_text, outp.status);
-            for output_text.each_split_char('\n') |l| {
+            for output_text.line_iter().advance |l| {
                 debug!("A line of output: %s", l);
                 if !l.is_whitespace() {
                     output = Some(l);
@@ -162,11 +163,8 @@ fn try_parsing_version(s: &str) -> Option<Version> {
 
 /// Just an approximation
 fn is_url_like(p: &RemotePath) -> bool {
-    let mut n = 0;
-    for p.to_str().each_split_char('/') |_| {
-        n += 1;
-    }
-    n > 2
+    let str = p.to_str();
+    str.split_iter('/').count() > 2
 }
 
 /// If s is of the form foo#bar, where bar is a valid version

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

@@ -12,6 +12,7 @@
 
 #[allow(missing_doc)];
 
+use iterator::IteratorUtil;
 use cast;
 use comm::{stream, SharedChan, GenericChan, GenericPort};
 use int;