Skip to content

Commit ad55e4c

Browse files
Use ty::OpaqueTy everywhere
1 parent 17a092f commit ad55e4c

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

clippy_lints/src/future_not_send.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use rustc_hir::intravisit::FnKind;
44
use rustc_hir::{Body, FnDecl, HirId};
55
use rustc_infer::infer::TyCtxtInferExt;
66
use rustc_lint::{LateContext, LateLintPass};
7-
use rustc_middle::ty::{Clause, EarlyBinder, Opaque, PredicateKind};
7+
use rustc_middle::ty::{Clause, EarlyBinder, Opaque, OpaqueTy, PredicateKind};
88
use rustc_session::{declare_lint_pass, declare_tool_lint};
99
use rustc_span::{sym, Span};
1010
use rustc_trait_selection::traits::error_reporting::suggestions::TypeErrCtxtExt;
@@ -62,11 +62,11 @@ impl<'tcx> LateLintPass<'tcx> for FutureNotSend {
6262
return;
6363
}
6464
let ret_ty = return_ty(cx, hir_id);
65-
if let Opaque(id, subst) = *ret_ty.kind() {
66-
let preds = cx.tcx.explicit_item_bounds(id);
65+
if let Opaque(OpaqueTy { def_id, substs }) = *ret_ty.kind() {
66+
let preds = cx.tcx.explicit_item_bounds(def_id);
6767
let mut is_future = false;
6868
for &(p, _span) in preds {
69-
let p = EarlyBinder(p).subst(cx.tcx, subst);
69+
let p = EarlyBinder(p).subst(cx.tcx, substs);
7070
if let Some(trait_pred) = p.to_opt_poly_trait_pred() {
7171
if Some(trait_pred.skip_binder().trait_ref.def_id) == cx.tcx.lang_items().future_trait() {
7272
is_future = true;

clippy_utils/src/ty.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ pub fn contains_ty_adt_constructor_opaque<'tcx>(cx: &LateContext<'tcx>, ty: Ty<'
7979
return true;
8080
}
8181

82-
if let ty::Opaque(def_id, _) = *inner_ty.kind() {
82+
if let ty::Opaque(ty::OpaqueTy { def_id, substs: _ }) = *inner_ty.kind() {
8383
for &(predicate, _span) in cx.tcx.explicit_item_bounds(def_id) {
8484
match predicate.kind().skip_binder() {
8585
// For `impl Trait<U>`, it will register a predicate of `T: Trait<U>`, so we go through
@@ -250,7 +250,7 @@ pub fn is_must_use_ty<'tcx>(cx: &LateContext<'tcx>, ty: Ty<'tcx>) -> bool {
250250
is_must_use_ty(cx, *ty)
251251
},
252252
ty::Tuple(substs) => substs.iter().any(|ty| is_must_use_ty(cx, ty)),
253-
ty::Opaque(def_id, _) => {
253+
ty::Opaque(ty::OpaqueTy { def_id, substs: _ }) => {
254254
for (predicate, _) in cx.tcx.explicit_item_bounds(*def_id) {
255255
if let ty::PredicateKind::Clause(ty::Clause::Trait(trait_predicate)) = predicate.kind().skip_binder() {
256256
if cx.tcx.has_attr(trait_predicate.trait_ref.def_id, sym::must_use) {
@@ -631,7 +631,7 @@ pub fn ty_sig<'tcx>(cx: &LateContext<'tcx>, ty: Ty<'tcx>) -> Option<ExprFnSig<'t
631631
Some(ExprFnSig::Closure(decl, subs.as_closure().sig()))
632632
},
633633
ty::FnDef(id, subs) => Some(ExprFnSig::Sig(cx.tcx.bound_fn_sig(id).subst(cx.tcx, subs), Some(id))),
634-
ty::Opaque(id, _) => sig_from_bounds(cx, ty, cx.tcx.item_bounds(id), cx.tcx.opt_parent(id)),
634+
ty::Opaque(ty::OpaqueTy{ def_id, substs: _ }) => sig_from_bounds(cx, ty, cx.tcx.item_bounds(def_id), cx.tcx.opt_parent(def_id)),
635635
ty::FnPtr(sig) => Some(ExprFnSig::Sig(sig, None)),
636636
ty::Dynamic(bounds, _, _) => {
637637
let lang_items = cx.tcx.lang_items();

0 commit comments

Comments
 (0)