@@ -905,6 +905,7 @@ impl EncodeContext<'a, 'tcx> {
905
905
}
906
906
let g = tcx. generics_of ( def_id) ;
907
907
record ! ( self . tables. generics[ def_id] <- g) ;
908
+ record ! ( self . tables. explicit_predicates[ def_id] <- self . tcx. explicit_predicates_of( def_id) ) ;
908
909
}
909
910
let inherent_impls = tcx. crate_inherent_impls ( LOCAL_CRATE ) ;
910
911
for ( def_id, implementations) in inherent_impls. inherent_impls . iter ( ) {
@@ -950,7 +951,6 @@ impl EncodeContext<'a, 'tcx> {
950
951
record ! ( self . tables. fn_sig[ def_id] <- tcx. fn_sig( ctor_def_id) ) ;
951
952
}
952
953
}
953
- self . encode_explicit_predicates ( def_id) ;
954
954
self . encode_inferred_outlives ( def_id) ;
955
955
}
956
956
@@ -973,7 +973,6 @@ impl EncodeContext<'a, 'tcx> {
973
973
if variant. ctor_kind == CtorKind :: Fn {
974
974
record ! ( self . tables. fn_sig[ def_id] <- tcx. fn_sig( def_id) ) ;
975
975
}
976
- self . encode_explicit_predicates ( def_id) ;
977
976
self . encode_inferred_outlives ( def_id) ;
978
977
}
979
978
@@ -1033,7 +1032,6 @@ impl EncodeContext<'a, 'tcx> {
1033
1032
record ! ( self . tables. kind[ def_id] <- EntryKind :: Field ) ;
1034
1033
self . encode_ident_span ( def_id, field. ident ) ;
1035
1034
self . encode_item_type ( def_id) ;
1036
- self . encode_explicit_predicates ( def_id) ;
1037
1035
self . encode_inferred_outlives ( def_id) ;
1038
1036
}
1039
1037
@@ -1054,16 +1052,9 @@ impl EncodeContext<'a, 'tcx> {
1054
1052
if variant. ctor_kind == CtorKind :: Fn {
1055
1053
record ! ( self . tables. fn_sig[ def_id] <- tcx. fn_sig( def_id) ) ;
1056
1054
}
1057
- self . encode_explicit_predicates ( def_id) ;
1058
1055
self . encode_inferred_outlives ( def_id) ;
1059
1056
}
1060
1057
1061
- fn encode_explicit_predicates ( & mut self , def_id : DefId ) {
1062
- debug ! ( "EncodeContext::encode_explicit_predicates({:?})" , def_id) ;
1063
- record ! ( self . tables. explicit_predicates[ def_id] <-
1064
- self . tcx. explicit_predicates_of( def_id) ) ;
1065
- }
1066
-
1067
1058
fn encode_inferred_outlives ( & mut self , def_id : DefId ) {
1068
1059
debug ! ( "EncodeContext::encode_inferred_outlives({:?})" , def_id) ;
1069
1060
let inferred_outlives = self . tcx . inferred_outlives_of ( def_id) ;
@@ -1152,7 +1143,6 @@ impl EncodeContext<'a, 'tcx> {
1152
1143
if trait_item. kind == ty:: AssocKind :: Fn {
1153
1144
record ! ( self . tables. fn_sig[ def_id] <- tcx. fn_sig( def_id) ) ;
1154
1145
}
1155
- self . encode_explicit_predicates ( def_id) ;
1156
1146
self . encode_inferred_outlives ( def_id) ;
1157
1147
}
1158
1148
@@ -1211,7 +1201,6 @@ impl EncodeContext<'a, 'tcx> {
1211
1201
if impl_item. kind == ty:: AssocKind :: Fn {
1212
1202
record ! ( self . tables. fn_sig[ def_id] <- tcx. fn_sig( def_id) ) ;
1213
1203
}
1214
- self . encode_explicit_predicates ( def_id) ;
1215
1204
self . encode_inferred_outlives ( def_id) ;
1216
1205
}
1217
1206
@@ -1489,7 +1478,6 @@ impl EncodeContext<'a, 'tcx> {
1489
1478
| hir:: ItemKind :: OpaqueTy ( ..)
1490
1479
| hir:: ItemKind :: Trait ( ..)
1491
1480
| hir:: ItemKind :: TraitAlias ( ..) => {
1492
- self . encode_explicit_predicates ( def_id) ;
1493
1481
self . encode_inferred_outlives ( def_id) ;
1494
1482
}
1495
1483
_ => { }
@@ -1551,7 +1539,6 @@ impl EncodeContext<'a, 'tcx> {
1551
1539
1552
1540
record ! ( self . tables. kind[ def_id. to_def_id( ) ] <- EntryKind :: AnonConst ( qualifs, const_data) ) ;
1553
1541
self . encode_item_type ( def_id. to_def_id ( ) ) ;
1554
- self . encode_explicit_predicates ( def_id. to_def_id ( ) ) ;
1555
1542
self . encode_inferred_outlives ( def_id. to_def_id ( ) ) ;
1556
1543
}
1557
1544
@@ -1832,7 +1819,6 @@ impl EncodeContext<'a, 'tcx> {
1832
1819
if let hir:: ForeignItemKind :: Fn ( ..) = nitem. kind {
1833
1820
record ! ( self . tables. fn_sig[ def_id] <- tcx. fn_sig( def_id) ) ;
1834
1821
}
1835
- self . encode_explicit_predicates ( def_id) ;
1836
1822
self . encode_inferred_outlives ( def_id) ;
1837
1823
}
1838
1824
}
0 commit comments