libsyntax: Stop parsing bare functions in preparation for switching them over

2 files changed, 4 insertions, 2 deletions

diff --git a/src/libstd/rl.rs b/src/libstd/rl.rs
index b2b30c1057e..a8b25767ce5 100644
--- a/src/libstd/rl.rs
+++ b/src/libstd/rl.rs
@@ -68,7 +68,7 @@ pub unsafe fn read(prompt: ~str) -> Option<~str> {
     }
 }
 
-pub type CompletionCb = @fn(~str, fn(~str));
+pub type CompletionCb<'self> = @fn(~str, &'self fn(~str));
 
 fn complete_key(_v: @CompletionCb) {}
 
diff --git a/src/libstd/treemap.rs b/src/libstd/treemap.rs
index f053bcfd397..72351aac339 100644
--- a/src/libstd/treemap.rs
+++ b/src/libstd/treemap.rs
@@ -138,7 +138,9 @@ impl<K: TotalOrd, V> Map<K, V> for TreeMap<K, V> {
     pure fn each_key(&self, f: &fn(&K) -> bool) { self.each(|&(k, _)| f(k)) }
 
     /// Visit all values in order
-    pure fn each_value(&self, f: &fn(&V) -> bool) { self.each(|&(_, v)| f(v)) }
+    pure fn each_value(&self, f: &fn(&V) -> bool) {
+        self.each(|&(_, v)| f(v))
+    }
 
     /// Return the value corresponding to the key in the map
     pure fn find(&self, key: &K) -> Option<&self/V> {