Skip to content

Commit 4eac052

Browse files
committed
rustc: move object default lifetimes to resolve_lifetimes.
1 parent c5befdc commit 4eac052

16 files changed

+445
-459
lines changed

src/librustc/middle/cstore.rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ use hir::map as hir_map;
2828
use hir::map::definitions::{Definitions, DefKey, DisambiguatedDefPathData};
2929
use hir::svh::Svh;
3030
use middle::lang_items;
31+
use middle::resolve_lifetime::ObjectLifetimeDefault;
3132
use ty::{self, Ty, TyCtxt};
3233
use mir::Mir;
3334
use session::Session;
@@ -183,6 +184,8 @@ pub trait CrateStore<'tcx> {
183184
fn item_generics<'a>(&self, tcx: TyCtxt<'a, 'tcx, 'tcx>, def: DefId)
184185
-> ty::Generics<'tcx>;
185186
fn item_generics_own_param_counts(&self, def: DefId) -> (usize, usize);
187+
fn item_generics_object_lifetime_defaults(&self, def: DefId)
188+
-> Vec<ObjectLifetimeDefault>;
186189
fn item_attrs(&self, def_id: DefId) -> Vec<ast::Attribute>;
187190
fn trait_def<'a>(&self, tcx: TyCtxt<'a, 'tcx, 'tcx>, def: DefId)-> ty::TraitDef;
188191
fn adt_def<'a>(&self, tcx: TyCtxt<'a, 'tcx, 'tcx>, def: DefId) -> &'tcx ty::AdtDef;
@@ -334,6 +337,9 @@ impl<'tcx> CrateStore<'tcx> for DummyCrateStore {
334337
-> ty::Generics<'tcx> { bug!("item_generics") }
335338
fn item_generics_own_param_counts(&self, def: DefId) -> (usize, usize)
336339
{ bug!("item_generics_own_param_counts") }
340+
fn item_generics_object_lifetime_defaults(&self, def: DefId)
341+
-> Vec<ObjectLifetimeDefault>
342+
{ bug!("item_generics_object_lifetime_defaults") }
337343
fn item_attrs(&self, def_id: DefId) -> Vec<ast::Attribute> { bug!("item_attrs") }
338344
fn trait_def<'a>(&self, tcx: TyCtxt<'a, 'tcx, 'tcx>, def: DefId)-> ty::TraitDef
339345
{ bug!("trait_def") }

0 commit comments

Comments
 (0)