PolyTraitRef::self_ty returns Binder<Ty>

ecstatic-morse · ecstatic-morse · commit eaa57cfb712e · 2020-06-01T12:12:26.000-07:00
diff --git a/src/librustc_middle/ty/sty.rs b/src/librustc_middle/ty/sty.rs
@@ -765,8 +765,8 @@ impl<'tcx> TraitRef<'tcx> {
 pub type PolyTraitRef<'tcx> = Binder<TraitRef<'tcx>>;
 
 impl<'tcx> PolyTraitRef<'tcx> {
-    pub fn self_ty(&self) -> Ty<'tcx> {
-        self.skip_binder().self_ty()
+    pub fn self_ty(&self) -> Binder<Ty<'tcx>> {
+        self.map_bound_ref(|tr| tr.self_ty())
     }
 
     pub fn def_id(&self) -> DefId {

Original file line number	Diff line number	Diff line change
`@@ -765,8 +765,8 @@ impl<'tcx> TraitRef<'tcx> {`
`765`	`765`	`pub type PolyTraitRef<'tcx> = Binder<TraitRef<'tcx>>;`
`766`	`766`
`767`	`767`	`impl<'tcx> PolyTraitRef<'tcx> {`
`768`		`- pub fn self_ty(&self) -> Ty<'tcx> {`
`769`		`- self.skip_binder().self_ty()`
	`768`	`+ pub fn self_ty(&self) -> Binder<Ty<'tcx>> {`
	`769`	`+ self.map_bound_ref(\|tr\| tr.self_ty())`
`770`	`770`	`}`
`771`	`771`
`772`	`772`	`pub fn def_id(&self) -> DefId {`