Skip to content

Commit 1dbabc1

Browse files
Bless test fallout (duplicate diagnostics)
1 parent 76096ef commit 1dbabc1

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

clippy_lints/src/future_not_send.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ impl<'tcx> LateLintPass<'tcx> for FutureNotSend {
6464
}
6565
let ret_ty = return_ty(cx, cx.tcx.local_def_id_to_hir_id(fn_def_id).expect_owner());
6666
if let ty::Alias(ty::Opaque, AliasTy { def_id, args, .. }) = *ret_ty.kind() {
67-
let preds = cx.tcx.explicit_item_bounds(def_id);
67+
let preds = cx.tcx.explicit_item_super_predicates(def_id);
6868
let mut is_future = false;
6969
for (p, _span) in preds.iter_instantiated_copied(cx.tcx, args) {
7070
if let Some(trait_pred) = p.as_trait_clause() {

clippy_utils/src/ty.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ pub fn contains_ty_adt_constructor_opaque<'tcx>(cx: &LateContext<'tcx>, ty: Ty<'
9696
return false;
9797
}
9898

99-
for (predicate, _span) in cx.tcx.explicit_item_bounds(def_id).instantiate_identity_iter_copied() {
99+
for (predicate, _span) in cx.tcx.explicit_item_super_predicates(def_id).instantiate_identity_iter_copied() {
100100
match predicate.kind().skip_binder() {
101101
// For `impl Trait<U>`, it will register a predicate of `T: Trait<U>`, so we go through
102102
// and check substitutions to find `U`.
@@ -328,7 +328,7 @@ pub fn is_must_use_ty<'tcx>(cx: &LateContext<'tcx>, ty: Ty<'tcx>) -> bool {
328328
},
329329
ty::Tuple(args) => args.iter().any(|ty| is_must_use_ty(cx, ty)),
330330
ty::Alias(ty::Opaque, ty::AliasTy { def_id, .. }) => {
331-
for (predicate, _) in cx.tcx.explicit_item_bounds(def_id).skip_binder() {
331+
for (predicate, _) in cx.tcx.explicit_item_super_predicates(def_id).skip_binder() {
332332
if let ty::ClauseKind::Trait(trait_predicate) = predicate.kind().skip_binder() {
333333
if cx.tcx.has_attr(trait_predicate.trait_ref.def_id, sym::must_use) {
334334
return true;
@@ -729,7 +729,7 @@ pub fn ty_sig<'tcx>(cx: &LateContext<'tcx>, ty: Ty<'tcx>) -> Option<ExprFnSig<'t
729729
ty::Alias(ty::Opaque, ty::AliasTy { def_id, args, .. }) => sig_from_bounds(
730730
cx,
731731
ty,
732-
cx.tcx.item_bounds(def_id).iter_instantiated(cx.tcx, args),
732+
cx.tcx.item_super_predicates(def_id).iter_instantiated(cx.tcx, args),
733733
cx.tcx.opt_parent(def_id),
734734
),
735735
ty::FnPtr(sig) => Some(ExprFnSig::Sig(sig, None)),
@@ -807,7 +807,7 @@ fn sig_for_projection<'tcx>(cx: &LateContext<'tcx>, ty: AliasTy<'tcx>) -> Option
807807

808808
for (pred, _) in cx
809809
.tcx
810-
.explicit_item_bounds(ty.def_id)
810+
.explicit_item_super_predicates(ty.def_id)
811811
.iter_instantiated_copied(cx.tcx, ty.args)
812812
{
813813
match pred.kind().skip_binder() {

0 commit comments

Comments
 (0)