language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-28 21:05:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Rename StructDatum -> AdtDatum

Browse source
This commit is contained in:
Ryo Yoshida 2022-08-23 21:56:56 +09:00 • committed by Lukas Wirth
parent a52acccc58
commit 4940017716
5 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

20
crates/hir-ty/src/chalk_db.rs
View file

@ -33,7 +33,7 @@ use crate::{
pub(crate) type AssociatedTyDatum = chalk_solve::rust_ir::AssociatedTyDatum<Interner>; pub(crate) type AssociatedTyDatum = chalk_solve::rust_ir::AssociatedTyDatum<Interner>;
pub(crate) type TraitDatum = chalk_solve::rust_ir::TraitDatum<Interner>; pub(crate) type TraitDatum = chalk_solve::rust_ir::TraitDatum<Interner>;
pub(crate) type StructDatum = chalk_solve::rust_ir::AdtDatum<Interner>; pub(crate) type AdtDatum = chalk_solve::rust_ir::AdtDatum<Interner>;
pub(crate) type ImplDatum = chalk_solve::rust_ir::ImplDatum<Interner>; pub(crate) type ImplDatum = chalk_solve::rust_ir::ImplDatum<Interner>;
pub(crate) type OpaqueTyDatum = chalk_solve::rust_ir::OpaqueTyDatum<Interner>; pub(crate) type OpaqueTyDatum = chalk_solve::rust_ir::OpaqueTyDatum<Interner>;
@ -53,8 +53,8 @@ impl chalk_solve::RustIrDatabase<Interner> for ChalkContext<'_> {
fn trait_datum(&self, trait_id: TraitId) -> Arc<TraitDatum> { fn trait_datum(&self, trait_id: TraitId) -> Arc<TraitDatum> {
self.db.trait_datum(self.krate, trait_id) self.db.trait_datum(self.krate, trait_id)
} }
fn adt_datum(&self, struct_id: AdtId) -> Arc<StructDatum> { fn adt_datum(&self, struct_id: AdtId) -> Arc<AdtDatum> {
self.db.struct_datum(self.krate, struct_id) self.db.adt_datum(self.krate, struct_id)
} }
fn adt_repr(&self, _struct_id: AdtId) -> Arc<rust_ir::AdtRepr<Interner>> { fn adt_repr(&self, _struct_id: AdtId) -> Arc<rust_ir::AdtRepr<Interner>> {
// FIXME: keep track of these // FIXME: keep track of these
@ -712,13 +712,13 @@ fn lang_item_from_well_known_trait(trait_: WellKnownTrait) -> LangItem {
} }
} }
pub(crate) fn struct_datum_query( pub(crate) fn adt_datum_query(
db: &dyn HirDatabase, db: &dyn HirDatabase,
krate: CrateId, krate: CrateId,
struct_id: AdtId, adt_id: AdtId,
) -> Arc<StructDatum> { ) -> Arc<AdtDatum> {
debug!("struct_datum {:?}", struct_id); debug!("adt_datum {:?}", adt_id);
let chalk_ir::AdtId(adt_id) = struct_id; let chalk_ir::AdtId(adt_id) = adt_id;
let generic_params = generics(db.upcast(), adt_id.into()); let generic_params = generics(db.upcast(), adt_id.into());
let upstream = adt_id.module(db.upcast()).krate() != krate; let upstream = adt_id.module(db.upcast()).krate() != krate;
let where_clauses = { let where_clauses = {
@ -737,10 +737,10 @@ pub(crate) fn struct_datum_query(
fields: Vec::new(), // FIXME add fields (only relevant for auto traits), fields: Vec::new(), // FIXME add fields (only relevant for auto traits),
}; };
let struct_datum_bound = rust_ir::AdtDatumBound { variants: vec![variant], where_clauses }; let struct_datum_bound = rust_ir::AdtDatumBound { variants: vec![variant], where_clauses };
let struct_datum = StructDatum { let struct_datum = AdtDatum {
// FIXME set ADT kind // FIXME set ADT kind
kind: rust_ir::AdtKind::Struct, kind: rust_ir::AdtKind::Struct,
id: struct_id, id: chalk_ir::AdtId(adt_id),
binders: make_binders(db, &generic_params, struct_datum_bound), binders: make_binders(db, &generic_params, struct_datum_bound),
flags, flags,
}; };

6
crates/hir-ty/src/db.rs
View file

@ -220,12 +220,12 @@ pub trait HirDatabase: DefDatabase + Upcast<dyn DefDatabase> {
trait_id: chalk_db::TraitId, trait_id: chalk_db::TraitId,
) -> sync::Arc<chalk_db::TraitDatum>; ) -> sync::Arc<chalk_db::TraitDatum>;
#[salsa::invoke(chalk_db::struct_datum_query)] #[salsa::invoke(chalk_db::adt_datum_query)]
fn struct_datum( fn adt_datum(
&self, &self,
krate: CrateId, krate: CrateId,
struct_id: chalk_db::AdtId, struct_id: chalk_db::AdtId,
) -> sync::Arc<chalk_db::StructDatum>; ) -> sync::Arc<chalk_db::AdtDatum>;
#[salsa::invoke(chalk_db::impl_datum_query)] #[salsa::invoke(chalk_db::impl_datum_query)]
fn impl_datum( fn impl_datum(

4
crates/hir/src/lib.rs
View file

@ -3798,9 +3798,9 @@ impl Type {
// For non-phantom_data adts we check variants/fields as well as generic parameters // For non-phantom_data adts we check variants/fields as well as generic parameters
TyKind::Adt(adt_id, substitution) TyKind::Adt(adt_id, substitution)
if !db.struct_datum(krate, *adt_id).flags.phantom_data => if !db.adt_datum(krate, *adt_id).flags.phantom_data =>
{ {
let adt_datum = &db.struct_datum(krate, *adt_id); let adt_datum = &db.adt_datum(krate, *adt_id);
let adt_datum_bound = let adt_datum_bound =
adt_datum.binders.clone().substitute(Interner, substitution); adt_datum.binders.clone().substitute(Interner, substitution);
adt_datum_bound adt_datum_bound

2
crates/ide-db/src/apply_change.rs
View file

@ -124,7 +124,7 @@ impl RootDatabase {
hir::db::InternCoroutineQuery hir::db::InternCoroutineQuery
hir::db::AssociatedTyDataQuery hir::db::AssociatedTyDataQuery
hir::db::TraitDatumQuery hir::db::TraitDatumQuery
hir::db::StructDatumQuery hir::db::AdtDatumQuery
hir::db::ImplDatumQuery hir::db::ImplDatumQuery
hir::db::FnDefDatumQuery hir::db::FnDefDatumQuery
hir::db::FnDefVarianceQuery hir::db::FnDefVarianceQuery

2
crates/ide-db/src/lib.rs
View file

@ -280,7 +280,7 @@ impl RootDatabase {
// hir_db::InternCoroutineQuery // hir_db::InternCoroutineQuery
hir_db::AssociatedTyDataQuery hir_db::AssociatedTyDataQuery
hir_db::TraitDatumQuery hir_db::TraitDatumQuery
hir_db::StructDatumQuery hir_db::AdtDatumQuery
hir_db::ImplDatumQuery hir_db::ImplDatumQuery
hir_db::FnDefDatumQuery hir_db::FnDefDatumQuery
hir_db::FnDefVarianceQuery hir_db::FnDefVarianceQuery