From bb830558d13a8090988141c90ed49b16895c944a Mon Sep 17 00:00:00 2001
From: Patrick Walton <pcwalton@mimiga.net>
Date: Tue, 25 Jun 2013 18:25:27 -0700
Subject: librustc: Fix merge fallout and test cases.

---
 src/libstd/to_str.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/libstd')

diff --git a/src/libstd/to_str.rs b/src/libstd/to_str.rs
index dcd02744cf9..77701acd33e 100644
--- a/src/libstd/to_str.rs
+++ b/src/libstd/to_str.rs
@@ -55,7 +55,7 @@ impl<A:ToStr+Hash+Eq, B:ToStr+Hash+Eq> ToStr for HashMap<A, B> {
     fn to_str(&self) -> ~str {
         let mut acc = ~"{";
         let mut first = true;
-        for self.iter().advance |key, value| {
+        for self.iter().advance |(key, value)| {
             if first {
                 first = false;
             }
-- 
cgit 1.4.1-3-g733a5