diff --git a/src/libsyntax/parse/comments.rs b/src/libsyntax/parse/comments.rs
index 29fac8f951d6..572b657d6a12 100644
--- a/src/libsyntax/parse/comments.rs
+++ b/src/libsyntax/parse/comments.rs
@@ -206,7 +206,7 @@ fn all_whitespace(s: &str, col: CharPos) -> Option<uint> {
     let mut col = col.to_uint();
     let mut cursor: uint = 0;
     while col > 0 && cursor < len {
-        let r: str::CharRange = str::char_range_at(s, cursor);
+        let r: str::CharRange = s.char_range_at(cursor);
         if !r.ch.is_whitespace() {
             return None;
         }
diff --git a/src/test/pretty/block-comment-wchar.pp b/src/test/pretty/block-comment-wchar.pp
index 9c80057ccef0..911de166e8fc 100644
--- a/src/test/pretty/block-comment-wchar.pp
+++ b/src/test/pretty/block-comment-wchar.pp
@@ -109,8 +109,8 @@ fn main() {
          '\u2004', '\u2005', '\u2006', '\u2007', '\u2008', '\u2009', '\u200A',
          '\u2028', '\u2029', '\u202F', '\u205F', '\u3000'];
      // <= bugs in pretty-printer?
-    for vec::each(chars) |c| {
+    for chars.each |c| {
         let ws = c.is_whitespace();
-        io::println(fmt!("%? %?" , c , ws));
+        println(fmt!("%? %?" , c , ws));
     }
 }
diff --git a/src/test/pretty/block-comment-wchar.rs b/src/test/pretty/block-comment-wchar.rs
index a56fa91f39f0..d8a820542a72 100644
--- a/src/test/pretty/block-comment-wchar.rs
+++ b/src/test/pretty/block-comment-wchar.rs
@@ -102,8 +102,8 @@ fn main() {
          '\xA0', '\u1680', '\u180E', '\u2000', '\u2001', '\u2002', '\u2003',
          '\u2004', '\u2005', '\u2006', '\u2007', '\u2008', '\u2009', '\u200A',
          '\u2028', '\u2029', '\u202F', '\u205F', '\u3000'];
-    for vec::each(chars) |c| {
+    for chars.each |c| {
         let ws = c.is_whitespace();
-        io::println(fmt!("%? %?", c , ws)); // <= bugs in pretty-printer?
+        println(fmt!("%? %?", c , ws)); // <= bugs in pretty-printer?
     }
 }