nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-06-22 20:47:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean up the fix a bit

Browse Source 
Use register_predicate_obligations rather than a for loop, since I
didn't see that before. Also destructure in the `let` rather than
projecting the fields individually
This commit is contained in:
ThePuzzlemaker 2021-09-06 23:58:26 -05:00
parent 734209ed73
commit 33a28254f2
No known key found for this signature in database
GPG Key ID: 968CD9D71C9FBB6C
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
compiler/rustc_typeck/src/lib.rs
View File

@ -335,16 +335,20 @@ fn check_main_fn_ty(tcx: TyCtxt<'_>, main_def_id: DefId) {
// checking trait fulfillment, not this here. I'm not sure why it
// works in the example in `fn test()` given in #88609? This also
// probably isn't the best way to do this.
let normalized = infcx.partially_normalize_associated_types_in(
cause.clone(),
let InferOk { value: norm_return_ty, obligations } = infcx
.partially_normalize_associated_types_in(
cause.clone(),
ty::ParamEnv::empty(),
return_ty,
);
fulfillment_cx.register_predicate_obligations(&infcx, obligations);
fulfillment_cx.register_bound(
&infcx,
ty::ParamEnv::empty(),
return_ty,
norm_return_ty,
term_id,
cause,
);
let new_ty = normalized.value;
for obligation in normalized.obligations {
fulfillment_cx.register_predicate_obligation(&infcx, obligation);
}
fulfillment_cx.register_bound(&infcx, ty::ParamEnv::empty(), new_ty, term_id, cause);
if let Err(err) = fulfillment_cx.select_all_or_error(&infcx) {
infcx.report_fulfillment_errors(&err, None, false);
error = true;