mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use the general type API instead of directly accessing register_hidden_type

Browse Source
This commit is contained in:
Oli Scherer 2022-10-07 09:33:22 +00:00
parent 14caf7396d
commit 196a429a67
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
compiler/rustc_borrowck/src/region_infer/opaque_types.rs
View File

@ -263,13 +263,11 @@ impl<'tcx> InferCtxtExt<'tcx> for InferCtxt<'tcx> {
// Require that the hidden type actually fulfills all the bounds of the opaque type, even without // Require that the hidden type actually fulfills all the bounds of the opaque type, even without
// the bounds that the function supplies. // the bounds that the function supplies.
match infcx.register_hidden_type( let opaque_ty = self.tcx.mk_opaque(def_id.to_def_id(), id_substs);
OpaqueTypeKey { def_id, substs: id_substs }, match infcx
ObligationCause::misc(instantiated_ty.span, body_id), .at(&ObligationCause::misc(instantiated_ty.span, body_id), param_env)
param_env, .eq(opaque_ty, definition_ty)
definition_ty, {
origin,
) {
Ok(infer_ok) => { Ok(infer_ok) => {
for obligation in infer_ok.obligations { for obligation in infer_ok.obligations {
fulfillment_cx.register_predicate_obligation(&infcx, obligation); fulfillment_cx.register_predicate_obligation(&infcx, obligation);
@ -280,7 +278,7 @@ impl<'tcx> InferCtxtExt<'tcx> for InferCtxt<'tcx> {
.err_ctxt() .err_ctxt()
.report_mismatched_types( .report_mismatched_types(
&ObligationCause::misc(instantiated_ty.span, body_id), &ObligationCause::misc(instantiated_ty.span, body_id),
self.tcx.mk_opaque(def_id.to_def_id(), id_substs), opaque_ty,
definition_ty, definition_ty,
err, err,
) )