Skip to content

Commit 58bca6f

Browse files
committed
Iterate on explicit_predicates.
1 parent dda31b9 commit 58bca6f

File tree

1 file changed

+1
-15
lines changed

1 file changed

+1
-15
lines changed

compiler/rustc_metadata/src/rmeta/encoder.rs

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -905,6 +905,7 @@ impl EncodeContext<'a, 'tcx> {
905905
}
906906
let g = tcx.generics_of(def_id);
907907
record!(self.tables.generics[def_id] <- g);
908+
record!(self.tables.explicit_predicates[def_id] <- self.tcx.explicit_predicates_of(def_id));
908909
}
909910
let inherent_impls = tcx.crate_inherent_impls(LOCAL_CRATE);
910911
for (def_id, implementations) in inherent_impls.inherent_impls.iter() {
@@ -950,7 +951,6 @@ impl EncodeContext<'a, 'tcx> {
950951
record!(self.tables.fn_sig[def_id] <- tcx.fn_sig(ctor_def_id));
951952
}
952953
}
953-
self.encode_explicit_predicates(def_id);
954954
self.encode_inferred_outlives(def_id);
955955
}
956956

@@ -973,7 +973,6 @@ impl EncodeContext<'a, 'tcx> {
973973
if variant.ctor_kind == CtorKind::Fn {
974974
record!(self.tables.fn_sig[def_id] <- tcx.fn_sig(def_id));
975975
}
976-
self.encode_explicit_predicates(def_id);
977976
self.encode_inferred_outlives(def_id);
978977
}
979978

@@ -1033,7 +1032,6 @@ impl EncodeContext<'a, 'tcx> {
10331032
record!(self.tables.kind[def_id] <- EntryKind::Field);
10341033
self.encode_ident_span(def_id, field.ident);
10351034
self.encode_item_type(def_id);
1036-
self.encode_explicit_predicates(def_id);
10371035
self.encode_inferred_outlives(def_id);
10381036
}
10391037

@@ -1054,16 +1052,9 @@ impl EncodeContext<'a, 'tcx> {
10541052
if variant.ctor_kind == CtorKind::Fn {
10551053
record!(self.tables.fn_sig[def_id] <- tcx.fn_sig(def_id));
10561054
}
1057-
self.encode_explicit_predicates(def_id);
10581055
self.encode_inferred_outlives(def_id);
10591056
}
10601057

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-
10671058
fn encode_inferred_outlives(&mut self, def_id: DefId) {
10681059
debug!("EncodeContext::encode_inferred_outlives({:?})", def_id);
10691060
let inferred_outlives = self.tcx.inferred_outlives_of(def_id);
@@ -1152,7 +1143,6 @@ impl EncodeContext<'a, 'tcx> {
11521143
if trait_item.kind == ty::AssocKind::Fn {
11531144
record!(self.tables.fn_sig[def_id] <- tcx.fn_sig(def_id));
11541145
}
1155-
self.encode_explicit_predicates(def_id);
11561146
self.encode_inferred_outlives(def_id);
11571147
}
11581148

@@ -1211,7 +1201,6 @@ impl EncodeContext<'a, 'tcx> {
12111201
if impl_item.kind == ty::AssocKind::Fn {
12121202
record!(self.tables.fn_sig[def_id] <- tcx.fn_sig(def_id));
12131203
}
1214-
self.encode_explicit_predicates(def_id);
12151204
self.encode_inferred_outlives(def_id);
12161205
}
12171206

@@ -1489,7 +1478,6 @@ impl EncodeContext<'a, 'tcx> {
14891478
| hir::ItemKind::OpaqueTy(..)
14901479
| hir::ItemKind::Trait(..)
14911480
| hir::ItemKind::TraitAlias(..) => {
1492-
self.encode_explicit_predicates(def_id);
14931481
self.encode_inferred_outlives(def_id);
14941482
}
14951483
_ => {}
@@ -1551,7 +1539,6 @@ impl EncodeContext<'a, 'tcx> {
15511539

15521540
record!(self.tables.kind[def_id.to_def_id()] <- EntryKind::AnonConst(qualifs, const_data));
15531541
self.encode_item_type(def_id.to_def_id());
1554-
self.encode_explicit_predicates(def_id.to_def_id());
15551542
self.encode_inferred_outlives(def_id.to_def_id());
15561543
}
15571544

@@ -1832,7 +1819,6 @@ impl EncodeContext<'a, 'tcx> {
18321819
if let hir::ForeignItemKind::Fn(..) = nitem.kind {
18331820
record!(self.tables.fn_sig[def_id] <- tcx.fn_sig(def_id));
18341821
}
1835-
self.encode_explicit_predicates(def_id);
18361822
self.encode_inferred_outlives(def_id);
18371823
}
18381824
}

0 commit comments

Comments
 (0)