diff options
| author | Jubilee <46493976+workingjubilee@users.noreply.github.com> | 2021-09-24 11:40:11 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-24 11:40:11 -0700 |
| commit | e0b68ae6c0acbdfe4c8d2b330df209ea88716eea (patch) | |
| tree | d984b1fd593bd386f5d0c57ec1e95ceadd2a5069 | |
| parent | edaeacfbbbdf39735ee2d14a6f3ebe5fc5137124 (diff) | |
| parent | 2a9a9ca829d87e90a980bc6238c14efd2c4b22af (diff) | |
| download | rust-e0b68ae6c0acbdfe4c8d2b330df209ea88716eea.tar.gz rust-e0b68ae6c0acbdfe4c8d2b330df209ea88716eea.zip | |
Rollup merge of #89001 - jackh726:binder-cleanup, r=nikomatsakis
Be explicit about using Binder::dummy This is somewhat of a late followup to the binder refactor PR. It removes `ToPredicate` and `ToPolyTraitImpls` that hide the use of `Binder::dummy`. While this does make code a bit more verbose, it allows us be more careful about where we create binders. Another alternative here might be to add a new trait `ToBinder` or something with a `dummy()` fn. Which could still allow grepping but allows doing something like `trait_ref.dummy()` (but I also wonder if longer-term, it would be better to be even more explicit with a `bind_with_vars(ty::List::empty())` *but* that's not clear yet. r? ``@nikomatsakis``
| -rw-r--r-- | clippy_lints/src/escape.rs | 2 | ||||
| -rw-r--r-- | clippy_lints/src/methods/mod.rs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/clippy_lints/src/escape.rs b/clippy_lints/src/escape.rs index 1ba241d3776..6bbac6d9a24 100644 --- a/clippy_lints/src/escape.rs +++ b/clippy_lints/src/escape.rs @@ -92,7 +92,7 @@ impl<'tcx> LateLintPass<'tcx> for BoxedLocal { // be sure we have `self` parameter in this function if let AssocItemKind::Fn { has_self: true } = trait_item.kind { trait_self_ty = - Some(TraitRef::identity(cx.tcx, trait_item.id.def_id.to_def_id()).self_ty()); + Some(TraitRef::identity(cx.tcx, trait_item.id.def_id.to_def_id()).self_ty().skip_binder()); } } } diff --git a/clippy_lints/src/methods/mod.rs b/clippy_lints/src/methods/mod.rs index e89b2d295b9..a04b325b56e 100644 --- a/clippy_lints/src/methods/mod.rs +++ b/clippy_lints/src/methods/mod.rs @@ -2061,7 +2061,7 @@ impl<'tcx> LateLintPass<'tcx> for Methods { then { let first_arg_span = first_arg_ty.span; let first_arg_ty = hir_ty_to_ty(cx.tcx, first_arg_ty); - let self_ty = TraitRef::identity(cx.tcx, item.def_id.to_def_id()).self_ty(); + let self_ty = TraitRef::identity(cx.tcx, item.def_id.to_def_id()).self_ty().skip_binder(); wrong_self_convention::check( cx, &item.ident.name.as_str(), @@ -2078,7 +2078,7 @@ impl<'tcx> LateLintPass<'tcx> for Methods { if item.ident.name == sym::new; if let TraitItemKind::Fn(_, _) = item.kind; let ret_ty = return_ty(cx, item.hir_id()); - let self_ty = TraitRef::identity(cx.tcx, item.def_id.to_def_id()).self_ty(); + let self_ty = TraitRef::identity(cx.tcx, item.def_id.to_def_id()).self_ty().skip_binder(); if !contains_ty(cx.tcx, ret_ty, self_ty); then { |