From f23674394f2e77b7aa4686a5ae9f2f60d6faa428 Mon Sep 17 00:00:00 2001
From: Patrick Walton <pcwalton@mimiga.net>
Date: Fri, 3 Aug 2012 19:49:12 -0700
Subject: rustc: Merge fn& and fn in favor of fn&.

This is a step on the way to moving the function "proto" sigil out front.
---
 src/rustc/metadata/tydecode.rs | 1 -
 src/rustc/metadata/tyencode.rs | 1 -
 2 files changed, 2 deletions(-)

(limited to 'src/rustc/metadata')

diff --git a/src/rustc/metadata/tydecode.rs b/src/rustc/metadata/tydecode.rs
index df7bea1bd0e..ad3f09f8086 100644
--- a/src/rustc/metadata/tydecode.rs
+++ b/src/rustc/metadata/tydecode.rs
@@ -89,7 +89,6 @@ fn parse_proto(c: char) -> ast::proto {
     alt c {
       '~' { ast::proto_uniq }
       '@' { ast::proto_box }
-      '*' { ast::proto_any }
       '&' { ast::proto_block }
       'n' { ast::proto_bare }
       _ { fail ~"illegal fn type kind " + str::from_char(c); }
diff --git a/src/rustc/metadata/tyencode.rs b/src/rustc/metadata/tyencode.rs
index 02a6b0f826a..01fc90cc19d 100644
--- a/src/rustc/metadata/tyencode.rs
+++ b/src/rustc/metadata/tyencode.rs
@@ -311,7 +311,6 @@ fn enc_proto(w: io::writer, proto: proto) {
       proto_uniq { w.write_str(&"f~"); }
       proto_box { w.write_str(&"f@"); }
       proto_block { w.write_str(~"f&"); }
-      proto_any { w.write_str(&"f*"); }
       proto_bare { w.write_str(&"fn"); }
     }
 }
-- 
cgit 1.4.1-3-g733a5