language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-30 22:01:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge #2424

Browse source 
2424: Crate -> CrateId r=matklad a=matklad



Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
This commit is contained in:
bors[bot] 2019-11-27 06:51:37 +00:00 • committed by GitHub
commit ac5ec2adcd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 37 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

14
crates/ra_hir/src/db.rs
View file

@ -13,7 +13,7 @@ use crate::{
CallableDef, FnSig, GenericPredicate, InferenceResult, Substs, Ty, TyDefId, TypeCtor, CallableDef, FnSig, GenericPredicate, InferenceResult, Substs, Ty, TyDefId, TypeCtor,
ValueTyDefId, ValueTyDefId,
}, },
Crate, DefWithBody, ImplBlock, DefWithBody, ImplBlock,
}; };
pub use hir_def::db::{ pub use hir_def::db::{
@ -71,7 +71,7 @@ pub trait HirDatabase: DefDatabase {
/// Mutex and the query does an untracked read internally, to make sure the /// Mutex and the query does an untracked read internally, to make sure the
/// cached state is thrown away when input facts change. /// cached state is thrown away when input facts change.
#[salsa::invoke(crate::ty::traits::trait_solver_query)] #[salsa::invoke(crate::ty::traits::trait_solver_query)]
fn trait_solver(&self, krate: Crate) -> crate::ty::traits::TraitSolver; fn trait_solver(&self, krate: CrateId) -> crate::ty::traits::TraitSolver;
// Interned IDs for Chalk integration // Interned IDs for Chalk integration
#[salsa::interned] #[salsa::interned]
@ -93,35 +93,35 @@ pub trait HirDatabase: DefDatabase {
#[salsa::invoke(crate::ty::traits::chalk::trait_datum_query)] #[salsa::invoke(crate::ty::traits::chalk::trait_datum_query)]
fn trait_datum( fn trait_datum(
&self, &self,
krate: Crate, krate: CrateId,
trait_id: chalk_ir::TraitId, trait_id: chalk_ir::TraitId,
) -> Arc<chalk_rust_ir::TraitDatum<chalk_ir::family::ChalkIr>>; ) -> Arc<chalk_rust_ir::TraitDatum<chalk_ir::family::ChalkIr>>;
#[salsa::invoke(crate::ty::traits::chalk::struct_datum_query)] #[salsa::invoke(crate::ty::traits::chalk::struct_datum_query)]
fn struct_datum( fn struct_datum(
&self, &self,
krate: Crate, krate: CrateId,
struct_id: chalk_ir::StructId, struct_id: chalk_ir::StructId,
) -> Arc<chalk_rust_ir::StructDatum<chalk_ir::family::ChalkIr>>; ) -> Arc<chalk_rust_ir::StructDatum<chalk_ir::family::ChalkIr>>;
#[salsa::invoke(crate::ty::traits::chalk::impl_datum_query)] #[salsa::invoke(crate::ty::traits::chalk::impl_datum_query)]
fn impl_datum( fn impl_datum(
&self, &self,
krate: Crate, krate: CrateId,
impl_id: chalk_ir::ImplId, impl_id: chalk_ir::ImplId,
) -> Arc<chalk_rust_ir::ImplDatum<chalk_ir::family::ChalkIr>>; ) -> Arc<chalk_rust_ir::ImplDatum<chalk_ir::family::ChalkIr>>;
#[salsa::invoke(crate::ty::traits::chalk::associated_ty_value_query)] #[salsa::invoke(crate::ty::traits::chalk::associated_ty_value_query)]
fn associated_ty_value( fn associated_ty_value(
&self, &self,
krate: Crate, krate: CrateId,
id: chalk_rust_ir::AssociatedTyValueId, id: chalk_rust_ir::AssociatedTyValueId,
) -> Arc<chalk_rust_ir::AssociatedTyValue<chalk_ir::family::ChalkIr>>; ) -> Arc<chalk_rust_ir::AssociatedTyValue<chalk_ir::family::ChalkIr>>;
#[salsa::invoke(crate::ty::traits::trait_solve_query)] #[salsa::invoke(crate::ty::traits::trait_solve_query)]
fn trait_solve( fn trait_solve(
&self, &self,
krate: Crate, krate: CrateId,
goal: crate::ty::Canonical<crate::ty::InEnvironment<crate::ty::Obligation>>, goal: crate::ty::Canonical<crate::ty::InEnvironment<crate::ty::Obligation>>,
) -> Option<crate::ty::traits::Solution>; ) -> Option<crate::ty::traits::Solution>;
} }

13
crates/ra_hir/src/ty.rs
View file

@ -23,13 +23,12 @@ use hir_def::{
GenericDefId, HasModule, Lookup, TraitId, TypeAliasId, GenericDefId, HasModule, Lookup, TraitId, TypeAliasId,
}; };
use hir_expand::name::Name; use hir_expand::name::Name;
use ra_db::{impl_intern_key, salsa}; use ra_db::{impl_intern_key, salsa, CrateId};
use crate::{ use crate::{
db::HirDatabase, db::HirDatabase,
ty::primitive::{FloatTy, IntTy, Uncertain}, ty::primitive::{FloatTy, IntTy, Uncertain},
util::make_mut_slice, util::make_mut_slice,
Crate,
}; };
use display::{HirDisplay, HirFormatter}; use display::{HirDisplay, HirFormatter};
@ -162,7 +161,7 @@ impl TypeCtor {
} }
} }
pub fn krate(self, db: &impl HirDatabase) -> Option<Crate> { pub fn krate(self, db: &impl HirDatabase) -> Option<CrateId> {
match self { match self {
TypeCtor::Bool TypeCtor::Bool
| TypeCtor::Char | TypeCtor::Char
@ -178,11 +177,9 @@ impl TypeCtor {
| TypeCtor::Tuple { .. } => None, | TypeCtor::Tuple { .. } => None,
// Closure's krate is irrelevant for coherence I would think? // Closure's krate is irrelevant for coherence I would think?
TypeCtor::Closure { .. } => None, TypeCtor::Closure { .. } => None,
TypeCtor::Adt(adt) => Some(adt.module(db).krate.into()), TypeCtor::Adt(adt) => Some(adt.module(db).krate),
TypeCtor::FnDef(callable) => Some(callable.krate(db).into()), TypeCtor::FnDef(callable) => Some(callable.krate(db)),
TypeCtor::AssociatedType(type_alias) => { TypeCtor::AssociatedType(type_alias) => Some(type_alias.lookup(db).module(db).krate),
Some(type_alias.lookup(db).module(db).krate.into())
}
} }
} }

10
crates/ra_hir/src/ty/traits.rs
View file

@ -8,7 +8,7 @@ use ra_db::{impl_intern_key, salsa, CrateId};
use ra_prof::profile; use ra_prof::profile;
use rustc_hash::FxHashSet; use rustc_hash::FxHashSet;
use crate::{db::HirDatabase, Crate, ImplBlock, TypeAlias}; use crate::{db::HirDatabase, ImplBlock, TypeAlias};
use super::{Canonical, GenericPredicate, HirDisplay, ProjectionTy, TraitRef, Ty, TypeWalk}; use super::{Canonical, GenericPredicate, HirDisplay, ProjectionTy, TraitRef, Ty, TypeWalk};
@ -18,7 +18,7 @@ pub(crate) mod chalk;
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub struct TraitSolver { pub struct TraitSolver {
krate: Crate, krate: CrateId,
inner: Arc<Mutex<chalk_solve::Solver<ChalkIr>>>, inner: Arc<Mutex<chalk_solve::Solver<ChalkIr>>>,
} }
@ -60,12 +60,12 @@ const CHALK_SOLVER_MAX_SIZE: usize = 4;
#[derive(Debug, Copy, Clone)] #[derive(Debug, Copy, Clone)]
struct ChalkContext<'a, DB> { struct ChalkContext<'a, DB> {
db: &'a DB, db: &'a DB,
krate: Crate, krate: CrateId,
} }
pub(crate) fn trait_solver_query( pub(crate) fn trait_solver_query(
db: &(impl HirDatabase + salsa::Database), db: &(impl HirDatabase + salsa::Database),
krate: Crate, krate: CrateId,
) -> TraitSolver { ) -> TraitSolver {
db.salsa_runtime().report_untracked_read(); db.salsa_runtime().report_untracked_read();
// krate parameter is just so we cache a unique solver per crate // krate parameter is just so we cache a unique solver per crate
@ -176,7 +176,7 @@ impl TypeWalk for ProjectionPredicate {
/// Solve a trait goal using Chalk. /// Solve a trait goal using Chalk.
pub(crate) fn trait_solve_query( pub(crate) fn trait_solve_query(
db: &impl HirDatabase, db: &impl HirDatabase,
krate: Crate, krate: CrateId,
goal: Canonical<InEnvironment<Obligation>>, goal: Canonical<InEnvironment<Obligation>>,
) -> Option<Solution> { ) -> Option<Solution> {
let _p = profile("trait_solve_query"); let _p = profile("trait_solve_query");

35
crates/ra_hir/src/ty/traits/chalk.rs
View file

@ -8,6 +8,7 @@ use chalk_ir::{
TypeKindId, TypeName, UniverseIndex, TypeKindId, TypeName, UniverseIndex,
}; };
use chalk_rust_ir::{AssociatedTyDatum, AssociatedTyValue, ImplDatum, StructDatum, TraitDatum}; use chalk_rust_ir::{AssociatedTyDatum, AssociatedTyValue, ImplDatum, StructDatum, TraitDatum};
use ra_db::CrateId;
use hir_def::{ use hir_def::{
lang_item::LangItemTarget, AstItemDef, ContainerId, GenericDefId, Lookup, TraitId, TypeAliasId, lang_item::LangItemTarget, AstItemDef, ContainerId, GenericDefId, Lookup, TraitId, TypeAliasId,
@ -21,7 +22,7 @@ use crate::{
db::HirDatabase, db::HirDatabase,
ty::display::HirDisplay, ty::display::HirDisplay,
ty::{ApplicationTy, GenericPredicate, ProjectionTy, Substs, TraitRef, Ty, TypeCtor, TypeWalk}, ty::{ApplicationTy, GenericPredicate, ProjectionTy, Substs, TraitRef, Ty, TypeCtor, TypeWalk},
Crate, ImplBlock, TypeAlias, ImplBlock, TypeAlias,
}; };
/// This represents a trait whose name we could not resolve. /// This represents a trait whose name we could not resolve.
@ -448,7 +449,7 @@ where
let trait_: TraitId = from_chalk(self.db, trait_id); let trait_: TraitId = from_chalk(self.db, trait_id);
let mut result: Vec<_> = self let mut result: Vec<_> = self
.db .db
.impls_for_trait(self.krate.crate_id, trait_.into()) .impls_for_trait(self.krate, trait_.into())
.iter() .iter()
.copied() .copied()
.map(Impl::ImplBlock) .map(Impl::ImplBlock)
@ -487,7 +488,7 @@ where
&self, &self,
id: chalk_rust_ir::AssociatedTyValueId, id: chalk_rust_ir::AssociatedTyValueId,
) -> Arc<AssociatedTyValue<ChalkIr>> { ) -> Arc<AssociatedTyValue<ChalkIr>> {
self.db.associated_ty_value(self.krate, id) self.db.associated_ty_value(self.krate.into(), id)
} }
fn custom_clauses(&self) -> Vec<chalk_ir::ProgramClause<ChalkIr>> { fn custom_clauses(&self) -> Vec<chalk_ir::ProgramClause<ChalkIr>> {
vec![] vec![]
@ -528,7 +529,7 @@ pub(crate) fn associated_ty_data_query(
pub(crate) fn trait_datum_query( pub(crate) fn trait_datum_query(
db: &impl HirDatabase, db: &impl HirDatabase,
krate: Crate, krate: CrateId,
trait_id: chalk_ir::TraitId, trait_id: chalk_ir::TraitId,
) -> Arc<TraitDatum<ChalkIr>> { ) -> Arc<TraitDatum<ChalkIr>> {
debug!("trait_datum {:?}", trait_id); debug!("trait_datum {:?}", trait_id);
@ -557,7 +558,7 @@ pub(crate) fn trait_datum_query(
let bound_vars = Substs::bound_vars(&generic_params); let bound_vars = Substs::bound_vars(&generic_params);
let flags = chalk_rust_ir::TraitFlags { let flags = chalk_rust_ir::TraitFlags {
auto: trait_data.auto, auto: trait_data.auto,
upstream: trait_.module(db).krate != krate.crate_id, upstream: trait_.module(db).krate != krate,
non_enumerable: true, non_enumerable: true,
coinductive: false, // only relevant for Chalk testing coinductive: false, // only relevant for Chalk testing
// FIXME set these flags correctly // FIXME set these flags correctly
@ -579,7 +580,7 @@ pub(crate) fn trait_datum_query(
pub(crate) fn struct_datum_query( pub(crate) fn struct_datum_query(
db: &impl HirDatabase, db: &impl HirDatabase,
krate: Crate, krate: CrateId,
struct_id: chalk_ir::StructId, struct_id: chalk_ir::StructId,
) -> Arc<StructDatum<ChalkIr>> { ) -> Arc<StructDatum<ChalkIr>> {
debug!("struct_datum {:?}", struct_id); debug!("struct_datum {:?}", struct_id);
@ -611,7 +612,7 @@ pub(crate) fn struct_datum_query(
pub(crate) fn impl_datum_query( pub(crate) fn impl_datum_query(
db: &impl HirDatabase, db: &impl HirDatabase,
krate: Crate, krate: CrateId,
impl_id: ImplId, impl_id: ImplId,
) -> Arc<ImplDatum<ChalkIr>> { ) -> Arc<ImplDatum<ChalkIr>> {
let _p = ra_prof::profile("impl_datum"); let _p = ra_prof::profile("impl_datum");
@ -626,7 +627,7 @@ pub(crate) fn impl_datum_query(
fn impl_block_datum( fn impl_block_datum(
db: &impl HirDatabase, db: &impl HirDatabase,
krate: Crate, krate: CrateId,
impl_id: ImplId, impl_id: ImplId,
impl_block: ImplBlock, impl_block: ImplBlock,
) -> Option<Arc<ImplDatum<ChalkIr>>> { ) -> Option<Arc<ImplDatum<ChalkIr>>> {
@ -634,7 +635,7 @@ fn impl_block_datum(
let bound_vars = Substs::bound_vars(&generic_params); let bound_vars = Substs::bound_vars(&generic_params);
let trait_ref = impl_block.target_trait_ref(db)?.subst(&bound_vars); let trait_ref = impl_block.target_trait_ref(db)?.subst(&bound_vars);
let trait_ = trait_ref.trait_; let trait_ = trait_ref.trait_;
let impl_type = if impl_block.krate(db) == krate { let impl_type = if impl_block.krate(db).crate_id == krate {
chalk_rust_ir::ImplType::Local chalk_rust_ir::ImplType::Local
} else { } else {
chalk_rust_ir::ImplType::External chalk_rust_ir::ImplType::External
@ -698,7 +699,7 @@ fn invalid_impl_datum() -> Arc<ImplDatum<ChalkIr>> {
fn closure_fn_trait_impl_datum( fn closure_fn_trait_impl_datum(
db: &impl HirDatabase, db: &impl HirDatabase,
krate: Crate, krate: CrateId,
data: super::ClosureFnTraitImplData, data: super::ClosureFnTraitImplData,
) -> Option<Arc<ImplDatum<ChalkIr>>> { ) -> Option<Arc<ImplDatum<ChalkIr>>> {
// for some closure |X, Y| -> Z: // for some closure |X, Y| -> Z:
@ -755,7 +756,7 @@ fn closure_fn_trait_impl_datum(
pub(crate) fn associated_ty_value_query( pub(crate) fn associated_ty_value_query(
db: &impl HirDatabase, db: &impl HirDatabase,
krate: Crate, krate: CrateId,
id: chalk_rust_ir::AssociatedTyValueId, id: chalk_rust_ir::AssociatedTyValueId,
) -> Arc<chalk_rust_ir::AssociatedTyValue<ChalkIr>> { ) -> Arc<chalk_rust_ir::AssociatedTyValue<ChalkIr>> {
let data: AssocTyValue = from_chalk(db, id); let data: AssocTyValue = from_chalk(db, id);
@ -771,7 +772,7 @@ pub(crate) fn associated_ty_value_query(
fn type_alias_associated_ty_value( fn type_alias_associated_ty_value(
db: &impl HirDatabase, db: &impl HirDatabase,
_krate: Crate, _krate: CrateId,
type_alias: TypeAlias, type_alias: TypeAlias,
) -> Arc<AssociatedTyValue<ChalkIr>> { ) -> Arc<AssociatedTyValue<ChalkIr>> {
let impl_block = type_alias.impl_block(db).expect("assoc ty value should be in impl"); let impl_block = type_alias.impl_block(db).expect("assoc ty value should be in impl");
@ -798,7 +799,7 @@ fn type_alias_associated_ty_value(
fn closure_fn_trait_output_assoc_ty_value( fn closure_fn_trait_output_assoc_ty_value(
db: &impl HirDatabase, db: &impl HirDatabase,
krate: Crate, krate: CrateId,
data: super::ClosureFnTraitImplData, data: super::ClosureFnTraitImplData,
) -> Arc<AssociatedTyValue<ChalkIr>> { ) -> Arc<AssociatedTyValue<ChalkIr>> {
let impl_id = Impl::ClosureFnTraitImpl(data.clone()).to_chalk(db); let impl_id = Impl::ClosureFnTraitImpl(data.clone()).to_chalk(db);
@ -831,8 +832,12 @@ fn closure_fn_trait_output_assoc_ty_value(
Arc::new(value) Arc::new(value)
} }
fn get_fn_trait(db: &impl HirDatabase, krate: Crate, fn_trait: super::FnTrait) -> Option<TraitId> { fn get_fn_trait(
let target = db.lang_item(krate.crate_id, fn_trait.lang_item_name().into())?; db: &impl HirDatabase,
krate: CrateId,
fn_trait: super::FnTrait,
) -> Option<TraitId> {
let target = db.lang_item(krate, fn_trait.lang_item_name().into())?;
match target { match target {
LangItemTarget::TraitId(t) => Some(t), LangItemTarget::TraitId(t) => Some(t),
_ => None, _ => None,