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

Rollup merge of #112189 - compiler-errors:bad-gen, r=cjgillot

Browse Source 
Debug-assert that closures and generators are made with the right number of substitutions

Just in case.
This commit is contained in:
Matthias Krüger 2023-06-02 18:12:46 +02:00 committed by GitHub
commit 82130eb9d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
compiler/rustc_middle/src/ty/context.rs
View File

@ -1884,18 +1884,28 @@ impl<'tcx> TyCtxt<'tcx> {
} }
#[inline] #[inline]
pub fn mk_closure(self, closure_id: DefId, closure_substs: SubstsRef<'tcx>) -> Ty<'tcx> { pub fn mk_closure(self, def_id: DefId, closure_substs: SubstsRef<'tcx>) -> Ty<'tcx> {
self.mk_ty_from_kind(Closure(closure_id, closure_substs)) debug_assert_eq!(
closure_substs.len(),
self.generics_of(self.typeck_root_def_id(def_id)).count() + 3,
"closure constructed with incorrect substitutions"
);
self.mk_ty_from_kind(Closure(def_id, closure_substs))
} }
#[inline] #[inline]
pub fn mk_generator( pub fn mk_generator(
self, self,
id: DefId, def_id: DefId,
generator_substs: SubstsRef<'tcx>, generator_substs: SubstsRef<'tcx>,
movability: hir::Movability, movability: hir::Movability,
) -> Ty<'tcx> { ) -> Ty<'tcx> {
self.mk_ty_from_kind(Generator(id, generator_substs, movability)) debug_assert_eq!(
generator_substs.len(),
self.generics_of(self.typeck_root_def_id(def_id)).count() + 5,
"generator constructed with incorrect number of substitutions"
);
self.mk_ty_from_kind(Generator(def_id, generator_substs, movability))
} }
#[inline] #[inline]