remove the code that encodes type parameter defs

there are no type parameter defs in the relevant range

diff --git a/src/librustc/metadata/common.rs b/src/librustc/metadata/common.rs
index c436963f6ad8dfb7e920d483b172b34a995ca01b..2ffccd2d9a585c6cde0dda4e057f8a3bd8755ffd 100644 (file)
--- a/src/librustc/metadata/common.rs
+++ b/src/librustc/metadata/common.rs
@@ -125,9 +125,7 @@ pub enum astencode_tag { // Reserves 0x50 -- 0x6f
         tag_table_node_type = 0x57,
         tag_table_item_subst = 0x58,
         tag_table_freevars = 0x59,
-        // GAP 0x5a
-        tag_table_param_defs = 0x5b,
-        // GAP 0x5c, 0x5d, 0x5e
+        // GAP 0x5a, 0x5b, 0x5c, 0x5d, 0x5e
         tag_table_method_map = 0x5f,
         // GAP 0x60
         tag_table_adjustments = 0x61,

diff --git a/src/librustc/middle/astencode.rs b/src/librustc/middle/astencode.rs
index a6a048710369bc5a731b297da0cbfdea4c17dc6b..75826c690364ef939db9d7ea9ed0f03ae0d823e0 100644 (file)
--- a/src/librustc/middle/astencode.rs
+++ b/src/librustc/middle/astencode.rs
@@ -611,8 +611,6 @@ fn emit_closure_type<'a>(&mut self, ecx: &e::EncodeContext<'a, 'tcx>,
     fn emit_region(&mut self, ecx: &e::EncodeContext, r: ty::Region);
     fn emit_ty<'a>(&mut self, ecx: &e::EncodeContext<'a, 'tcx>, ty: Ty<'tcx>);
     fn emit_tys<'a>(&mut self, ecx: &e::EncodeContext<'a, 'tcx>, tys: &[Ty<'tcx>]);
-    fn emit_type_param_def<'a>(&mut self, ecx: &e::EncodeContext<'a, 'tcx>,
-                               type_param_def: &ty::TypeParameterDef<'tcx>);
     fn emit_predicate<'a>(&mut self, ecx: &e::EncodeContext<'a, 'tcx>,
                           predicate: &ty::Predicate<'tcx>);
     fn emit_trait_ref<'a>(&mut self, ecx: &e::EncodeContext<'a, 'tcx>,
@@ -657,15 +655,6 @@ fn emit_trait_ref<'b>(&mut self, ecx: &e::EncodeContext<'b, 'tcx>,
         self.emit_opaque(|this| Ok(e::write_trait_ref(ecx, this, trait_ref)));
     }
 
-    fn emit_type_param_def<'b>(&mut self, ecx: &e::EncodeContext<'b, 'tcx>,
-                               type_param_def: &ty::TypeParameterDef<'tcx>) {
-        self.emit_opaque(|this| {
-            Ok(tyencode::enc_type_param_def(this,
-                                         &ecx.ty_str_ctxt(),
-                                         type_param_def))
-        });
-    }
-
     fn emit_predicate<'b>(&mut self, ecx: &e::EncodeContext<'b, 'tcx>,
                           predicate: &ty::Predicate<'tcx>) {
         self.emit_opaque(|this| {
@@ -894,13 +883,6 @@ fn encode_side_tables_for_id(ecx: &e::EncodeContext,
         }
     }
 
-    if let Some(type_param_def) = tcx.ty_param_defs.borrow().get(&id) {
-        rbml_w.tag(c::tag_table_param_defs, |rbml_w| {
-            rbml_w.id(id);
-            rbml_w.emit_type_param_def(ecx, type_param_def)
-        })
-    }
-
     let method_call = ty::MethodCall::expr(id);
     if let Some(method) = tcx.tables.borrow().method_map.get(&method_call) {
         rbml_w.tag(c::tag_table_method_map, |rbml_w| {
@@ -985,8 +967,6 @@ fn read_trait_ref<'a, 'b>(&mut self, dcx: &DecodeContext<'a, 'b, 'tcx>)
                               -> ty::TraitRef<'tcx>;
     fn read_poly_trait_ref<'a, 'b>(&mut self, dcx: &DecodeContext<'a, 'b, 'tcx>)
                                    -> ty::PolyTraitRef<'tcx>;
-    fn read_type_param_def<'a, 'b>(&mut self, dcx: &DecodeContext<'a, 'b, 'tcx>)
-                                   -> ty::TypeParameterDef<'tcx>;
     fn read_predicate<'a, 'b>(&mut self, dcx: &DecodeContext<'a, 'b, 'tcx>)
                               -> ty::Predicate<'tcx>;
     fn read_existential_bounds<'a, 'b>(&mut self, dcx: &DecodeContext<'a, 'b, 'tcx>)
@@ -1105,11 +1085,6 @@ fn read_poly_trait_ref<'b, 'c>(&mut self, dcx: &DecodeContext<'b, 'c, 'tcx>)
         ty::Binder(self.read_ty_encoded(dcx, |decoder| decoder.parse_trait_ref()))
     }
 
-    fn read_type_param_def<'b, 'c>(&mut self, dcx: &DecodeContext<'b, 'c, 'tcx>)
-                                   -> ty::TypeParameterDef<'tcx> {
-        self.read_ty_encoded(dcx, |decoder| decoder.parse_type_param_def())
-    }
-
     fn read_predicate<'b, 'c>(&mut self, dcx: &DecodeContext<'b, 'c, 'tcx>)
                               -> ty::Predicate<'tcx>
     {
@@ -1351,10 +1326,6 @@ fn decode_side_tables(dcx: &DecodeContext,
                         let ub = val_dsr.read_upvar_capture(dcx);
                         dcx.tcx.tables.borrow_mut().upvar_capture_map.insert(upvar_id, ub);
                     }
-                    c::tag_table_param_defs => {
-                        let bounds = val_dsr.read_type_param_def(dcx);
-                        dcx.tcx.ty_param_defs.borrow_mut().insert(id, bounds);
-                    }
                     c::tag_table_method_map => {
                         let (autoderef, method) = val_dsr.read_method_callee(dcx);
                         let method_call = ty::MethodCall {