From f5024692d49be49b2efff452059f83efaebfd0ee Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 23 Mar 2012 11:51:06 +0100
Subject: Remove support for the old-style intrinsics

Closes #2042
Closes #1981
---
 src/rustc/metadata/common.rs  | 1 -
 src/rustc/metadata/csearch.rs | 6 ------
 src/rustc/metadata/decoder.rs | 8 --------
 src/rustc/metadata/encoder.rs | 4 ----
 4 files changed, 19 deletions(-)

(limited to 'src/rustc/metadata')

diff --git a/src/rustc/metadata/common.rs b/src/rustc/metadata/common.rs
index 00aa26969d7..8a6b0eb30b2 100644
--- a/src/rustc/metadata/common.rs
+++ b/src/rustc/metadata/common.rs
@@ -68,7 +68,6 @@ const tag_mod_impl: uint = 0x30u;
 
 const tag_item_method: uint = 0x31u;
 const tag_impl_iface: uint = 0x32u;
-const tag_item_is_intrinsic: uint = 0x33u;
 
 // discriminator value for variants
 const tag_disr_val: uint = 0x34u;
diff --git a/src/rustc/metadata/csearch.rs b/src/rustc/metadata/csearch.rs
index 02b506f7070..e43b7aa7ff3 100644
--- a/src/rustc/metadata/csearch.rs
+++ b/src/rustc/metadata/csearch.rs
@@ -26,7 +26,6 @@ export get_type;
 export get_impl_iface;
 export get_impl_method;
 export get_item_path;
-export item_is_intrinsic;
 export maybe_get_item_ast, found_ast, found, found_parent, not_found;
 
 fn get_symbol(cstore: cstore::cstore, def: ast::def_id) -> str {
@@ -190,11 +189,6 @@ fn get_class_method(cstore: cstore::cstore, def: ast::def_id, mname: str)
     decoder::get_class_method(cdata, def.node, mname)
 }
 
-fn item_is_intrinsic(cstore: cstore::cstore, def: ast::def_id) -> bool {
-    let cdata = cstore::get_crate_data(cstore, def.crate);
-    decoder::item_is_intrinsic(cdata, def.node)
-}
-
 // Local Variables:
 // mode: rust
 // fill-column: 78;
diff --git a/src/rustc/metadata/decoder.rs b/src/rustc/metadata/decoder.rs
index cf1947a96dc..97a77dd71d3 100644
--- a/src/rustc/metadata/decoder.rs
+++ b/src/rustc/metadata/decoder.rs
@@ -41,7 +41,6 @@ export get_item_path;
 export maybe_find_item; // sketchy
 export item_type; // sketchy
 export maybe_get_item_ast;
-export item_is_intrinsic;
 
 // Used internally by astencode:
 export translate_def_id;
@@ -309,13 +308,6 @@ fn get_class_method(cdata: cmd, id: ast::node_id, name: str) -> ast::def_id {
     }
 }
 
-fn item_is_intrinsic(cdata: cmd, id: ast::node_id) -> bool {
-    let mut intrinsic = false;
-    ebml::tagged_docs(lookup_item(id, cdata.data), tag_item_is_intrinsic,
-                      {|_i| intrinsic = true;});
-    intrinsic
-}
-
 fn get_symbol(data: @[u8], id: ast::node_id) -> str {
     ret item_symbol(lookup_item(id, data));
 }
diff --git a/src/rustc/metadata/encoder.rs b/src/rustc/metadata/encoder.rs
index 69086d4698b..2533d125457 100644
--- a/src/rustc/metadata/encoder.rs
+++ b/src/rustc/metadata/encoder.rs
@@ -676,10 +676,6 @@ fn encode_info_for_native_item(ecx: @encode_ctxt, ebml_w: ebml::writer,
         encode_def_id(ebml_w, local_def(nitem.id));
         encode_family(ebml_w, purity_fn_family(fn_decl.purity));
         encode_type_param_bounds(ebml_w, ecx, tps);
-        if abi == native_abi_rust_intrinsic {
-            ebml_w.start_tag(tag_item_is_intrinsic);
-            ebml_w.end_tag();
-        }
         encode_type(ecx, ebml_w, node_id_to_type(ecx.ccx.tcx, nitem.id));
         if abi == native_abi_rust_builtin {
             astencode::encode_inlined_item(ecx, ebml_w, path,
-- 
cgit 1.4.1-3-g733a5