@@ -386,7 +386,7 @@ struct Checker<'a, 'tcx: 'a> {
386
386
387
387
impl < ' a , ' tcx > Checker < ' a , ' tcx > {
388
388
fn check ( & mut self , id : DefId , span : Span ,
389
- stab : & Option < & Stability > , _depr : & Option < Deprecation > ) {
389
+ stab : & Option < & Stability > , _depr : & Option < DeprecationEntry > ) {
390
390
if !is_staged_api ( self . tcx , id) {
391
391
return ;
392
392
}
@@ -511,7 +511,7 @@ pub fn check_item<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>,
511
511
warn_about_defns : bool ,
512
512
cb : & mut FnMut ( DefId , Span ,
513
513
& Option < & Stability > ,
514
- & Option < Deprecation > ) ) {
514
+ & Option < DeprecationEntry > ) ) {
515
515
match item. node {
516
516
hir:: ItemExternCrate ( _) => {
517
517
// compiler-generated `extern crate` items have a dummy span.
@@ -550,7 +550,7 @@ pub fn check_item<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>,
550
550
pub fn check_expr < ' a , ' tcx > ( tcx : TyCtxt < ' a , ' tcx , ' tcx > , e : & hir:: Expr ,
551
551
cb : & mut FnMut ( DefId , Span ,
552
552
& Option < & Stability > ,
553
- & Option < Deprecation > ) ) {
553
+ & Option < DeprecationEntry > ) ) {
554
554
let span;
555
555
let id = match e. node {
556
556
hir:: ExprMethodCall ( i, _, _) => {
@@ -614,7 +614,7 @@ pub fn check_path<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>,
614
614
path : & hir:: Path , id : ast:: NodeId ,
615
615
cb : & mut FnMut ( DefId , Span ,
616
616
& Option < & Stability > ,
617
- & Option < Deprecation > ) ) {
617
+ & Option < DeprecationEntry > ) ) {
618
618
// Paths in import prefixes may have no resolution.
619
619
match tcx. expect_def_or_none ( id) {
620
620
Some ( Def :: PrimTy ( ..) ) => { }
@@ -630,7 +630,7 @@ pub fn check_path_list_item<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>,
630
630
item : & hir:: PathListItem ,
631
631
cb : & mut FnMut ( DefId , Span ,
632
632
& Option < & Stability > ,
633
- & Option < Deprecation > ) ) {
633
+ & Option < DeprecationEntry > ) ) {
634
634
match tcx. expect_def ( item. node . id ( ) ) {
635
635
Def :: PrimTy ( ..) => { }
636
636
def => {
@@ -642,7 +642,7 @@ pub fn check_path_list_item<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>,
642
642
pub fn check_pat < ' a , ' tcx > ( tcx : TyCtxt < ' a , ' tcx , ' tcx > , pat : & hir:: Pat ,
643
643
cb : & mut FnMut ( DefId , Span ,
644
644
& Option < & Stability > ,
645
- & Option < Deprecation > ) ) {
645
+ & Option < DeprecationEntry > ) ) {
646
646
debug ! ( "check_pat(pat = {:?})" , pat) ;
647
647
if is_internal ( tcx, pat. span ) { return ; }
648
648
@@ -673,7 +673,7 @@ fn maybe_do_stability_check<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>,
673
673
id : DefId , span : Span ,
674
674
cb : & mut FnMut ( DefId , Span ,
675
675
& Option < & Stability > ,
676
- & Option < Deprecation > ) ) {
676
+ & Option < DeprecationEntry > ) ) {
677
677
if is_internal ( tcx, span) {
678
678
debug ! ( "maybe_do_stability_check: \
679
679
skipping span={:?} since it is internal", span) ;
@@ -682,7 +682,7 @@ fn maybe_do_stability_check<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>,
682
682
let ( stability, deprecation) = if is_staged_api ( tcx, id) {
683
683
( tcx. lookup_stability ( id) , None )
684
684
} else {
685
- ( None , tcx. lookup_deprecation ( id) )
685
+ ( None , tcx. lookup_deprecation_entry ( id) )
686
686
} ;
687
687
debug ! ( "maybe_do_stability_check: \
688
688
inspecting id={:?} span={:?} of stability={:?}", id, span, stability) ;
0 commit comments