Skip to content

Commit cc70732

Browse files
authored
Unrolled build for rust-lang#122406
Rollup merge of rust-lang#122406 - compiler-errors:next-solver-asynckind-wf, r=lcnr Fix WF for `AsyncFnKindHelper` in new trait solver `to_opt_closure_kind` ICEs when it sees placeholders... so don't do that no test b/c I'm too lazy to write a no-core test for this, but I could be convinced otherwise r? lcnr
2 parents fe61575 + dd0f41f commit cc70732

File tree

1 file changed

+3
-2
lines changed
  • compiler/rustc_middle/src/ty

1 file changed

+3
-2
lines changed

compiler/rustc_middle/src/ty/sty.rs

+3-2
Original file line numberDiff line numberDiff line change
@@ -2436,8 +2436,9 @@ impl<'tcx> Ty<'tcx> {
24362436
},
24372437

24382438
// "Bound" types appear in canonical queries when the
2439-
// closure type is not yet known
2440-
Bound(..) | Param(_) | Infer(_) => None,
2439+
// closure type is not yet known, and `Placeholder` and `Param`
2440+
// may be encountered in generic `AsyncFnKindHelper` goals.
2441+
Bound(..) | Placeholder(_) | Param(_) | Infer(_) => None,
24412442

24422443
Error(_) => Some(ty::ClosureKind::Fn),
24432444

0 commit comments

Comments
 (0)