Auto merge of #72743 - lcnr:predicate_f, r=nikomatsakis

bors · bors · commit b6fa392238a4 · 2020-05-31T04:44:38.000Z
fix EncodeWithShorthand for Predicate r? @nikomatsakis
diff --git a/src/librustc_middle/ty/codec.rs b/src/librustc_middle/ty/codec.rs
@@ -39,9 +39,9 @@ impl<'tcx> EncodableWithShorthand for Ty<'tcx> {
 }
 
 impl<'tcx> EncodableWithShorthand for ty::Predicate<'tcx> {
-    type Variant = ty::Predicate<'tcx>;
+    type Variant = ty::PredicateKind<'tcx>;
     fn variant(&self) -> &Self::Variant {
-        self
+        self.kind()
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -39,9 +39,9 @@ impl<'tcx> EncodableWithShorthand for Ty<'tcx> {`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`impl<'tcx> EncodableWithShorthand for ty::Predicate<'tcx> {`
`42`		`- type Variant = ty::Predicate<'tcx>;`
	`42`	`+ type Variant = ty::PredicateKind<'tcx>;`
`43`	`43`	`fn variant(&self) -> &Self::Variant {`
`44`		`- self`
	`44`	`+ self.kind()`
`45`	`45`	`}`
`46`	`46`	`}`
`47`	`47`