Migrate item_bounds to ty::Clause
This commit is contained in:
parent
a2b99d8174
commit
533a819115
@ -67,7 +67,7 @@ fn check_fn(
|
|||||||
let preds = cx.tcx.explicit_item_bounds(def_id);
|
let preds = cx.tcx.explicit_item_bounds(def_id);
|
||||||
let mut is_future = false;
|
let mut is_future = false;
|
||||||
for (p, _span) in preds.subst_iter_copied(cx.tcx, substs) {
|
for (p, _span) in preds.subst_iter_copied(cx.tcx, substs) {
|
||||||
if let Some(trait_pred) = p.to_opt_poly_trait_pred() {
|
if let Some(trait_pred) = p.as_trait_clause() {
|
||||||
if Some(trait_pred.skip_binder().trait_ref.def_id) == cx.tcx.lang_items().future_trait() {
|
if Some(trait_pred.skip_binder().trait_ref.def_id) == cx.tcx.lang_items().future_trait() {
|
||||||
is_future = true;
|
is_future = true;
|
||||||
break;
|
break;
|
||||||
|
@ -94,7 +94,7 @@ fn contains_ty_adt_constructor_opaque_inner<'tcx>(
|
|||||||
match predicate.kind().skip_binder() {
|
match predicate.kind().skip_binder() {
|
||||||
// For `impl Trait<U>`, it will register a predicate of `T: Trait<U>`, so we go through
|
// For `impl Trait<U>`, it will register a predicate of `T: Trait<U>`, so we go through
|
||||||
// and check substitutions to find `U`.
|
// and check substitutions to find `U`.
|
||||||
ty::PredicateKind::Clause(ty::ClauseKind::Trait(trait_predicate)) => {
|
ty::ClauseKind::Trait(trait_predicate) => {
|
||||||
if trait_predicate
|
if trait_predicate
|
||||||
.trait_ref
|
.trait_ref
|
||||||
.substs
|
.substs
|
||||||
@ -107,7 +107,7 @@ fn contains_ty_adt_constructor_opaque_inner<'tcx>(
|
|||||||
},
|
},
|
||||||
// For `impl Trait<Assoc=U>`, it will register a predicate of `<T as Trait>::Assoc = U`,
|
// For `impl Trait<Assoc=U>`, it will register a predicate of `<T as Trait>::Assoc = U`,
|
||||||
// so we check the term for `U`.
|
// so we check the term for `U`.
|
||||||
ty::PredicateKind::Clause(ty::ClauseKind::Projection(projection_predicate)) => {
|
ty::ClauseKind::Projection(projection_predicate) => {
|
||||||
if let ty::TermKind::Ty(ty) = projection_predicate.term.unpack() {
|
if let ty::TermKind::Ty(ty) = projection_predicate.term.unpack() {
|
||||||
if contains_ty_adt_constructor_opaque_inner(cx, ty, needle, seen) {
|
if contains_ty_adt_constructor_opaque_inner(cx, ty, needle, seen) {
|
||||||
return true;
|
return true;
|
||||||
@ -268,7 +268,7 @@ pub fn is_must_use_ty<'tcx>(cx: &LateContext<'tcx>, ty: Ty<'tcx>) -> bool {
|
|||||||
ty::Tuple(substs) => substs.iter().any(|ty| is_must_use_ty(cx, ty)),
|
ty::Tuple(substs) => substs.iter().any(|ty| is_must_use_ty(cx, ty)),
|
||||||
ty::Alias(ty::Opaque, ty::AliasTy { def_id, .. }) => {
|
ty::Alias(ty::Opaque, ty::AliasTy { def_id, .. }) => {
|
||||||
for (predicate, _) in cx.tcx.explicit_item_bounds(def_id).skip_binder() {
|
for (predicate, _) in cx.tcx.explicit_item_bounds(def_id).skip_binder() {
|
||||||
if let ty::PredicateKind::Clause(ty::ClauseKind::Trait(trait_predicate)) = predicate.kind().skip_binder() {
|
if let ty::ClauseKind::Trait(trait_predicate) = predicate.kind().skip_binder() {
|
||||||
if cx.tcx.has_attr(trait_predicate.trait_ref.def_id, sym::must_use) {
|
if cx.tcx.has_attr(trait_predicate.trait_ref.def_id, sym::must_use) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@ -665,7 +665,7 @@ pub fn ty_sig<'tcx>(cx: &LateContext<'tcx>, ty: Ty<'tcx>) -> Option<ExprFnSig<'t
|
|||||||
ty::Alias(ty::Opaque, ty::AliasTy { def_id, substs, .. }) => sig_from_bounds(
|
ty::Alias(ty::Opaque, ty::AliasTy { def_id, substs, .. }) => sig_from_bounds(
|
||||||
cx,
|
cx,
|
||||||
ty,
|
ty,
|
||||||
cx.tcx.item_bounds(def_id).subst(cx.tcx, substs),
|
cx.tcx.item_bounds(def_id).subst_iter(cx.tcx, substs).map(|c| c.as_predicate()),
|
||||||
cx.tcx.opt_parent(def_id),
|
cx.tcx.opt_parent(def_id),
|
||||||
),
|
),
|
||||||
ty::FnPtr(sig) => Some(ExprFnSig::Sig(sig, None)),
|
ty::FnPtr(sig) => Some(ExprFnSig::Sig(sig, None)),
|
||||||
@ -698,7 +698,7 @@ pub fn ty_sig<'tcx>(cx: &LateContext<'tcx>, ty: Ty<'tcx>) -> Option<ExprFnSig<'t
|
|||||||
fn sig_from_bounds<'tcx>(
|
fn sig_from_bounds<'tcx>(
|
||||||
cx: &LateContext<'tcx>,
|
cx: &LateContext<'tcx>,
|
||||||
ty: Ty<'tcx>,
|
ty: Ty<'tcx>,
|
||||||
predicates: &'tcx [Predicate<'tcx>],
|
predicates: impl IntoIterator<Item = Predicate<'tcx>>,
|
||||||
predicates_id: Option<DefId>,
|
predicates_id: Option<DefId>,
|
||||||
) -> Option<ExprFnSig<'tcx>> {
|
) -> Option<ExprFnSig<'tcx>> {
|
||||||
let mut inputs = None;
|
let mut inputs = None;
|
||||||
@ -747,7 +747,7 @@ fn sig_for_projection<'tcx>(cx: &LateContext<'tcx>, ty: AliasTy<'tcx>) -> Option
|
|||||||
.subst_iter_copied(cx.tcx, ty.substs)
|
.subst_iter_copied(cx.tcx, ty.substs)
|
||||||
{
|
{
|
||||||
match pred.kind().skip_binder() {
|
match pred.kind().skip_binder() {
|
||||||
PredicateKind::Clause(ty::ClauseKind::Trait(p))
|
ty::ClauseKind::Trait(p)
|
||||||
if (lang_items.fn_trait() == Some(p.def_id())
|
if (lang_items.fn_trait() == Some(p.def_id())
|
||||||
|| lang_items.fn_mut_trait() == Some(p.def_id())
|
|| lang_items.fn_mut_trait() == Some(p.def_id())
|
||||||
|| lang_items.fn_once_trait() == Some(p.def_id())) =>
|
|| lang_items.fn_once_trait() == Some(p.def_id())) =>
|
||||||
@ -760,7 +760,7 @@ fn sig_for_projection<'tcx>(cx: &LateContext<'tcx>, ty: AliasTy<'tcx>) -> Option
|
|||||||
}
|
}
|
||||||
inputs = Some(i);
|
inputs = Some(i);
|
||||||
},
|
},
|
||||||
PredicateKind::Clause(ty::ClauseKind::Projection(p))
|
ty::ClauseKind::Projection(p)
|
||||||
if Some(p.projection_ty.def_id) == lang_items.fn_once_output() =>
|
if Some(p.projection_ty.def_id) == lang_items.fn_once_output() =>
|
||||||
{
|
{
|
||||||
if output.is_some() {
|
if output.is_some() {
|
||||||
|
Loading…
Reference in New Issue
Block a user