Skip to content

Commit 5fdfbe1

Browse files
committed
Auto merge of #140781 - matthiaskrgr:rollup-90sig9g, r=matthiaskrgr
Rollup of 9 pull requests Successful merges: - #140260 (Only prefer param-env candidates if they remain non-global after norm) - #140523 (Better error message for late/early lifetime param mismatch) - #140579 (Remove estebank from automated review assignment) - #140641 (detect additional uses of opaques after writeback) - #140711 (Do not discard constraints on overflow if there was candidate ambiguity) - #140762 (rustdoc-json: Remove newlines from attributes) - #140764 (style: Never break within a nullary function call `func()` or a unit literal `()`) - #140769 (Add `DefPathData::OpaqueLifetime` to avoid conflicts for remapped opaque lifetimes) - #140773 (triagebot: Better message for changes to `tests/rustdoc-json`) r? `@ghost` `@rustbot` modify labels: rollup
2 parents f098aa6 + 6c6cad4 commit 5fdfbe1

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

clippy_utils/src/ty/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ use rustc_middle::traits::EvaluationResult;
2020
use rustc_middle::ty::layout::ValidityRequirement;
2121
use rustc_middle::ty::{
2222
self, AdtDef, AliasTy, AssocItem, AssocTag, Binder, BoundRegion, FnSig, GenericArg, GenericArgKind, GenericArgsRef,
23-
GenericParamDefKind, IntTy, ParamEnv, Region, RegionKind, TraitRef, Ty, TyCtxt, TypeSuperVisitable, TypeVisitable,
24-
TypeVisitableExt, TypeVisitor, UintTy, Upcast, VariantDef, VariantDiscr,
23+
GenericParamDefKind, IntTy, ParamEnv, Region, RegionKind, TraitRef, Ty, TyCtxt, TypeFoldable, TypeSuperVisitable,
24+
TypeVisitable, TypeVisitableExt, TypeVisitor, UintTy, Upcast, VariantDef, VariantDiscr,
2525
};
2626
use rustc_span::symbol::Ident;
2727
use rustc_span::{DUMMY_SP, Span, Symbol, sym};
@@ -915,7 +915,7 @@ pub fn for_each_top_level_late_bound_region<B>(
915915
ControlFlow::Continue(())
916916
}
917917
}
918-
fn visit_binder<T: TypeVisitable<TyCtxt<'tcx>>>(&mut self, t: &Binder<'tcx, T>) -> Self::Result {
918+
fn visit_binder<T: TypeFoldable<TyCtxt<'tcx>>>(&mut self, t: &Binder<'tcx, T>) -> Self::Result {
919919
self.index += 1;
920920
let res = t.super_visit_with(self);
921921
self.index -= 1;

0 commit comments

Comments
 (0)