use base_db::CrateId;
use chalk_ir::{cast::Cast, fold::Shift, interner::HasInterner, Mutability, Safety};
+use hir_def::generics::TypeOrConstParamData;
use hir_def::intern::Interned;
use hir_def::{
adt::StructKind,
path::{GenericArg, Path, PathSegment, PathSegments},
resolver::{HasResolver, Resolver, TypeNs},
type_ref::{TraitBoundModifier, TraitRef as HirTraitRef, TypeBound, TypeRef},
- AdtId, AssocItemId, ConstId, ConstParamId, EnumId, EnumVariantId, FunctionId, GenericDefId,
- HasModule, ImplId, ItemContainerId, LocalFieldId, Lookup, StaticId, StructId, TraitId,
- TypeAliasId, TypeParamId, UnionId, VariantId,
+ AdtId, AssocItemId, ConstId, EnumId, EnumVariantId, FunctionId, GenericDefId, HasModule,
+ ImplId, ItemContainerId, LocalFieldId, Lookup, StaticId, StructId, TraitId, TypeAliasId,
+ UnionId, VariantId,
};
+use hir_def::{ConstParamId, TypeOrConstParamId};
use hir_expand::{name::Name, ExpandResult};
use la_arena::ArenaMap;
use rustc_hash::FxHashSet;
use smallvec::SmallVec;
-use stdx::impl_from;
+use stdx::{impl_from, never};
use syntax::{ast, SmolStr};
use crate::all_super_traits;
pub fn lower_ty_ext(&self, type_ref: &TypeRef) -> (Ty, Option<TypeNs>) {
let mut res = None;
let ty = match type_ref {
- TypeRef::Never => TyKind::Never.intern(&Interner),
+ TypeRef::Never => TyKind::Never.intern(Interner),
TypeRef::Tuple(inner) => {
let inner_tys = inner.iter().map(|tr| self.lower_ty(tr));
- TyKind::Tuple(inner_tys.len(), Substitution::from_iter(&Interner, inner_tys))
- .intern(&Interner)
+ TyKind::Tuple(inner_tys.len(), Substitution::from_iter(Interner, inner_tys))
+ .intern(Interner)
}
TypeRef::Path(path) => {
let (ty, res_) = self.lower_path(path);
}
TypeRef::RawPtr(inner, mutability) => {
let inner_ty = self.lower_ty(inner);
- TyKind::Raw(lower_to_chalk_mutability(*mutability), inner_ty).intern(&Interner)
+ TyKind::Raw(lower_to_chalk_mutability(*mutability), inner_ty).intern(Interner)
}
TypeRef::Array(inner, len) => {
let inner_ty = self.lower_ty(inner);
let const_len = consteval::usize_const(len.as_usize());
- TyKind::Array(inner_ty, const_len).intern(&Interner)
+ TyKind::Array(inner_ty, const_len).intern(Interner)
}
TypeRef::Slice(inner) => {
let inner_ty = self.lower_ty(inner);
- TyKind::Slice(inner_ty).intern(&Interner)
+ TyKind::Slice(inner_ty).intern(Interner)
}
TypeRef::Reference(inner, _, mutability) => {
let inner_ty = self.lower_ty(inner);
let lifetime = static_lifetime();
TyKind::Ref(lower_to_chalk_mutability(*mutability), lifetime, inner_ty)
- .intern(&Interner)
+ .intern(Interner)
}
- TypeRef::Placeholder => TyKind::Error.intern(&Interner),
+ TypeRef::Placeholder => TyKind::Error.intern(Interner),
TypeRef::Fn(params, is_varargs) => {
let substs = self.with_shifted_in(DebruijnIndex::ONE, |ctx| {
- Substitution::from_iter(&Interner, params.iter().map(|tr| ctx.lower_ty(tr)))
+ Substitution::from_iter(Interner, params.iter().map(|(_, tr)| ctx.lower_ty(tr)))
});
TyKind::Function(FnPointer {
num_binders: 0, // FIXME lower `for<'a> fn()` correctly
sig: FnSig { abi: (), safety: Safety::Safe, variadic: *is_varargs },
substitution: FnSubst(substs),
})
- .intern(&Interner)
+ .intern(Interner)
}
TypeRef::DynTrait(bounds) => {
let self_ty =
- TyKind::BoundVar(BoundVar::new(DebruijnIndex::INNERMOST, 0)).intern(&Interner);
+ TyKind::BoundVar(BoundVar::new(DebruijnIndex::INNERMOST, 0)).intern(Interner);
let bounds = self.with_shifted_in(DebruijnIndex::ONE, |ctx| {
QuantifiedWhereClauses::from_iter(
- &Interner,
+ Interner,
bounds.iter().flat_map(|b| ctx.lower_type_bound(b, self_ty.clone(), false)),
)
});
let bounds = crate::make_only_type_binders(1, bounds);
- TyKind::Dyn(DynTy { bounds, lifetime: static_lifetime() }).intern(&Interner)
+ TyKind::Dyn(DynTy { bounds, lifetime: static_lifetime() }).intern(Interner)
}
TypeRef::ImplTrait(bounds) => {
match self.impl_trait_mode {
let opaque_ty_id = self.db.intern_impl_trait_id(impl_trait_id).into();
let generics = generics(self.db.upcast(), func.into());
let parameters = generics.bound_vars_subst(self.in_binders);
- TyKind::OpaqueType(opaque_ty_id, parameters).intern(&Interner)
+ TyKind::OpaqueType(opaque_ty_id, parameters).intern(Interner)
}
ImplTraitLoweringMode::Param => {
let idx = self.impl_trait_counter.get();
if let Some(def) = self.resolver.generic_def() {
let generics = generics(self.db.upcast(), def);
let param = generics
- .iter()
+ .type_iter()
.filter(|(_, data)| {
data.provenance == TypeParamProvenance::ArgumentImplTrait
})
.map_or(TyKind::Error, |(id, _)| {
TyKind::Placeholder(to_placeholder_idx(self.db, id))
});
- param.intern(&Interner)
+ param.intern(Interner)
} else {
- TyKind::Error.intern(&Interner)
+ TyKind::Error.intern(Interner)
}
}
ImplTraitLoweringMode::Variable => {
let idx = self.impl_trait_counter.get();
// FIXME we're probably doing something wrong here
self.impl_trait_counter.set(idx + count_impl_traits(type_ref) as u16);
- let (parent_params, self_params, list_params, _impl_trait_params) =
- if let Some(def) = self.resolver.generic_def() {
- let generics = generics(self.db.upcast(), def);
- generics.provenance_split()
- } else {
- (0, 0, 0, 0)
- };
+ let (
+ parent_params,
+ self_params,
+ list_params,
+ const_params,
+ _impl_trait_params,
+ ) = if let Some(def) = self.resolver.generic_def() {
+ let generics = generics(self.db.upcast(), def);
+ generics.provenance_split()
+ } else {
+ (0, 0, 0, 0, 0)
+ };
TyKind::BoundVar(BoundVar::new(
self.in_binders,
- idx as usize + parent_params + self_params + list_params,
+ idx as usize + parent_params + self_params + list_params + const_params,
))
- .intern(&Interner)
+ .intern(Interner)
}
ImplTraitLoweringMode::Disallowed => {
// FIXME: report error
- TyKind::Error.intern(&Interner)
+ TyKind::Error.intern(Interner)
}
}
}
if recursion_start {
*self.expander.borrow_mut() = None;
}
- ty.unwrap_or_else(|| TyKind::Error.intern(&Interner))
+ ty.unwrap_or_else(|| TyKind::Error.intern(Interner))
}
- TypeRef::Error => TyKind::Error.intern(&Interner),
+ TypeRef::Error => TyKind::Error.intern(Interner),
};
(ty, res)
}
/// This is only for `generic_predicates_for_param`, where we can't just
/// lower the self types of the predicates since that could lead to cycles.
/// So we just check here if the `type_ref` resolves to a generic param, and which.
- fn lower_ty_only_param(&self, type_ref: &TypeRef) -> Option<TypeParamId> {
+ fn lower_ty_only_param(&self, type_ref: &TypeRef) -> Option<TypeOrConstParamId> {
let path = match type_ref {
TypeRef::Path(path) => path,
_ => return None,
_ => return None,
};
match resolution {
- TypeNs::GenericParam(param_id) => Some(param_id),
+ TypeNs::GenericParam(param_id) => Some(param_id.into()),
_ => None,
}
}
}
_ => {
// FIXME report error (ambiguous associated type)
- (TyKind::Error.intern(&Interner), None)
+ (TyKind::Error.intern(Interner), None)
}
}
}
associated_ty_id: to_assoc_type_id(associated_ty),
substitution: trait_ref.substitution,
}))
- .intern(&Interner)
+ .intern(Interner)
}
None => {
// FIXME: report error (associated type not found)
- TyKind::Error.intern(&Interner)
+ TyKind::Error.intern(Interner)
}
}
}
0 => {
let self_ty = Some(
TyKind::BoundVar(BoundVar::new(DebruijnIndex::INNERMOST, 0))
- .intern(&Interner),
+ .intern(Interner),
);
let trait_ref = self.with_shifted_in(DebruijnIndex::ONE, |ctx| {
ctx.lower_trait_ref_from_resolved_path(
bounds: crate::make_only_type_binders(
1,
QuantifiedWhereClauses::from_iter(
- &Interner,
+ Interner,
Some(crate::wrap_empty_binders(WhereClause::Implemented(
trait_ref,
))),
),
lifetime: static_lifetime(),
};
- TyKind::Dyn(dyn_ty).intern(&Interner)
+ TyKind::Dyn(dyn_ty).intern(Interner)
}
_ => {
// FIXME report error (ambiguous associated type)
- TyKind::Error.intern(&Interner)
+ TyKind::Error.intern(Interner)
}
};
return (ty, None);
);
match self.type_param_mode {
TypeParamLoweringMode::Placeholder => {
- TyKind::Placeholder(to_placeholder_idx(self.db, param_id))
+ TyKind::Placeholder(to_placeholder_idx(self.db, param_id.into()))
}
TypeParamLoweringMode::Variable => {
- let idx = generics.param_idx(param_id).expect("matching generics");
+ let idx = generics.param_idx(param_id.into()).expect("matching generics");
TyKind::BoundVar(BoundVar::new(self.in_binders, idx))
}
}
- .intern(&Interner)
+ .intern(Interner)
}
TypeNs::SelfType(impl_id) => {
let generics = generics(self.db.upcast(), impl_id.into());
TypeParamLoweringMode::Placeholder => generics.type_params_subst(self.db),
TypeParamLoweringMode::Variable => generics.bound_vars_subst(self.in_binders),
};
- self.db.impl_self_ty(impl_id).substitute(&Interner, &substs)
+ self.db.impl_self_ty(impl_id).substitute(Interner, &substs)
}
TypeNs::AdtSelfType(adt) => {
let generics = generics(self.db.upcast(), adt.into());
TypeParamLoweringMode::Placeholder => generics.type_params_subst(self.db),
TypeParamLoweringMode::Variable => generics.bound_vars_subst(self.in_binders),
};
- self.db.ty(adt.into()).substitute(&Interner, &substs)
+ self.db.ty(adt.into()).substitute(Interner, &substs)
}
TypeNs::AdtId(it) => self.lower_path_inner(resolved_segment, it.into(), infer_args),
self.lower_path_inner(resolved_segment, it.into(), infer_args)
}
// FIXME: report error
- TypeNs::EnumVariantId(_) => return (TyKind::Error.intern(&Interner), None),
+ TypeNs::EnumVariantId(_) => return (TyKind::Error.intern(Interner), None),
};
self.lower_ty_relative_path(ty, Some(resolution), remaining_segments)
}
let (resolution, remaining_index) =
match self.resolver.resolve_path_in_type_ns(self.db.upcast(), path.mod_path()) {
Some(it) => it,
- None => return (TyKind::Error.intern(&Interner), None),
+ None => return (TyKind::Error.intern(Interner), None),
};
let (resolved_segment, remaining_segments) = match remaining_index {
None => (
}
fn select_associated_type(&self, res: Option<TypeNs>, segment: PathSegment<'_>) -> Ty {
- if let Some(res) = res {
- let ty = named_associated_type_shorthand_candidates(
- self.db,
- res,
- Some(segment.name.clone()),
- move |name, t, associated_ty| {
- if name == segment.name {
- let substs = match self.type_param_mode {
- TypeParamLoweringMode::Placeholder => {
- // if we're lowering to placeholders, we have to put
- // them in now
- let generics = generics(
- self.db.upcast(),
- self.resolver.generic_def().expect(
- "there should be generics if there's a generic param",
- ),
- );
- let s = generics.type_params_subst(self.db);
- s.apply(t.substitution.clone(), &Interner)
- }
- TypeParamLoweringMode::Variable => t.substitution.clone(),
- };
- // We need to shift in the bound vars, since
- // associated_type_shorthand_candidates does not do that
- let substs = substs.shifted_in_from(&Interner, self.in_binders);
- // FIXME handle type parameters on the segment
- Some(
- TyKind::Alias(AliasTy::Projection(ProjectionTy {
- associated_ty_id: to_assoc_type_id(associated_ty),
- substitution: substs,
- }))
- .intern(&Interner),
- )
- } else {
- None
- }
- },
- );
+ let (def, res) = match (self.resolver.generic_def(), res) {
+ (Some(def), Some(res)) => (def, res),
+ _ => return TyKind::Error.intern(Interner),
+ };
+ let ty = named_associated_type_shorthand_candidates(
+ self.db,
+ def,
+ res,
+ Some(segment.name.clone()),
+ move |name, t, associated_ty| {
+ if name == segment.name {
+ let substs = match self.type_param_mode {
+ TypeParamLoweringMode::Placeholder => {
+ // if we're lowering to placeholders, we have to put
+ // them in now
+ let generics = generics(
+ self.db.upcast(),
+ self.resolver
+ .generic_def()
+ .expect("there should be generics if there's a generic param"),
+ );
+ let s = generics.type_params_subst(self.db);
+ s.apply(t.substitution.clone(), Interner)
+ }
+ TypeParamLoweringMode::Variable => t.substitution.clone(),
+ };
+ // We need to shift in the bound vars, since
+ // associated_type_shorthand_candidates does not do that
+ let substs = substs.shifted_in_from(Interner, self.in_binders);
+ // FIXME handle type parameters on the segment
+ Some(
+ TyKind::Alias(AliasTy::Projection(ProjectionTy {
+ associated_ty_id: to_assoc_type_id(associated_ty),
+ substitution: substs,
+ }))
+ .intern(Interner),
+ )
+ } else {
+ None
+ }
+ },
+ );
- ty.unwrap_or_else(|| TyKind::Error.intern(&Interner))
- } else {
- TyKind::Error.intern(&Interner)
- }
+ ty.unwrap_or_else(|| TyKind::Error.intern(Interner))
}
fn lower_path_inner(
TyDefId::TypeAliasId(it) => Some(it.into()),
};
let substs = self.substs_from_path_segment(segment, generic_def, infer_args, None);
- self.db.ty(typeable).substitute(&Interner, &substs)
+ self.db.ty(typeable).substitute(Interner, &substs)
}
/// Collect generic arguments from a path into a `Substs`. See also
let mut substs = Vec::new();
let def_generics = def_generic.map(|def| generics(self.db.upcast(), def));
- let (parent_params, self_params, type_params, impl_trait_params) =
- def_generics.map_or((0, 0, 0, 0), |g| g.provenance_split());
- let total_len = parent_params + self_params + type_params + impl_trait_params;
+ let (parent_params, self_params, type_params, const_params, impl_trait_params) =
+ def_generics.map_or((0, 0, 0, 0, 0), |g| g.provenance_split());
+ let total_len =
+ parent_params + self_params + type_params + const_params + impl_trait_params;
- substs.extend(iter::repeat(TyKind::Error.intern(&Interner)).take(parent_params));
+ substs.extend(iter::repeat(TyKind::Error.intern(Interner)).take(parent_params));
let fill_self_params = || {
substs.extend(
explicit_self_ty
.into_iter()
- .chain(iter::repeat(TyKind::Error.intern(&Interner)))
+ .chain(iter::repeat(TyKind::Error.intern(Interner)))
.take(self_params),
)
};
for default_ty in defaults.iter().skip(substs.len()) {
// each default can depend on the previous parameters
- let substs_so_far = Substitution::from_iter(&Interner, substs.clone());
- substs.push(default_ty.clone().substitute(&Interner, &substs_so_far));
+ let substs_so_far = Substitution::from_iter(Interner, substs.clone());
+ substs.push(default_ty.clone().substitute(Interner, &substs_so_far));
}
}
}
// add placeholders for args that were not provided
// FIXME: emit diagnostics in contexts where this is not allowed
for _ in substs.len()..total_len {
- substs.push(TyKind::Error.intern(&Interner));
+ substs.push(TyKind::Error.intern(Interner));
}
assert_eq!(substs.len(), total_len);
- Substitution::from_iter(&Interner, substs)
+ Substitution::from_iter(Interner, substs)
}
fn lower_trait_ref_from_path(
| WherePredicate::TypeBound { target, bound } => {
let self_ty = match target {
WherePredicateTypeTarget::TypeRef(type_ref) => self.lower_ty(type_ref),
- WherePredicateTypeTarget::TypeParam(param_id) => {
+ WherePredicateTypeTarget::TypeOrConstParam(param_id) => {
let generic_def = self.resolver.generic_def().expect("generics in scope");
let generics = generics(self.db.upcast(), generic_def);
- let param_id =
- hir_def::TypeParamId { parent: generic_def, local_id: *param_id };
+ let param_id = hir_def::TypeOrConstParamId {
+ parent: generic_def,
+ local_id: *param_id,
+ };
let placeholder = to_placeholder_idx(self.db, param_id);
match self.type_param_mode {
TypeParamLoweringMode::Placeholder => TyKind::Placeholder(placeholder),
TyKind::BoundVar(BoundVar::new(DebruijnIndex::INNERMOST, idx))
}
}
- .intern(&Interner)
+ .intern(Interner)
}
};
self.lower_type_bound(bound, self_ty, ignore_bindings)
for bound in &binding.bounds {
preds.extend(self.lower_type_bound(
bound,
- TyKind::Alias(AliasTy::Projection(projection_ty.clone())).intern(&Interner),
+ TyKind::Alias(AliasTy::Projection(projection_ty.clone())).intern(Interner),
false,
));
}
func: FunctionId,
) -> ReturnTypeImplTrait {
cov_mark::hit!(lower_rpit);
- let self_ty =
- TyKind::BoundVar(BoundVar::new(DebruijnIndex::INNERMOST, 0)).intern(&Interner);
+ let self_ty = TyKind::BoundVar(BoundVar::new(DebruijnIndex::INNERMOST, 0)).intern(Interner);
let predicates = self.with_shifted_in(DebruijnIndex::ONE, |ctx| {
let mut predicates: Vec<_> = bounds
.iter()
let sized_clause = sized_trait.map(|trait_id| {
let clause = WhereClause::Implemented(TraitRef {
trait_id,
- substitution: Substitution::from1(&Interner, self_ty.clone()),
+ substitution: Substitution::from1(Interner, self_ty.clone()),
});
crate::wrap_empty_binders(clause)
});
pub fn associated_type_shorthand_candidates<R>(
db: &dyn HirDatabase,
+ def: GenericDefId,
res: TypeNs,
cb: impl FnMut(&Name, &TraitRef, TypeAliasId) -> Option<R>,
) -> Option<R> {
- named_associated_type_shorthand_candidates(db, res, None, cb)
+ named_associated_type_shorthand_candidates(db, def, res, None, cb)
}
fn named_associated_type_shorthand_candidates<R>(
db: &dyn HirDatabase,
+ // If the type parameter is defined in an impl and we're in a method, there
+ // might be additional where clauses to consider
+ def: GenericDefId,
res: TypeNs,
assoc_name: Option<Name>,
mut cb: impl FnMut(&Name, &TraitRef, TypeAliasId) -> Option<R>,
db.impl_trait(impl_id)?.into_value_and_skipped_binders().0,
),
TypeNs::GenericParam(param_id) => {
- let predicates = db.generic_predicates_for_param(param_id, assoc_name);
+ let predicates = db.generic_predicates_for_param(def, param_id.into(), assoc_name);
let res = predicates.iter().find_map(|pred| match pred.skip_binders().skip_binders() {
// FIXME: how to correctly handle higher-ranked bounds here?
WhereClause::Implemented(tr) => search(
tr.clone()
- .shifted_out_to(&Interner, DebruijnIndex::ONE)
+ .shifted_out_to(Interner, DebruijnIndex::ONE)
.expect("FIXME unexpected higher-ranked trait bound"),
),
_ => None,
return res;
}
// Handle `Self::Type` referring to own associated type in trait definitions
- if let GenericDefId::TraitId(trait_id) = param_id.parent {
+ if let GenericDefId::TraitId(trait_id) = param_id.parent() {
let generics = generics(db.upcast(), trait_id.into());
- if generics.params.types[param_id.local_id].provenance
- == TypeParamProvenance::TraitSelf
- {
+ if generics.params.tocs[param_id.local_id()].is_trait_self() {
let trait_ref = TyBuilder::trait_ref(db, trait_id)
.fill_with_bound_vars(DebruijnIndex::INNERMOST, 0)
.build();
/// these are fine: `T: Foo<U::Item>, U: Foo<()>`.
pub(crate) fn generic_predicates_for_param_query(
db: &dyn HirDatabase,
- param_id: TypeParamId,
+ def: GenericDefId,
+ param_id: TypeOrConstParamId,
assoc_name: Option<Name>,
) -> Arc<[Binders<QuantifiedWhereClause>]> {
- let resolver = param_id.parent.resolver(db.upcast());
+ let resolver = def.resolver(db.upcast());
let ctx =
TyLoweringContext::new(db, &resolver).with_type_param_mode(TypeParamLoweringMode::Variable);
- let generics = generics(db.upcast(), param_id.parent);
+ let generics = generics(db.upcast(), def);
let mut predicates: Vec<_> = resolver
.where_predicates_in_scope()
// we have to filter out all other predicates *first*, before attempting to lower them
| WherePredicate::TypeBound { target, bound, .. } => {
match target {
WherePredicateTypeTarget::TypeRef(type_ref) => {
- if ctx.lower_ty_only_param(type_ref) != Some(param_id) {
+ if ctx.lower_ty_only_param(type_ref) != Some(param_id.into()) {
return false;
}
}
- WherePredicateTypeTarget::TypeParam(local_id) => {
+ WherePredicateTypeTarget::TypeOrConstParam(local_id) => {
if *local_id != param_id.local_id {
return false;
}
pub(crate) fn generic_predicates_for_param_recover(
_db: &dyn HirDatabase,
_cycle: &[String],
- _param_id: &TypeParamId,
+ _def: &GenericDefId,
+ _param_id: &TypeOrConstParamId,
_assoc_name: &Option<Name>,
) -> Arc<[Binders<QuantifiedWhereClause>]> {
Arc::new([])
for pred in resolver.where_predicates_in_scope() {
for pred in ctx.lower_where_predicate(pred, false) {
if let WhereClause::Implemented(tr) = &pred.skip_binders() {
- traits_in_scope
- .push((tr.self_type_parameter(&Interner).clone(), tr.hir_trait_id()));
+ traits_in_scope.push((tr.self_type_parameter(Interner).clone(), tr.hir_trait_id()));
}
- let program_clause: chalk_ir::ProgramClause<Interner> = pred.cast(&Interner);
- clauses.push(program_clause.into_from_env_clause(&Interner));
+ let program_clause: chalk_ir::ProgramClause<Interner> = pred.cast(Interner);
+ clauses.push(program_clause.into_from_env_clause(Interner));
}
}
let substs = TyBuilder::type_params_subst(db, trait_id);
let trait_ref = TraitRef { trait_id: to_chalk_trait_id(trait_id), substitution: substs };
let pred = WhereClause::Implemented(trait_ref);
- let program_clause: chalk_ir::ProgramClause<Interner> = pred.cast(&Interner);
- clauses.push(program_clause.into_from_env_clause(&Interner));
+ let program_clause: chalk_ir::ProgramClause<Interner> = pred.cast(Interner);
+ clauses.push(program_clause.into_from_env_clause(Interner));
}
let subst = generics(db.upcast(), def).type_params_subst(db);
let explicitly_unsized_tys = ctx.unsized_types.into_inner();
let implicitly_sized_clauses =
implicitly_sized_clauses(db, def, &explicitly_unsized_tys, &subst, &resolver).map(|pred| {
- let program_clause: chalk_ir::ProgramClause<Interner> = pred.cast(&Interner);
- program_clause.into_from_env_clause(&Interner)
+ let program_clause: chalk_ir::ProgramClause<Interner> = pred.cast(Interner);
+ program_clause.into_from_env_clause(Interner)
});
clauses.extend(implicitly_sized_clauses);
let krate = def.module(db.upcast()).krate();
- let env = chalk_ir::Environment::new(&Interner).add_clauses(&Interner, clauses);
+ let env = chalk_ir::Environment::new(Interner).add_clauses(Interner, clauses);
Arc::new(TraitEnvironment { krate, traits_from_clauses: traits_in_scope, env })
}
resolver: &Resolver,
) -> impl Iterator<Item = WhereClause> + 'a {
let is_trait_def = matches!(def, GenericDefId::TraitId(..));
- let generic_args = &substitution.as_slice(&Interner)[is_trait_def as usize..];
+ let generic_args = &substitution.as_slice(Interner)[is_trait_def as usize..];
let sized_trait = resolver
.krate()
.and_then(|krate| db.lang_item(krate, SmolStr::new_inline("sized")))
sized_trait.into_iter().flat_map(move |sized_trait| {
let implicitly_sized_tys = generic_args
.iter()
- .filter_map(|generic_arg| generic_arg.ty(&Interner))
+ .filter_map(|generic_arg| generic_arg.ty(Interner))
.filter(move |&self_ty| !explicitly_unsized_tys.contains(self_ty));
implicitly_sized_tys.map(move |self_ty| {
WhereClause::Implemented(TraitRef {
trait_id: sized_trait,
- substitution: Substitution::from1(&Interner, self_ty.clone()),
+ substitution: Substitution::from1(Interner, self_ty.clone()),
})
})
})
let generic_params = generics(db.upcast(), def);
let defaults = generic_params
- .iter()
+ .toc_iter()
.enumerate()
.map(|(idx, (_, p))| {
+ let p = match p {
+ TypeOrConstParamData::TypeParamData(p) => p,
+ TypeOrConstParamData::ConstParamData(_) => {
+ // FIXME: here we should add const generic parameters
+ let ty = TyKind::Error.intern(Interner);
+ return crate::make_only_type_binders(idx, ty);
+ }
+ };
let mut ty =
- p.default.as_ref().map_or(TyKind::Error.intern(&Interner), |t| ctx.lower_ty(t));
+ p.default.as_ref().map_or(TyKind::Error.intern(Interner), |t| ctx.lower_ty(t));
// Each default can only refer to previous parameters.
ty = crate::fold_free_vars(ty, |bound, binders| {
// type variable default referring to parameter coming
// after it. This is forbidden (FIXME: report
// diagnostic)
- TyKind::Error.intern(&Interner)
+ TyKind::Error.intern(Interner)
} else {
- bound.shifted_in_from(binders).to_ty(&Interner)
+ bound.shifted_in_from(binders).to_ty(Interner)
}
});
// we still need one default per parameter
let defaults = generic_params
- .iter()
+ .toc_iter()
.enumerate()
.map(|(idx, _)| {
- let ty = TyKind::Error.intern(&Interner);
+ let ty = TyKind::Error.intern(Interner);
crate::make_only_type_binders(idx, ty)
})
let ctx_params = TyLoweringContext::new(db, &resolver)
.with_impl_trait_mode(ImplTraitLoweringMode::Variable)
.with_type_param_mode(TypeParamLoweringMode::Variable);
- let params = data.params.iter().map(|tr| ctx_params.lower_ty(tr)).collect::<Vec<_>>();
+ let params = data.params.iter().map(|(_, tr)| ctx_params.lower_ty(tr)).collect::<Vec<_>>();
let ctx_ret = TyLoweringContext::new(db, &resolver)
.with_impl_trait_mode(ImplTraitLoweringMode::Opaque)
.with_type_param_mode(TypeParamLoweringMode::Variable);
let substs = generics.bound_vars_subst(DebruijnIndex::INNERMOST);
make_binders(
&generics,
- TyKind::FnDef(CallableDefId::FunctionId(def).to_chalk(db), substs).intern(&Interner),
+ TyKind::FnDef(CallableDefId::FunctionId(def).to_chalk(db), substs).intern(Interner),
)
}
let resolver = def.resolver(db.upcast());
let ctx = TyLoweringContext::new(db, &resolver);
- Binders::empty(&Interner, ctx.lower_ty(&data.type_ref))
+ Binders::empty(Interner, ctx.lower_ty(&data.type_ref))
}
fn fn_sig_for_struct_constructor(db: &dyn HirDatabase, def: StructId) -> PolyFnSig {
let substs = generics.bound_vars_subst(DebruijnIndex::INNERMOST);
make_binders(
&generics,
- TyKind::FnDef(CallableDefId::StructId(def).to_chalk(db), substs).intern(&Interner),
+ TyKind::FnDef(CallableDefId::StructId(def).to_chalk(db), substs).intern(Interner),
)
}
let substs = generics.bound_vars_subst(DebruijnIndex::INNERMOST);
make_binders(
&generics,
- TyKind::FnDef(CallableDefId::EnumVariantId(def).to_chalk(db), substs).intern(&Interner),
+ TyKind::FnDef(CallableDefId::EnumVariantId(def).to_chalk(db), substs).intern(Interner),
)
}
let ctx =
TyLoweringContext::new(db, &resolver).with_type_param_mode(TypeParamLoweringMode::Variable);
if db.type_alias_data(t).is_extern {
- Binders::empty(&Interner, TyKind::Foreign(crate::to_foreign_def_id(t)).intern(&Interner))
+ Binders::empty(Interner, TyKind::Foreign(crate::to_foreign_def_id(t)).intern(Interner))
} else {
let type_ref = &db.type_alias_data(t).type_ref;
let inner = ctx.lower_ty(type_ref.as_deref().unwrap_or(&TypeRef::Error));
/// namespace.
pub(crate) fn ty_query(db: &dyn HirDatabase, def: TyDefId) -> Binders<Ty> {
match def {
- TyDefId::BuiltinType(it) => Binders::empty(&Interner, TyBuilder::builtin(it)),
+ TyDefId::BuiltinType(it) => Binders::empty(Interner, TyBuilder::builtin(it)),
TyDefId::AdtId(it) => type_for_adt(db, it),
TyDefId::TypeAliasId(it) => type_for_type_alias(db, it),
}
pub(crate) fn ty_recover(db: &dyn HirDatabase, _cycle: &[String], def: &TyDefId) -> Binders<Ty> {
let generics = match *def {
- TyDefId::BuiltinType(_) => {
- return Binders::empty(&Interner, TyKind::Error.intern(&Interner))
- }
+ TyDefId::BuiltinType(_) => return Binders::empty(Interner, TyKind::Error.intern(Interner)),
TyDefId::AdtId(it) => generics(db.upcast(), it.into()),
TyDefId::TypeAliasId(it) => generics(db.upcast(), it.into()),
};
- make_binders(&generics, TyKind::Error.intern(&Interner))
+ make_binders(&generics, TyKind::Error.intern(Interner))
}
pub(crate) fn value_ty_query(db: &dyn HirDatabase, def: ValueTyDefId) -> Binders<Ty> {
make_binders(&generics, ctx.lower_ty(&impl_data.self_ty))
}
+// returns None if def is a type arg
pub(crate) fn const_param_ty_query(db: &dyn HirDatabase, def: ConstParamId) -> Ty {
- let parent_data = db.generic_params(def.parent);
- let data = &parent_data.consts[def.local_id];
- let resolver = def.parent.resolver(db.upcast());
+ let parent_data = db.generic_params(def.parent());
+ let data = &parent_data.tocs[def.local_id()];
+ let resolver = def.parent().resolver(db.upcast());
let ctx = TyLoweringContext::new(db, &resolver);
-
- ctx.lower_ty(&data.ty)
+ match data {
+ TypeOrConstParamData::TypeParamData(_) => {
+ never!();
+ Ty::new(Interner, TyKind::Error)
+ }
+ TypeOrConstParamData::ConstParamData(d) => ctx.lower_ty(&d.ty),
+ }
}
pub(crate) fn impl_self_ty_recover(
impl_id: &ImplId,
) -> Binders<Ty> {
let generics = generics(db.upcast(), (*impl_id).into());
- make_binders(&generics, TyKind::Error.intern(&Interner))
+ make_binders(&generics, TyKind::Error.intern(Interner))
}
pub(crate) fn impl_trait_query(db: &dyn HirDatabase, impl_id: ImplId) -> Option<Binders<TraitRef>> {