diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2024-05-10 07:30:22 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-10 07:30:22 +0200 |
| commit | 0ee258009ce443cd882303f25d0f26c99c80cfa6 (patch) | |
| tree | 43e497b9a7ecee33fb1c0b1e516534748f3064ce /compiler/rustc_hir_analysis/src | |
| parent | 30bd6cb726a4051c8a85dedae1173aeb9ecaca16 (diff) | |
| parent | fe843feaabfd48fa5ed7e10f00a9d22bb64a20ef (diff) | |
| download | rust-0ee258009ce443cd882303f25d0f26c99c80cfa6.tar.gz rust-0ee258009ce443cd882303f25d0f26c99c80cfa6.zip | |
Rollup merge of #124955 - nnethercote:next_ty_var, r=lcnr
Use fewer origins when creating type variables. To reduce lots of repetitive boilerplate code. Details in the individual commit messages. r? ``@lcnr``
Diffstat (limited to 'compiler/rustc_hir_analysis/src')
| -rw-r--r-- | compiler/rustc_hir_analysis/src/check/compare_impl_item.rs | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/compiler/rustc_hir_analysis/src/check/compare_impl_item.rs b/compiler/rustc_hir_analysis/src/check/compare_impl_item.rs index d2759087cb4..4ca3080f436 100644 --- a/compiler/rustc_hir_analysis/src/check/compare_impl_item.rs +++ b/compiler/rustc_hir_analysis/src/check/compare_impl_item.rs @@ -9,7 +9,6 @@ use rustc_hir::def::{DefKind, Res}; use rustc_hir::intravisit; use rustc_hir::{GenericParamKind, ImplItemKind}; use rustc_infer::infer::outlives::env::OutlivesEnvironment; -use rustc_infer::infer::type_variable::TypeVariableOrigin; use rustc_infer::infer::{self, InferCtxt, TyCtxtInferExt}; use rustc_infer::traits::{util, FulfillmentError}; use rustc_middle::ty::error::{ExpectedFound, TypeError}; @@ -800,10 +799,7 @@ impl<'tcx> TypeFolder<TyCtxt<'tcx>> for ImplTraitInTraitCollector<'_, 'tcx> { bug!("FIXME(RPITIT): error here"); } // Replace with infer var - let infer_ty = self - .ocx - .infcx - .next_ty_var(TypeVariableOrigin { span: self.span, param_def_id: None }); + let infer_ty = self.ocx.infcx.next_ty_var(self.span); self.types.insert(proj.def_id, (infer_ty, proj.args)); // Recurse into bounds for (pred, pred_span) in self |
