From 8d4928f7808813de62fefcb89139bfb7382b250b Mon Sep 17 00:00:00 2001
From: Niko Matsakis <niko@alum.mit.edu>
Date: Tue, 18 Sep 2012 21:41:13 -0700
Subject: Revert "replace explicit calls to vec::each with vec::each_ref,
 partially demode str"

This reverts commit 1be24f0758d3075d2e7f141f8831bb8a233ce86e.

Not quite ready.
---
 src/libsyntax/ext/qquote.rs   | 2 +-
 src/libsyntax/ext/simplext.rs | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/libsyntax/ext')

diff --git a/src/libsyntax/ext/qquote.rs b/src/libsyntax/ext/qquote.rs
index da37e44b58c..d97124d5f44 100644
--- a/src/libsyntax/ext/qquote.rs
+++ b/src/libsyntax/ext/qquote.rs
@@ -228,7 +228,7 @@ fn finish<T: qq_helper>
     let mut state = active;
     let mut i = 0u, j = 0u;
     let g_len = cx.gather.len();
-    for str::chars_each(*str) |ch| {
+    do str::chars_iter(*str) |ch| {
         if (j < g_len && i == cx.gather[j].lo) {
             assert ch == '$';
             let repl = fmt!("$%u ", j);
diff --git a/src/libsyntax/ext/simplext.rs b/src/libsyntax/ext/simplext.rs
index a5103309e8c..08fa427d078 100644
--- a/src/libsyntax/ext/simplext.rs
+++ b/src/libsyntax/ext/simplext.rs
@@ -208,10 +208,10 @@ fn transcribe(cx: ext_ctxt, b: bindings, body: @expr) -> @expr {
 pure fn follow(m: arb_depth<matchable>, idx_path: &[uint]) ->
    arb_depth<matchable> {
     let mut res: arb_depth<matchable> = m;
-    for vec::each_ref(idx_path) |idx| {
+    for vec::each(idx_path) |idx| {
         res = match res {
           leaf(_) => return res,/* end of the line */
-          seq(new_ms, _) => new_ms[*idx]
+          seq(new_ms, _) => new_ms[idx]
         }
     }
     return res;
-- 
cgit 1.4.1-3-g733a5