Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/hir-ty/src/chalk_db.rs')
| -rw-r--r-- | crates/hir-ty/src/chalk_db.rs | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/crates/hir-ty/src/chalk_db.rs b/crates/hir-ty/src/chalk_db.rs index e81d4ced55..5b0b16eb9a 100644 --- a/crates/hir-ty/src/chalk_db.rs +++ b/crates/hir-ty/src/chalk_db.rs @@ -424,18 +424,18 @@ impl chalk_solve::RustIrDatabase<Interner> for ChalkContext<'_> { fn fn_def_name(&self, fn_def_id: chalk_ir::FnDefId<Interner>) -> String { format!("fn_{}", fn_def_id.0) } - fn generator_datum( + fn coroutine_datum( &self, - id: chalk_ir::GeneratorId<Interner>, - ) -> Arc<chalk_solve::rust_ir::GeneratorDatum<Interner>> { - let (parent, expr) = self.db.lookup_intern_generator(id.into()); + id: chalk_ir::CoroutineId<Interner>, + ) -> Arc<chalk_solve::rust_ir::CoroutineDatum<Interner>> { + let (parent, expr) = self.db.lookup_intern_coroutine(id.into()); // We fill substitution with unknown type, because we only need to know whether the generic // params are types or consts to build `Binders` and those being filled up are for - // `resume_type`, `yield_type`, and `return_type` of the generator in question. - let subst = TyBuilder::subst_for_generator(self.db, parent).fill_with_unknown().build(); + // `resume_type`, `yield_type`, and `return_type` of the coroutine in question. + let subst = TyBuilder::subst_for_coroutine(self.db, parent).fill_with_unknown().build(); - let input_output = rust_ir::GeneratorInputOutputDatum { + let input_output = rust_ir::CoroutineInputOutputDatum { resume_type: TyKind::BoundVar(BoundVar::new(DebruijnIndex::INNERMOST, 0)) .intern(Interner), yield_type: TyKind::BoundVar(BoundVar::new(DebruijnIndex::INNERMOST, 1)) @@ -453,35 +453,35 @@ impl chalk_solve::RustIrDatabase<Interner> for ChalkContext<'_> { let movability = match self.db.body(parent)[expr] { hir_def::hir::Expr::Closure { - closure_kind: hir_def::hir::ClosureKind::Generator(movability), + closure_kind: hir_def::hir::ClosureKind::Coroutine(movability), .. } => movability, - _ => unreachable!("non generator expression interned as generator"), + _ => unreachable!("non coroutine expression interned as coroutine"), }; let movability = match movability { Movability::Static => rust_ir::Movability::Static, Movability::Movable => rust_ir::Movability::Movable, }; - Arc::new(rust_ir::GeneratorDatum { movability, input_output }) + Arc::new(rust_ir::CoroutineDatum { movability, input_output }) } - fn generator_witness_datum( + fn coroutine_witness_datum( &self, - id: chalk_ir::GeneratorId<Interner>, - ) -> Arc<chalk_solve::rust_ir::GeneratorWitnessDatum<Interner>> { + id: chalk_ir::CoroutineId<Interner>, + ) -> Arc<chalk_solve::rust_ir::CoroutineWitnessDatum<Interner>> { // FIXME: calculate inner types let inner_types = - rust_ir::GeneratorWitnessExistential { types: wrap_empty_binders(vec![]) }; + rust_ir::CoroutineWitnessExistential { types: wrap_empty_binders(vec![]) }; - let (parent, _) = self.db.lookup_intern_generator(id.into()); - // See the comment in `generator_datum()` for unknown types. - let subst = TyBuilder::subst_for_generator(self.db, parent).fill_with_unknown().build(); + let (parent, _) = self.db.lookup_intern_coroutine(id.into()); + // See the comment in `coroutine_datum()` for unknown types. + let subst = TyBuilder::subst_for_coroutine(self.db, parent).fill_with_unknown().build(); let it = subst .iter(Interner) .map(|it| it.constant(Interner).map(|c| c.data(Interner).ty.clone())); let inner_types = crate::make_type_and_const_binders(it, inner_types); - Arc::new(rust_ir::GeneratorWitnessDatum { inner_types }) + Arc::new(rust_ir::CoroutineWitnessDatum { inner_types }) } fn unification_database(&self) -> &dyn chalk_ir::UnificationDatabase<Interner> { @@ -617,7 +617,7 @@ fn well_known_trait_from_lang_item(item: LangItem) -> Option<WellKnownTrait> { LangItem::Fn => WellKnownTrait::Fn, LangItem::FnMut => WellKnownTrait::FnMut, LangItem::FnOnce => WellKnownTrait::FnOnce, - LangItem::Generator => WellKnownTrait::Generator, + LangItem::Coroutine => WellKnownTrait::Coroutine, LangItem::Sized => WellKnownTrait::Sized, LangItem::Unpin => WellKnownTrait::Unpin, LangItem::Unsize => WellKnownTrait::Unsize, @@ -639,7 +639,7 @@ fn lang_item_from_well_known_trait(trait_: WellKnownTrait) -> LangItem { WellKnownTrait::Fn => LangItem::Fn, WellKnownTrait::FnMut => LangItem::FnMut, WellKnownTrait::FnOnce => LangItem::FnOnce, - WellKnownTrait::Generator => LangItem::Generator, + WellKnownTrait::Coroutine => LangItem::Coroutine, WellKnownTrait::Sized => LangItem::Sized, WellKnownTrait::Tuple => LangItem::Tuple, WellKnownTrait::Unpin => LangItem::Unpin, |