diff options
| author | Manish Goregaokar <manishsmail@gmail.com> | 2020-07-10 23:26:56 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-10 23:26:56 -0700 |
| commit | 79fc3861dfd1190b257ef7f4208533c3945254b7 (patch) | |
| tree | 8ddad2b3c566486f44ea01f6305e1beeb11140f7 | |
| parent | 8376fcd5ce17c9187a08f5bfef56ea36d2a54cf4 (diff) | |
| parent | 1f982305e4c2f3dc62de90d3039f7c43e5247c11 (diff) | |
| download | rust-79fc3861dfd1190b257ef7f4208533c3945254b7.tar.gz rust-79fc3861dfd1190b257ef7f4208533c3945254b7.zip | |
Rollup merge of #74162 - lcnr:ToPredicate-no-ref, r=varkor
take self by value in ToPredicate
| -rw-r--r-- | src/librustc_middle/ty/mod.rs | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/librustc_middle/ty/mod.rs b/src/librustc_middle/ty/mod.rs index 7ca9569a0a1..bec1200d7aa 100644 --- a/src/librustc_middle/ty/mod.rs +++ b/src/librustc_middle/ty/mod.rs @@ -1337,18 +1337,18 @@ impl<'tcx> ToPolyTraitRef<'tcx> for PolyTraitPredicate<'tcx> { } pub trait ToPredicate<'tcx> { - fn to_predicate(&self, tcx: TyCtxt<'tcx>) -> Predicate<'tcx>; + fn to_predicate(self, tcx: TyCtxt<'tcx>) -> Predicate<'tcx>; } impl ToPredicate<'tcx> for PredicateKind<'tcx> { #[inline(always)] - fn to_predicate(&self, tcx: TyCtxt<'tcx>) -> Predicate<'tcx> { - tcx.mk_predicate(*self) + fn to_predicate(self, tcx: TyCtxt<'tcx>) -> Predicate<'tcx> { + tcx.mk_predicate(self) } } impl<'tcx> ToPredicate<'tcx> for ConstnessAnd<TraitRef<'tcx>> { - fn to_predicate(&self, tcx: TyCtxt<'tcx>) -> Predicate<'tcx> { + fn to_predicate(self, tcx: TyCtxt<'tcx>) -> Predicate<'tcx> { ty::PredicateKind::Trait( ty::Binder::dummy(ty::TraitPredicate { trait_ref: self.value }), self.constness, @@ -1358,7 +1358,7 @@ impl<'tcx> ToPredicate<'tcx> for ConstnessAnd<TraitRef<'tcx>> { } impl<'tcx> ToPredicate<'tcx> for ConstnessAnd<&TraitRef<'tcx>> { - fn to_predicate(&self, tcx: TyCtxt<'tcx>) -> Predicate<'tcx> { + fn to_predicate(self, tcx: TyCtxt<'tcx>) -> Predicate<'tcx> { ty::PredicateKind::Trait( ty::Binder::dummy(ty::TraitPredicate { trait_ref: *self.value }), self.constness, @@ -1368,34 +1368,34 @@ impl<'tcx> ToPredicate<'tcx> for ConstnessAnd<&TraitRef<'tcx>> { } impl<'tcx> ToPredicate<'tcx> for ConstnessAnd<PolyTraitRef<'tcx>> { - fn to_predicate(&self, tcx: TyCtxt<'tcx>) -> Predicate<'tcx> { + fn to_predicate(self, tcx: TyCtxt<'tcx>) -> Predicate<'tcx> { ty::PredicateKind::Trait(self.value.to_poly_trait_predicate(), self.constness) .to_predicate(tcx) } } impl<'tcx> ToPredicate<'tcx> for ConstnessAnd<&PolyTraitRef<'tcx>> { - fn to_predicate(&self, tcx: TyCtxt<'tcx>) -> Predicate<'tcx> { + fn to_predicate(self, tcx: TyCtxt<'tcx>) -> Predicate<'tcx> { ty::PredicateKind::Trait(self.value.to_poly_trait_predicate(), self.constness) .to_predicate(tcx) } } impl<'tcx> ToPredicate<'tcx> for PolyRegionOutlivesPredicate<'tcx> { - fn to_predicate(&self, tcx: TyCtxt<'tcx>) -> Predicate<'tcx> { - PredicateKind::RegionOutlives(*self).to_predicate(tcx) + fn to_predicate(self, tcx: TyCtxt<'tcx>) -> Predicate<'tcx> { + PredicateKind::RegionOutlives(self).to_predicate(tcx) } } impl<'tcx> ToPredicate<'tcx> for PolyTypeOutlivesPredicate<'tcx> { - fn to_predicate(&self, tcx: TyCtxt<'tcx>) -> Predicate<'tcx> { - PredicateKind::TypeOutlives(*self).to_predicate(tcx) + fn to_predicate(self, tcx: TyCtxt<'tcx>) -> Predicate<'tcx> { + PredicateKind::TypeOutlives(self).to_predicate(tcx) } } impl<'tcx> ToPredicate<'tcx> for PolyProjectionPredicate<'tcx> { - fn to_predicate(&self, tcx: TyCtxt<'tcx>) -> Predicate<'tcx> { - PredicateKind::Projection(*self).to_predicate(tcx) + fn to_predicate(self, tcx: TyCtxt<'tcx>) -> Predicate<'tcx> { + PredicateKind::Projection(self).to_predicate(tcx) } } |
