diff options
| author | bors <bors@rust-lang.org> | 2024-05-12 02:12:17 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-05-12 02:12:17 +0000 |
| commit | ee97564e3a9f9ac8c65103abb37c6aa48d95bfa2 (patch) | |
| tree | 1b811dfd8d71d29d3553ace19ba168fbfeac93bd /compiler/rustc_hir_analysis/src | |
| parent | 8b64adc8cdf08f927d01bf9b02cc493ca5bcb5a1 (diff) | |
| parent | d13e5c483dcdfed9724d03dbb2c28827fda4c365 (diff) | |
| download | rust-ee97564e3a9f9ac8c65103abb37c6aa48d95bfa2.tar.gz rust-ee97564e3a9f9ac8c65103abb37c6aa48d95bfa2.zip | |
Auto merge of #125001 - compiler-errors:uplift-trait-predicate, r=lcnr
Uplift various `*Predicate` types into `rustc_type_ir` Uplifts `ProjectionPredicate`, `ExistentialTraitRef`, `ExistentialProjection`, `TraitPredicate`, `NormalizesTo`, `CoercePredicate`, and `SubtypePredicate`. Adds `rustc_type_ir_macros`, which semi-duplicates the derive for `TypeVisitable`, `TypeFoldable`, and `Lift`, but in a way that is interner-agnostic. Moves `rustc_type_ir::trait_ref` to `rustc_type_ir::predicate`. The specific placement of all these structs doesn't matter b/c of glob imports, tho.
Diffstat (limited to 'compiler/rustc_hir_analysis/src')
| -rw-r--r-- | compiler/rustc_hir_analysis/src/hir_ty_lowering/object_safety.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_hir_analysis/src/hir_ty_lowering/object_safety.rs b/compiler/rustc_hir_analysis/src/hir_ty_lowering/object_safety.rs index 297cfe7027e..37d4d4ec355 100644 --- a/compiler/rustc_hir_analysis/src/hir_ty_lowering/object_safety.rs +++ b/compiler/rustc_hir_analysis/src/hir_ty_lowering/object_safety.rs @@ -7,7 +7,7 @@ use rustc_hir::def::{DefKind, Res}; use rustc_hir::def_id::DefId; use rustc_lint_defs::builtin::UNUSED_ASSOCIATED_TYPE_BOUNDS; use rustc_middle::ty::fold::BottomUpFolder; -use rustc_middle::ty::{self, Ty, TyCtxt, TypeFoldable}; +use rustc_middle::ty::{self, ExistentialPredicateStableCmpExt as _, Ty, TyCtxt, TypeFoldable}; use rustc_middle::ty::{DynKind, ToPredicate}; use rustc_span::{ErrorGuaranteed, Span}; use rustc_trait_selection::traits::error_reporting::report_object_safety_error; |
