@@ -601,7 +601,7 @@ fn encode_method_callee<'a, 'tcx>(ecx: &e::EncodeContext<'a, 'tcx>,
601
601
}
602
602
603
603
impl < ' a , ' tcx > read_method_callee_helper < ' tcx > for reader:: Decoder < ' a > {
604
- fn read_method_callee < ' a , ' b > ( & mut self , dcx : & DecodeContext < ' a , ' b , ' tcx > )
604
+ fn read_method_callee < ' b , ' c > ( & mut self , dcx : & DecodeContext < ' b , ' c , ' tcx > )
605
605
-> ( ty:: ExprAdjustment , MethodCallee < ' tcx > ) {
606
606
607
607
self . read_struct ( "MethodCallee" , 4 , |this| {
@@ -810,7 +810,7 @@ trait get_ty_str_ctxt<'tcx> {
810
810
}
811
811
812
812
impl < ' a , ' tcx > get_ty_str_ctxt < ' tcx > for e:: EncodeContext < ' a , ' tcx > {
813
- fn ty_str_ctxt < ' a > ( & ' a self ) -> tyencode:: ctxt < ' a , ' tcx > {
813
+ fn ty_str_ctxt < ' b > ( & ' b self ) -> tyencode:: ctxt < ' b , ' tcx > {
814
814
tyencode:: ctxt {
815
815
diag : self . tcx . sess . diagnostic ( ) ,
816
816
ds : e:: def_to_string,
@@ -851,16 +851,16 @@ trait rbml_writer_helpers<'tcx> {
851
851
}
852
852
853
853
impl < ' a , ' tcx > rbml_writer_helpers < ' tcx > for Encoder < ' a > {
854
- fn emit_closure_type < ' a > ( & mut self ,
855
- ecx : & e:: EncodeContext < ' a , ' tcx > ,
854
+ fn emit_closure_type < ' b > ( & mut self ,
855
+ ecx : & e:: EncodeContext < ' b , ' tcx > ,
856
856
closure_type : & ty:: ClosureTy < ' tcx > ) {
857
857
self . emit_opaque ( |this| {
858
858
Ok ( e:: write_closure_type ( ecx, this, closure_type) )
859
859
} ) ;
860
860
}
861
861
862
- fn emit_method_origin < ' a > ( & mut self ,
863
- ecx : & e:: EncodeContext < ' a , ' tcx > ,
862
+ fn emit_method_origin < ' b > ( & mut self ,
863
+ ecx : & e:: EncodeContext < ' b , ' tcx > ,
864
864
method_origin : & ty:: MethodOrigin < ' tcx > )
865
865
{
866
866
use serialize:: Encoder ;
@@ -916,20 +916,20 @@ impl<'a, 'tcx> rbml_writer_helpers<'tcx> for Encoder<'a> {
916
916
} ) ;
917
917
}
918
918
919
- fn emit_ty < ' a > ( & mut self , ecx : & e:: EncodeContext < ' a , ' tcx > , ty : Ty < ' tcx > ) {
919
+ fn emit_ty < ' b > ( & mut self , ecx : & e:: EncodeContext < ' b , ' tcx > , ty : Ty < ' tcx > ) {
920
920
self . emit_opaque ( |this| Ok ( e:: write_type ( ecx, this, ty) ) ) ;
921
921
}
922
922
923
- fn emit_tys < ' a > ( & mut self , ecx : & e:: EncodeContext < ' a , ' tcx > , tys : & [ Ty < ' tcx > ] ) {
923
+ fn emit_tys < ' b > ( & mut self , ecx : & e:: EncodeContext < ' b , ' tcx > , tys : & [ Ty < ' tcx > ] ) {
924
924
self . emit_from_vec ( tys, |this, ty| Ok ( this. emit_ty ( ecx, * ty) ) ) ;
925
925
}
926
926
927
- fn emit_trait_ref < ' a > ( & mut self , ecx : & e:: EncodeContext < ' a , ' tcx > ,
927
+ fn emit_trait_ref < ' b > ( & mut self , ecx : & e:: EncodeContext < ' b , ' tcx > ,
928
928
trait_ref : & ty:: TraitRef < ' tcx > ) {
929
929
self . emit_opaque ( |this| Ok ( e:: write_trait_ref ( ecx, this, trait_ref) ) ) ;
930
930
}
931
931
932
- fn emit_type_param_def < ' a > ( & mut self , ecx : & e:: EncodeContext < ' a , ' tcx > ,
932
+ fn emit_type_param_def < ' b > ( & mut self , ecx : & e:: EncodeContext < ' b , ' tcx > ,
933
933
type_param_def : & ty:: TypeParameterDef < ' tcx > ) {
934
934
self . emit_opaque ( |this| {
935
935
Ok ( tyencode:: enc_type_param_def ( this. writer ,
@@ -938,7 +938,7 @@ impl<'a, 'tcx> rbml_writer_helpers<'tcx> for Encoder<'a> {
938
938
} ) ;
939
939
}
940
940
941
- fn emit_predicate < ' a > ( & mut self , ecx : & e:: EncodeContext < ' a , ' tcx > ,
941
+ fn emit_predicate < ' b > ( & mut self , ecx : & e:: EncodeContext < ' b , ' tcx > ,
942
942
predicate : & ty:: Predicate < ' tcx > ) {
943
943
self . emit_opaque ( |this| {
944
944
Ok ( tyencode:: enc_predicate ( this. writer ,
@@ -947,8 +947,8 @@ impl<'a, 'tcx> rbml_writer_helpers<'tcx> for Encoder<'a> {
947
947
} ) ;
948
948
}
949
949
950
- fn emit_polytype < ' a > ( & mut self ,
951
- ecx : & e:: EncodeContext < ' a , ' tcx > ,
950
+ fn emit_polytype < ' b > ( & mut self ,
951
+ ecx : & e:: EncodeContext < ' b , ' tcx > ,
952
952
pty : ty:: Polytype < ' tcx > ) {
953
953
use serialize:: Encoder ;
954
954
@@ -990,14 +990,14 @@ impl<'a, 'tcx> rbml_writer_helpers<'tcx> for Encoder<'a> {
990
990
bounds) ) ) ;
991
991
}
992
992
993
- fn emit_substs < ' a > ( & mut self , ecx : & e:: EncodeContext < ' a , ' tcx > ,
993
+ fn emit_substs < ' b > ( & mut self , ecx : & e:: EncodeContext < ' b , ' tcx > ,
994
994
substs : & subst:: Substs < ' tcx > ) {
995
995
self . emit_opaque ( |this| Ok ( tyencode:: enc_substs ( this. writer ,
996
996
& ecx. ty_str_ctxt ( ) ,
997
997
substs) ) ) ;
998
998
}
999
999
1000
- fn emit_auto_adjustment < ' a > ( & mut self , ecx : & e:: EncodeContext < ' a , ' tcx > ,
1000
+ fn emit_auto_adjustment < ' b > ( & mut self , ecx : & e:: EncodeContext < ' b , ' tcx > ,
1001
1001
adj : & ty:: AutoAdjustment < ' tcx > ) {
1002
1002
use serialize:: Encoder ;
1003
1003
@@ -1019,7 +1019,7 @@ impl<'a, 'tcx> rbml_writer_helpers<'tcx> for Encoder<'a> {
1019
1019
} ) ;
1020
1020
}
1021
1021
1022
- fn emit_autoref < ' a > ( & mut self , ecx : & e:: EncodeContext < ' a , ' tcx > ,
1022
+ fn emit_autoref < ' b > ( & mut self , ecx : & e:: EncodeContext < ' b , ' tcx > ,
1023
1023
autoref : & ty:: AutoRef < ' tcx > ) {
1024
1024
use serialize:: Encoder ;
1025
1025
@@ -1069,7 +1069,7 @@ impl<'a, 'tcx> rbml_writer_helpers<'tcx> for Encoder<'a> {
1069
1069
} ) ;
1070
1070
}
1071
1071
1072
- fn emit_auto_deref_ref < ' a > ( & mut self , ecx : & e:: EncodeContext < ' a , ' tcx > ,
1072
+ fn emit_auto_deref_ref < ' b > ( & mut self , ecx : & e:: EncodeContext < ' b , ' tcx > ,
1073
1073
auto_deref_ref : & ty:: AutoDerefRef < ' tcx > ) {
1074
1074
use serialize:: Encoder ;
1075
1075
@@ -1086,7 +1086,7 @@ impl<'a, 'tcx> rbml_writer_helpers<'tcx> for Encoder<'a> {
1086
1086
} ) ;
1087
1087
}
1088
1088
1089
- fn emit_unsize_kind < ' a > ( & mut self , ecx : & e:: EncodeContext < ' a , ' tcx > ,
1089
+ fn emit_unsize_kind < ' b > ( & mut self , ecx : & e:: EncodeContext < ' b , ' tcx > ,
1090
1090
uk : & ty:: UnsizeKind < ' tcx > ) {
1091
1091
use serialize:: Encoder ;
1092
1092
@@ -1427,7 +1427,7 @@ impl<'a, 'tcx> rbml_decoder_decoder_helpers<'tcx> for reader::Decoder<'a> {
1427
1427
} ) . unwrap ( )
1428
1428
}
1429
1429
1430
- fn read_method_origin < ' a , ' b > ( & mut self , dcx : & DecodeContext < ' a , ' b , ' tcx > )
1430
+ fn read_method_origin < ' b , ' c > ( & mut self , dcx : & DecodeContext < ' b , ' c , ' tcx > )
1431
1431
-> ty:: MethodOrigin < ' tcx >
1432
1432
{
1433
1433
self . read_enum ( "MethodOrigin" , |this| {
@@ -1498,7 +1498,7 @@ impl<'a, 'tcx> rbml_decoder_decoder_helpers<'tcx> for reader::Decoder<'a> {
1498
1498
}
1499
1499
1500
1500
1501
- fn read_ty < ' a , ' b > ( & mut self , dcx : & DecodeContext < ' a , ' b , ' tcx > ) -> Ty < ' tcx > {
1501
+ fn read_ty < ' b , ' c > ( & mut self , dcx : & DecodeContext < ' b , ' c , ' tcx > ) -> Ty < ' tcx > {
1502
1502
// Note: regions types embed local node ids. In principle, we
1503
1503
// should translate these node ids into the new decode
1504
1504
// context. However, we do not bother, because region types
@@ -1526,12 +1526,12 @@ impl<'a, 'tcx> rbml_decoder_decoder_helpers<'tcx> for reader::Decoder<'a> {
1526
1526
}
1527
1527
}
1528
1528
1529
- fn read_tys < ' a , ' b > ( & mut self , dcx : & DecodeContext < ' a , ' b , ' tcx > )
1529
+ fn read_tys < ' b , ' c > ( & mut self , dcx : & DecodeContext < ' b , ' c , ' tcx > )
1530
1530
-> Vec < Ty < ' tcx > > {
1531
1531
self . read_to_vec ( |this| Ok ( this. read_ty ( dcx) ) ) . unwrap ( ) . into_iter ( ) . collect ( )
1532
1532
}
1533
1533
1534
- fn read_trait_ref < ' a , ' b > ( & mut self , dcx : & DecodeContext < ' a , ' b , ' tcx > )
1534
+ fn read_trait_ref < ' b , ' c > ( & mut self , dcx : & DecodeContext < ' b , ' c , ' tcx > )
1535
1535
-> Rc < ty:: TraitRef < ' tcx > > {
1536
1536
Rc :: new ( self . read_opaque ( |this, doc| {
1537
1537
let ty = tydecode:: parse_trait_ref_data (
@@ -1544,7 +1544,7 @@ impl<'a, 'tcx> rbml_decoder_decoder_helpers<'tcx> for reader::Decoder<'a> {
1544
1544
} ) . unwrap ( ) )
1545
1545
}
1546
1546
1547
- fn read_type_param_def < ' a , ' b > ( & mut self , dcx : & DecodeContext < ' a , ' b , ' tcx > )
1547
+ fn read_type_param_def < ' b , ' c > ( & mut self , dcx : & DecodeContext < ' b , ' c , ' tcx > )
1548
1548
-> ty:: TypeParameterDef < ' tcx > {
1549
1549
self . read_opaque ( |this, doc| {
1550
1550
Ok ( tydecode:: parse_type_param_def_data (
@@ -1556,7 +1556,7 @@ impl<'a, 'tcx> rbml_decoder_decoder_helpers<'tcx> for reader::Decoder<'a> {
1556
1556
} ) . unwrap ( )
1557
1557
}
1558
1558
1559
- fn read_predicate < ' a , ' b > ( & mut self , dcx : & DecodeContext < ' a , ' b , ' tcx > )
1559
+ fn read_predicate < ' b , ' c > ( & mut self , dcx : & DecodeContext < ' b , ' c , ' tcx > )
1560
1560
-> ty:: Predicate < ' tcx >
1561
1561
{
1562
1562
self . read_opaque ( |this, doc| {
@@ -1565,7 +1565,7 @@ impl<'a, 'tcx> rbml_decoder_decoder_helpers<'tcx> for reader::Decoder<'a> {
1565
1565
} ) . unwrap ( )
1566
1566
}
1567
1567
1568
- fn read_polytype < ' a , ' b > ( & mut self , dcx : & DecodeContext < ' a , ' b , ' tcx > )
1568
+ fn read_polytype < ' b , ' c > ( & mut self , dcx : & DecodeContext < ' b , ' c , ' tcx > )
1569
1569
-> ty:: Polytype < ' tcx > {
1570
1570
self . read_struct ( "Polytype" , 2 , |this| {
1571
1571
Ok ( ty:: Polytype {
@@ -1599,7 +1599,7 @@ impl<'a, 'tcx> rbml_decoder_decoder_helpers<'tcx> for reader::Decoder<'a> {
1599
1599
} ) . unwrap ( )
1600
1600
}
1601
1601
1602
- fn read_existential_bounds < ' a , ' b > ( & mut self , dcx : & DecodeContext < ' a , ' b , ' tcx > )
1602
+ fn read_existential_bounds < ' b , ' c > ( & mut self , dcx : & DecodeContext < ' b , ' c , ' tcx > )
1603
1603
-> ty:: ExistentialBounds
1604
1604
{
1605
1605
self . read_opaque ( |this, doc| {
@@ -1611,7 +1611,7 @@ impl<'a, 'tcx> rbml_decoder_decoder_helpers<'tcx> for reader::Decoder<'a> {
1611
1611
} ) . unwrap ( )
1612
1612
}
1613
1613
1614
- fn read_substs < ' a , ' b > ( & mut self , dcx : & DecodeContext < ' a , ' b , ' tcx > )
1614
+ fn read_substs < ' b , ' c > ( & mut self , dcx : & DecodeContext < ' b , ' c , ' tcx > )
1615
1615
-> subst:: Substs < ' tcx > {
1616
1616
self . read_opaque ( |this, doc| {
1617
1617
Ok ( tydecode:: parse_substs_data ( doc. data ,
@@ -1622,7 +1622,7 @@ impl<'a, 'tcx> rbml_decoder_decoder_helpers<'tcx> for reader::Decoder<'a> {
1622
1622
} ) . unwrap ( )
1623
1623
}
1624
1624
1625
- fn read_auto_adjustment < ' a , ' b > ( & mut self , dcx : & DecodeContext < ' a , ' b , ' tcx > )
1625
+ fn read_auto_adjustment < ' b , ' c > ( & mut self , dcx : & DecodeContext < ' b , ' c , ' tcx > )
1626
1626
-> ty:: AutoAdjustment < ' tcx > {
1627
1627
self . read_enum ( "AutoAdjustment" , |this| {
1628
1628
let variants = [ "AutoAddEnv" , "AutoDerefRef" ] ;
@@ -1647,7 +1647,7 @@ impl<'a, 'tcx> rbml_decoder_decoder_helpers<'tcx> for reader::Decoder<'a> {
1647
1647
} ) . unwrap ( )
1648
1648
}
1649
1649
1650
- fn read_auto_deref_ref < ' a , ' b > ( & mut self , dcx : & DecodeContext < ' a , ' b , ' tcx > )
1650
+ fn read_auto_deref_ref < ' b , ' c > ( & mut self , dcx : & DecodeContext < ' b , ' c , ' tcx > )
1651
1651
-> ty:: AutoDerefRef < ' tcx > {
1652
1652
self . read_struct ( "AutoDerefRef" , 2 , |this| {
1653
1653
Ok ( ty:: AutoDerefRef {
@@ -1667,7 +1667,7 @@ impl<'a, 'tcx> rbml_decoder_decoder_helpers<'tcx> for reader::Decoder<'a> {
1667
1667
} ) . unwrap ( )
1668
1668
}
1669
1669
1670
- fn read_autoref < ' a , ' b > ( & mut self , dcx : & DecodeContext < ' a , ' b , ' tcx > ) -> ty:: AutoRef < ' tcx > {
1670
+ fn read_autoref < ' b , ' c > ( & mut self , dcx : & DecodeContext < ' b , ' c , ' tcx > ) -> ty:: AutoRef < ' tcx > {
1671
1671
self . read_enum ( "AutoRef" , |this| {
1672
1672
let variants = [ "AutoPtr" ,
1673
1673
"AutoUnsize" ,
@@ -1725,7 +1725,7 @@ impl<'a, 'tcx> rbml_decoder_decoder_helpers<'tcx> for reader::Decoder<'a> {
1725
1725
} ) . unwrap ( )
1726
1726
}
1727
1727
1728
- fn read_unsize_kind < ' a , ' b > ( & mut self , dcx : & DecodeContext < ' a , ' b , ' tcx > )
1728
+ fn read_unsize_kind < ' b , ' c > ( & mut self , dcx : & DecodeContext < ' b , ' c , ' tcx > )
1729
1729
-> ty:: UnsizeKind < ' tcx > {
1730
1730
self . read_enum ( "UnsizeKind" , |this| {
1731
1731
let variants = & [ "UnsizeLength" , "UnsizeStruct" , "UnsizeVtable" ] ;
@@ -1768,7 +1768,7 @@ impl<'a, 'tcx> rbml_decoder_decoder_helpers<'tcx> for reader::Decoder<'a> {
1768
1768
} ) . unwrap ( )
1769
1769
}
1770
1770
1771
- fn read_unboxed_closure < ' a , ' b > ( & mut self , dcx : & DecodeContext < ' a , ' b , ' tcx > )
1771
+ fn read_unboxed_closure < ' b , ' c > ( & mut self , dcx : & DecodeContext < ' b , ' c , ' tcx > )
1772
1772
-> ty:: UnboxedClosure < ' tcx > {
1773
1773
let closure_type = self . read_opaque ( |this, doc| {
1774
1774
Ok ( tydecode:: parse_ty_closure_data (
0 commit comments