Update vtable_methods

Author: Zoxc

src/librustc/traits/mod.rs

@@ -31,7 +31,6 @@ use ty::fold::{TypeFolder, TypeFoldable, TypeVisitor};
 use infer::{InferCtxt};
 use util::common::ErrorReported;
 
-use rustc_data_structures::sync::Lrc;
 use std::fmt::Debug;
 use std::rc::Rc;
 use syntax::ast;
@@ -959,11 +958,11 @@ fn substitute_normalize_and_test_predicates<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx
 fn vtable_methods<'a, 'tcx>(
     tcx: TyCtxt<'a, 'tcx, 'tcx>,
     trait_ref: ty::PolyTraitRef<'tcx>)
-    -> Lrc<Vec<Option<(DefId, &'tcx Substs<'tcx>)>>>
+    -> &'tcx [Option<(DefId, &'tcx Substs<'tcx>)>]
 {
     debug!("vtable_methods({:?})", trait_ref);
 
-    Lrc::new(
+    tcx.promote_vec(
         supertraits(tcx, trait_ref).flat_map(move |trait_ref| {
             let trait_methods = tcx.associated_items(trait_ref.def_id())
                 .filter(|item| item.kind == ty::AssociatedKind::Method);

src/librustc/ty/query/mod.rs

@@ -368,7 +368,7 @@ define_queries! { <'tcx>
 
     Other {
         [] fn vtable_methods: vtable_methods_node(ty::PolyTraitRef<'tcx>)
-                            -> Lrc<Vec<Option<(DefId, &'tcx Substs<'tcx>)>>>,
+                            -> &'tcx [Option<(DefId, &'tcx Substs<'tcx>)>],
     },
 
     Codegen {

src/librustc_data_structures/defer_deallocs.rs

@@ -79,6 +79,8 @@ impl_defer_dellocs_for_no_drop_type!([] usize);
 impl_defer_dellocs_for_no_drop_type!([] u32);
 impl_defer_dellocs_for_no_drop_type!([] u64);
 impl_defer_dellocs_for_no_drop_type!([<T>] BuildHasherDefault<T>);
+impl_defer_dellocs_for_no_drop_type!([<'a, T: ?Sized>] &'a mut T);
+impl_defer_dellocs_for_no_drop_type!([<'a, T: ?Sized>] &'a T);
 
 unsafe impl<T: DeferDeallocs> DeferDeallocs for Option<T> {
     #[inline]