//! - Building the type for an item: This happens through the `type_for_def` query.
//!
//! This usually involves resolving names, collecting generic arguments etc.
+use std::cell::{Cell, RefCell};
use std::{iter, sync::Arc};
use base_db::CrateId;
-use chalk_ir::{cast::Cast, Mutability, Safety};
+use chalk_ir::{
+ cast::Cast, fold::Shift, interner::HasInterner, Mutability, Safety, Scalar, UintTy,
+};
use hir_def::{
adt::StructKind,
+ body::{Expander, LowerCtx},
builtin_type::BuiltinType,
generics::{TypeParamProvenance, WherePredicate, WherePredicateTypeTarget},
path::{GenericArg, Path, PathSegment, PathSegments},
GenericDefId, HasModule, ImplId, LocalFieldId, Lookup, StaticId, StructId, TraitId,
TypeAliasId, TypeParamId, UnionId, VariantId,
};
-use hir_expand::name::Name;
+use hir_expand::{name::Name, ExpandResult};
use la_arena::ArenaMap;
use smallvec::SmallVec;
use stdx::impl_from;
+use syntax::ast;
use crate::{
db::HirDatabase,
- to_assoc_type_id, to_chalk_trait_id, to_placeholder_idx,
- traits::chalk::{Interner, ToChalk},
+ mapping::ToChalk,
+ static_lifetime, to_assoc_type_id, to_chalk_trait_id, to_placeholder_idx,
utils::{
- all_super_trait_refs, associated_type_by_name_including_super_traits, generics,
- variant_data,
+ all_super_trait_refs, associated_type_by_name_including_super_traits, generics, Generics,
},
- AliasEq, AliasTy, Binders, BoundVar, CallableSig, DebruijnIndex, DynTy, FnPointer, FnSig,
- ImplTraitId, OpaqueTy, PolyFnSig, ProjectionTy, QuantifiedWhereClause, QuantifiedWhereClauses,
- ReturnTypeImplTrait, ReturnTypeImplTraits, Substitution, TraitEnvironment, TraitRef, Ty,
- TyKind, TypeWalk, WhereClause,
+ AliasEq, AliasTy, Binders, BoundVar, CallableSig, ConstData, ConstValue, DebruijnIndex, DynTy,
+ FnPointer, FnSig, FnSubst, ImplTraitId, Interner, OpaqueTy, PolyFnSig, ProjectionTy,
+ QuantifiedWhereClause, QuantifiedWhereClauses, ReturnTypeImplTrait, ReturnTypeImplTraits,
+ Substitution, TraitEnvironment, TraitRef, TraitRefExt, Ty, TyBuilder, TyKind, WhereClause,
};
#[derive(Debug)]
/// possible currently, so this should be fine for now.
pub type_param_mode: TypeParamLoweringMode,
pub impl_trait_mode: ImplTraitLoweringMode,
- impl_trait_counter: std::cell::Cell<u16>,
+ impl_trait_counter: Cell<u16>,
/// When turning `impl Trait` into opaque types, we have to collect the
/// bounds at the same time to get the IDs correct (without becoming too
/// complicated). I don't like using interior mutability (as for the
/// we're grouping the mutable data (the counter and this field) together
/// with the immutable context (the references to the DB and resolver).
/// Splitting this up would be a possible fix.
- opaque_type_data: std::cell::RefCell<Vec<ReturnTypeImplTrait>>,
+ opaque_type_data: RefCell<Vec<ReturnTypeImplTrait>>,
+ expander: RefCell<Option<Expander>>,
}
impl<'a> TyLoweringContext<'a> {
pub fn new(db: &'a dyn HirDatabase, resolver: &'a Resolver) -> Self {
- let impl_trait_counter = std::cell::Cell::new(0);
+ let impl_trait_counter = Cell::new(0);
let impl_trait_mode = ImplTraitLoweringMode::Disallowed;
let type_param_mode = TypeParamLoweringMode::Placeholder;
let in_binders = DebruijnIndex::INNERMOST;
- let opaque_type_data = std::cell::RefCell::new(Vec::new());
+ let opaque_type_data = RefCell::new(Vec::new());
Self {
db,
resolver,
impl_trait_counter,
type_param_mode,
opaque_type_data,
+ expander: RefCell::new(None),
}
}
f: impl FnOnce(&TyLoweringContext) -> T,
) -> T {
let opaque_ty_data_vec = self.opaque_type_data.replace(Vec::new());
+ let expander = self.expander.replace(None);
let new_ctx = Self {
in_binders: debruijn,
- impl_trait_counter: std::cell::Cell::new(self.impl_trait_counter.get()),
- opaque_type_data: std::cell::RefCell::new(opaque_ty_data_vec),
+ impl_trait_counter: Cell::new(self.impl_trait_counter.get()),
+ opaque_type_data: RefCell::new(opaque_ty_data_vec),
+ expander: RefCell::new(expander),
..*self
};
let result = f(&new_ctx);
self.impl_trait_counter.set(new_ctx.impl_trait_counter.get());
self.opaque_type_data.replace(new_ctx.opaque_type_data.into_inner());
+ self.expander.replace(new_ctx.expander.into_inner());
result
}
let inner_ty = self.lower_ty(inner);
TyKind::Raw(lower_to_chalk_mutability(*mutability), inner_ty).intern(&Interner)
}
- TypeRef::Array(inner) => {
+ TypeRef::Array(inner, len) => {
let inner_ty = self.lower_ty(inner);
- TyKind::Array(inner_ty).intern(&Interner)
+
+ let const_len = ConstData {
+ ty: TyKind::Scalar(Scalar::Uint(UintTy::Usize)).intern(&Interner),
+ value: ConstValue::Concrete(chalk_ir::ConcreteConst { interned: *len }),
+ }
+ .intern(&Interner);
+
+ TyKind::Array(inner_ty, const_len).intern(&Interner)
}
TypeRef::Slice(inner) => {
let inner_ty = self.lower_ty(inner);
}
TypeRef::Reference(inner, _, mutability) => {
let inner_ty = self.lower_ty(inner);
- TyKind::Ref(lower_to_chalk_mutability(*mutability), inner_ty).intern(&Interner)
+ let lifetime = static_lifetime();
+ TyKind::Ref(lower_to_chalk_mutability(*mutability), lifetime, inner_ty)
+ .intern(&Interner)
}
- TypeRef::Placeholder => TyKind::Unknown.intern(&Interner),
+ TypeRef::Placeholder => TyKind::Error.intern(&Interner),
TypeRef::Fn(params, is_varargs) => {
- let substs = Substitution(params.iter().map(|tr| self.lower_ty(tr)).collect());
+ let substs = self.with_shifted_in(DebruijnIndex::ONE, |ctx| {
+ Substitution::from_iter(&Interner, params.iter().map(|tr| ctx.lower_ty(tr)))
+ });
TyKind::Function(FnPointer {
- num_args: substs.len() - 1,
+ num_binders: 0, // FIXME lower `for<'a> fn()` correctly
sig: FnSig { abi: (), safety: Safety::Safe, variadic: *is_varargs },
- substs,
+ substitution: FnSubst(substs),
})
.intern(&Interner)
}
bounds.iter().flat_map(|b| ctx.lower_type_bound(b, self_ty.clone(), false)),
)
});
- let bounds = Binders::new(1, bounds);
- TyKind::Dyn(DynTy { bounds }).intern(&Interner)
+ let bounds = crate::make_only_type_binders(1, bounds);
+ TyKind::Dyn(DynTy { bounds, lifetime: static_lifetime() }).intern(&Interner)
}
TypeRef::ImplTrait(bounds) => {
match self.impl_trait_mode {
// this dance is to make sure the data is in the right
// place even if we encounter more opaque types while
// lowering the bounds
- self.opaque_type_data
- .borrow_mut()
- .push(ReturnTypeImplTrait { bounds: Binders::new(1, Vec::new()) });
+ self.opaque_type_data.borrow_mut().push(ReturnTypeImplTrait {
+ bounds: crate::make_only_type_binders(1, Vec::new()),
+ });
// We don't want to lower the bounds inside the binders
// we're currently in, because they don't end up inside
// those binders. E.g. when we have `impl Trait<impl
let impl_trait_id = ImplTraitId::ReturnTypeImplTrait(func, idx);
let opaque_ty_id = self.db.intern_impl_trait_id(impl_trait_id).into();
let generics = generics(self.db.upcast(), func.into());
- let parameters = Substitution::bound_vars(&generics, self.in_binders);
+ let parameters = generics.bound_vars_subst(self.in_binders);
TyKind::Alias(AliasTy::Opaque(OpaqueTy {
opaque_ty_id,
substitution: parameters,
data.provenance == TypeParamProvenance::ArgumentImplTrait
})
.nth(idx as usize)
- .map_or(TyKind::Unknown, |(id, _)| {
+ .map_or(TyKind::Error, |(id, _)| {
TyKind::Placeholder(to_placeholder_idx(self.db, id))
});
param.intern(&Interner)
} else {
- TyKind::Unknown.intern(&Interner)
+ TyKind::Error.intern(&Interner)
}
}
ImplTraitLoweringMode::Variable => {
}
ImplTraitLoweringMode::Disallowed => {
// FIXME: report error
- TyKind::Unknown.intern(&Interner)
+ TyKind::Error.intern(&Interner)
}
}
}
- TypeRef::Error => TyKind::Unknown.intern(&Interner),
+ TypeRef::Macro(macro_call) => {
+ let (expander, recursion_start) = {
+ let mut expander = self.expander.borrow_mut();
+ if expander.is_some() {
+ (Some(expander), false)
+ } else {
+ if let Some(module_id) = self.resolver.module() {
+ *expander = Some(Expander::new(
+ self.db.upcast(),
+ macro_call.file_id,
+ module_id,
+ ));
+ (Some(expander), true)
+ } else {
+ (None, false)
+ }
+ }
+ };
+ let ty = if let Some(mut expander) = expander {
+ let expander_mut = expander.as_mut().unwrap();
+ let macro_call = macro_call.to_node(self.db.upcast());
+ match expander_mut.enter_expand::<ast::Type>(self.db.upcast(), macro_call) {
+ Ok(ExpandResult { value: Some((mark, expanded)), .. }) => {
+ let ctx =
+ LowerCtx::new(self.db.upcast(), expander_mut.current_file_id());
+ let type_ref = TypeRef::from_ast(&ctx, expanded);
+
+ drop(expander);
+ let ty = self.lower_ty(&type_ref);
+
+ self.expander
+ .borrow_mut()
+ .as_mut()
+ .unwrap()
+ .exit(self.db.upcast(), mark);
+ Some(ty)
+ }
+ _ => None,
+ }
+ } else {
+ None
+ };
+ if recursion_start {
+ *self.expander.borrow_mut() = None;
+ }
+ ty.unwrap_or_else(|| TyKind::Error.intern(&Interner))
+ }
+ TypeRef::Error => TyKind::Error.intern(&Interner),
};
(ty, res)
}
(self.select_associated_type(res, segment), None)
} else if remaining_segments.len() > 1 {
// FIXME report error (ambiguous associated type)
- (TyKind::Unknown.intern(&Interner), None)
+ (TyKind::Error.intern(&Interner), None)
} else {
(ty, res)
}
self.lower_trait_ref_from_resolved_path(trait_, resolved_segment, self_ty);
let ty = if remaining_segments.len() == 1 {
let segment = remaining_segments.first().unwrap();
- let found = associated_type_by_name_including_super_traits(
- self.db,
- trait_ref,
- &segment.name,
- );
+ let found = self
+ .db
+ .trait_data(trait_ref.hir_trait_id())
+ .associated_type_by_name(&segment.name);
match found {
- Some((super_trait_ref, associated_ty)) => {
+ Some(associated_ty) => {
// FIXME handle type parameters on the segment
TyKind::Alias(AliasTy::Projection(ProjectionTy {
associated_ty_id: to_assoc_type_id(associated_ty),
- substitution: super_trait_ref.substitution,
+ substitution: trait_ref.substitution,
}))
.intern(&Interner)
}
None => {
// FIXME: report error (associated type not found)
- TyKind::Unknown.intern(&Interner)
+ TyKind::Error.intern(&Interner)
}
}
} else if remaining_segments.len() > 1 {
// FIXME report error (ambiguous associated type)
- TyKind::Unknown.intern(&Interner)
+ TyKind::Error.intern(&Interner)
} else {
let dyn_ty = DynTy {
- bounds: Binders::new(
+ bounds: crate::make_only_type_binders(
1,
QuantifiedWhereClauses::from_iter(
&Interner,
- Some(Binders::wrap_empty(WhereClause::Implemented(trait_ref))),
+ Some(crate::wrap_empty_binders(WhereClause::Implemented(
+ trait_ref,
+ ))),
),
),
+ lifetime: static_lifetime(),
};
TyKind::Dyn(dyn_ty).intern(&Interner)
};
TypeNs::SelfType(impl_id) => {
let generics = generics(self.db.upcast(), impl_id.into());
let substs = match self.type_param_mode {
- TypeParamLoweringMode::Placeholder => {
- Substitution::type_params_for_generics(self.db, &generics)
- }
- TypeParamLoweringMode::Variable => {
- Substitution::bound_vars(&generics, self.in_binders)
- }
+ TypeParamLoweringMode::Placeholder => generics.type_params_subst(self.db),
+ TypeParamLoweringMode::Variable => generics.bound_vars_subst(self.in_binders),
};
- self.db.impl_self_ty(impl_id).subst(&substs)
+ self.db.impl_self_ty(impl_id).substitute(&Interner, &substs)
}
TypeNs::AdtSelfType(adt) => {
let generics = generics(self.db.upcast(), adt.into());
let substs = match self.type_param_mode {
- TypeParamLoweringMode::Placeholder => {
- Substitution::type_params_for_generics(self.db, &generics)
- }
- TypeParamLoweringMode::Variable => {
- Substitution::bound_vars(&generics, self.in_binders)
- }
+ TypeParamLoweringMode::Placeholder => generics.type_params_subst(self.db),
+ TypeParamLoweringMode::Variable => generics.bound_vars_subst(self.in_binders),
};
- self.db.ty(adt.into()).subst(&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::Unknown.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::Unknown.intern(&Interner), None),
+ None => return (TyKind::Error.intern(&Interner), None),
};
let (resolved_segment, remaining_segments) = match remaining_index {
None => (
TypeParamLoweringMode::Placeholder => {
// if we're lowering to placeholders, we have to put
// them in now
- let s = Substitution::type_params(
- self.db,
+ let generics = generics(
+ self.db.upcast(),
self.resolver.generic_def().expect(
"there should be generics if there's a generic param",
),
);
- t.substitution.clone().subst_bound_vars(&s)
+ 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.shift_bound_vars(self.in_binders);
+ let substs = substs.shifted_in_from(&Interner, self.in_binders);
// FIXME handle type parameters on the segment
return Some(
TyKind::Alias(AliasTy::Projection(ProjectionTy {
},
);
- ty.unwrap_or(TyKind::Unknown.intern(&Interner))
+ ty.unwrap_or(TyKind::Error.intern(&Interner))
} else {
- TyKind::Unknown.intern(&Interner)
+ TyKind::Error.intern(&Interner)
}
}
TyDefId::TypeAliasId(it) => Some(it.into()),
};
let substs = self.substs_from_path_segment(segment, generic_def, infer_args, None);
- self.db.ty(typeable).subst(&substs)
+ self.db.ty(typeable).substitute(&Interner, &substs)
}
/// Collect generic arguments from a path into a `Substs`. See also
def_generics.map_or((0, 0, 0, 0), |g| g.provenance_split());
let total_len = parent_params + self_params + type_params + impl_trait_params;
- substs.extend(iter::repeat(TyKind::Unknown.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::Unknown.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(substs.clone().into());
- substs.push(default_ty.clone().subst(&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::Unknown.intern(&Interner));
+ substs.push(TyKind::Error.intern(&Interner));
}
assert_eq!(substs.len(), total_len);
- Substitution(substs.into())
+ Substitution::from_iter(&Interner, substs)
}
fn lower_trait_ref_from_path(
let trait_ref = match bound {
TypeBound::Path(path) => {
bindings = self.lower_trait_ref_from_path(path, Some(self_ty));
- bindings.clone().map(WhereClause::Implemented).map(|b| Binders::wrap_empty(b))
+ bindings.clone().map(WhereClause::Implemented).map(|b| crate::wrap_empty_binders(b))
}
TypeBound::Lifetime(_) => None,
TypeBound::Error => None,
let ty = self.lower_ty(type_ref);
let alias_eq =
AliasEq { alias: AliasTy::Projection(projection_ty.clone()), ty };
- preds.push(Binders::wrap_empty(WhereClause::AliasEq(alias_eq)));
+ preds.push(crate::wrap_empty_binders(WhereClause::AliasEq(alias_eq)));
}
for bound in &binding.bounds {
preds.extend(self.lower_type_bound(
let predicates = self.with_shifted_in(DebruijnIndex::ONE, |ctx| {
bounds.iter().flat_map(|b| ctx.lower_type_bound(b, self_ty.clone(), false)).collect()
});
- ReturnTypeImplTrait { bounds: Binders::new(1, predicates) }
+ ReturnTypeImplTrait { bounds: crate::make_only_type_binders(1, predicates) }
}
}
};
match res {
- // FIXME: how to correctly handle higher-ranked bounds here?
- TypeNs::SelfType(impl_id) => {
- search(db.impl_trait(impl_id)?.value.shift_bound_vars_out(DebruijnIndex::ONE))
- }
+ TypeNs::SelfType(impl_id) => search(
+ // we're _in_ the impl -- the binders get added back later. Correct,
+ // but it would be nice to make this more explicit
+ db.impl_trait(impl_id)?.into_value_and_skipped_binders().0,
+ ),
TypeNs::GenericParam(param_id) => {
let predicates = db.generic_predicates_for_param(param_id);
- let res = predicates.iter().find_map(|pred| match &pred.value.value {
+ 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().shift_bound_vars_out(DebruijnIndex::ONE))
- }
+ WhereClause::Implemented(tr) => search(
+ tr.clone()
+ .shifted_out_to(&Interner, DebruijnIndex::ONE)
+ .expect("FIXME unexpected higher-ranked trait bound"),
+ ),
_ => None,
});
if let res @ Some(_) = res {
if generics.params.types[param_id.local_id].provenance
== TypeParamProvenance::TraitSelf
{
- let trait_ref = TraitRef {
- trait_id: to_chalk_trait_id(trait_id),
- substitution: Substitution::bound_vars(&generics, DebruijnIndex::INNERMOST),
- };
+ let trait_ref = TyBuilder::trait_ref(db, trait_id)
+ .fill_with_bound_vars(DebruijnIndex::INNERMOST, 0)
+ .build();
return search(trait_ref);
}
}
db: &dyn HirDatabase,
variant_id: VariantId,
) -> Arc<ArenaMap<LocalFieldId, Binders<Ty>>> {
- let var_data = variant_data(db.upcast(), variant_id);
+ let var_data = variant_id.variant_data(db.upcast());
let (resolver, def): (_, GenericDefId) = match variant_id {
VariantId::StructId(it) => (it.resolver(db.upcast()), it.into()),
VariantId::UnionId(it) => (it.resolver(db.upcast()), it.into()),
let ctx =
TyLoweringContext::new(db, &resolver).with_type_param_mode(TypeParamLoweringMode::Variable);
for (field_id, field_data) in var_data.fields().iter() {
- res.insert(field_id, Binders::new(generics.len(), ctx.lower_ty(&field_data.type_ref)))
+ res.insert(field_id, make_binders(&generics, ctx.lower_ty(&field_data.type_ref)))
}
Arc::new(res)
}
},
WherePredicate::Lifetime { .. } => false,
})
- .flat_map(|pred| {
- ctx.lower_where_predicate(pred, true).map(|p| Binders::new(generics.len(), p))
- })
+ .flat_map(|pred| ctx.lower_where_predicate(pred, true).map(|p| make_binders(&generics, p)))
.collect()
}
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().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.clone().to_chalk(db).cast(&Interner);
+ let program_clause: chalk_ir::ProgramClause<Interner> = pred.clone().cast(&Interner);
clauses.push(program_clause.into_from_env_clause(&Interner));
}
}
// function default implementations (and hypothetical code
// inside consts or type aliases)
cov_mark::hit!(trait_self_implements_self);
- let substs = Substitution::type_params(db, trait_id);
+ 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.to_chalk(db).cast(&Interner);
+ let program_clause: chalk_ir::ProgramClause<Interner> = pred.cast(&Interner);
clauses.push(program_clause.into_from_env_clause(&Interner));
}
let generics = generics(db.upcast(), def);
resolver
.where_predicates_in_scope()
- .flat_map(|pred| {
- ctx.lower_where_predicate(pred, false).map(|p| Binders::new(generics.len(), p))
- })
+ .flat_map(|pred| ctx.lower_where_predicate(pred, false).map(|p| make_binders(&generics, p)))
.collect()
}
.enumerate()
.map(|(idx, (_, p))| {
let mut ty =
- p.default.as_ref().map_or(TyKind::Unknown.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.walk_mut_binders(
- &mut |ty, binders| match ty.interned_mut() {
- TyKind::BoundVar(BoundVar { debruijn, index }) if *debruijn == binders => {
- if *index >= idx {
- // type variable default referring to parameter coming
- // after it. This is forbidden (FIXME: report
- // diagnostic)
- *ty = TyKind::Unknown.intern(&Interner);
- }
- }
- _ => {}
- },
- DebruijnIndex::INNERMOST,
- );
+ ty = crate::fold_free_vars(ty, |bound, binders| {
+ if bound.index >= idx && bound.debruijn == DebruijnIndex::INNERMOST {
+ // type variable default referring to parameter coming
+ // after it. This is forbidden (FIXME: report
+ // diagnostic)
+ TyKind::Error.intern(&Interner)
+ } else {
+ bound.shifted_in_from(binders).to_ty(&Interner)
+ }
+ });
- Binders::new(idx, ty)
+ crate::make_only_type_binders(idx, ty)
+ })
+ .collect();
+
+ defaults
+}
+
+pub(crate) fn generic_defaults_recover(
+ db: &dyn HirDatabase,
+ _cycle: &[String],
+ def: &GenericDefId,
+) -> Arc<[Binders<Ty>]> {
+ let generic_params = generics(db.upcast(), *def);
+
+ // we still need one default per parameter
+ let defaults = generic_params
+ .iter()
+ .enumerate()
+ .map(|(idx, _)| {
+ let ty = TyKind::Error.intern(&Interner);
+
+ crate::make_only_type_binders(idx, ty)
})
.collect();
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 ret = (&ctx_ret).lower_ty(&data.ret_type);
+ let ret = ctx_ret.lower_ty(&data.ret_type);
let generics = generics(db.upcast(), def.into());
- let num_binders = generics.len();
- Binders::new(num_binders, CallableSig::from_params_and_return(params, ret, data.is_varargs))
+ make_binders(&generics, CallableSig::from_params_and_return(params, ret, data.is_varargs()))
}
/// Build the declared type of a function. This should not need to look at the
/// function body.
fn type_for_fn(db: &dyn HirDatabase, def: FunctionId) -> Binders<Ty> {
let generics = generics(db.upcast(), def.into());
- let substs = Substitution::bound_vars(&generics, DebruijnIndex::INNERMOST);
- Binders::new(
- substs.len(),
+ let substs = generics.bound_vars_subst(DebruijnIndex::INNERMOST);
+ make_binders(
+ &generics,
TyKind::FnDef(CallableDefId::FunctionId(def).to_chalk(db), substs).intern(&Interner),
)
}
let ctx =
TyLoweringContext::new(db, &resolver).with_type_param_mode(TypeParamLoweringMode::Variable);
- Binders::new(generics.len(), ctx.lower_ty(&data.type_ref))
+ make_binders(&generics, ctx.lower_ty(&data.type_ref))
}
/// Build the declared type of a static.
let resolver = def.resolver(db.upcast());
let ctx = TyLoweringContext::new(db, &resolver);
- Binders::new(0, 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 ctx =
TyLoweringContext::new(db, &resolver).with_type_param_mode(TypeParamLoweringMode::Variable);
let params = fields.iter().map(|(_, field)| ctx.lower_ty(&field.type_ref)).collect::<Vec<_>>();
- let ret = type_for_adt(db, def.into());
- Binders::new(ret.num_binders, CallableSig::from_params_and_return(params, ret.value, false))
+ let (ret, binders) = type_for_adt(db, def.into()).into_value_and_skipped_binders();
+ Binders::new(binders, CallableSig::from_params_and_return(params, ret, false))
}
/// Build the type of a tuple struct constructor.
return type_for_adt(db, def.into());
}
let generics = generics(db.upcast(), def.into());
- let substs = Substitution::bound_vars(&generics, DebruijnIndex::INNERMOST);
- Binders::new(
- substs.len(),
+ let substs = generics.bound_vars_subst(DebruijnIndex::INNERMOST);
+ make_binders(
+ &generics,
TyKind::FnDef(CallableDefId::StructId(def).to_chalk(db), substs).intern(&Interner),
)
}
let ctx =
TyLoweringContext::new(db, &resolver).with_type_param_mode(TypeParamLoweringMode::Variable);
let params = fields.iter().map(|(_, field)| ctx.lower_ty(&field.type_ref)).collect::<Vec<_>>();
- let ret = type_for_adt(db, def.parent.into());
- Binders::new(ret.num_binders, CallableSig::from_params_and_return(params, ret.value, false))
+ let (ret, binders) = type_for_adt(db, def.parent.into()).into_value_and_skipped_binders();
+ Binders::new(binders, CallableSig::from_params_and_return(params, ret, false))
}
/// Build the type of a tuple enum variant constructor.
return type_for_adt(db, def.parent.into());
}
let generics = generics(db.upcast(), def.parent.into());
- let substs = Substitution::bound_vars(&generics, DebruijnIndex::INNERMOST);
- Binders::new(
- substs.len(),
+ let substs = generics.bound_vars_subst(DebruijnIndex::INNERMOST);
+ make_binders(
+ &generics,
TyKind::FnDef(CallableDefId::EnumVariantId(def).to_chalk(db), substs).intern(&Interner),
)
}
fn type_for_adt(db: &dyn HirDatabase, adt: AdtId) -> Binders<Ty> {
let generics = generics(db.upcast(), adt.into());
- let substs = Substitution::bound_vars(&generics, DebruijnIndex::INNERMOST);
- Binders::new(substs.len(), Ty::adt_ty(adt, substs))
+ let b = TyBuilder::adt(db, adt);
+ let ty = b.fill_with_bound_vars(DebruijnIndex::INNERMOST, 0).build();
+ make_binders(&generics, ty)
}
fn type_for_type_alias(db: &dyn HirDatabase, t: TypeAliasId) -> Binders<Ty> {
let ctx =
TyLoweringContext::new(db, &resolver).with_type_param_mode(TypeParamLoweringMode::Variable);
if db.type_alias_data(t).is_extern {
- Binders::new(0, TyKind::ForeignType(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_ref().unwrap_or(&TypeRef::Error));
- Binders::new(generics.len(), inner)
+ let inner = ctx.lower_ty(type_ref.as_deref().unwrap_or(&TypeRef::Error));
+ make_binders(&generics, inner)
}
}
/// namespace.
pub(crate) fn ty_query(db: &dyn HirDatabase, def: TyDefId) -> Binders<Ty> {
match def {
- TyDefId::BuiltinType(it) => Binders::new(0, Ty::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 num_binders = match *def {
- TyDefId::BuiltinType(_) => 0,
- TyDefId::AdtId(it) => generics(db.upcast(), it.into()).len(),
- TyDefId::TypeAliasId(it) => generics(db.upcast(), it.into()).len(),
+ let generics = match *def {
+ 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()),
};
- Binders::new(num_binders, TyKind::Unknown.intern(&Interner))
+ make_binders(&generics, TyKind::Error.intern(&Interner))
}
pub(crate) fn value_ty_query(db: &dyn HirDatabase, def: ValueTyDefId) -> Binders<Ty> {
let generics = generics(db.upcast(), impl_id.into());
let ctx =
TyLoweringContext::new(db, &resolver).with_type_param_mode(TypeParamLoweringMode::Variable);
- Binders::new(generics.len(), ctx.lower_ty(&impl_data.self_ty))
+ make_binders(&generics, ctx.lower_ty(&impl_data.self_ty))
}
pub(crate) fn const_param_ty_query(db: &dyn HirDatabase, def: ConstParamId) -> Ty {
impl_id: &ImplId,
) -> Binders<Ty> {
let generics = generics(db.upcast(), (*impl_id).into());
- Binders::new(generics.len(), TyKind::Unknown.intern(&Interner))
+ make_binders(&generics, TyKind::Error.intern(&Interner))
}
pub(crate) fn impl_trait_query(db: &dyn HirDatabase, impl_id: ImplId) -> Option<Binders<TraitRef>> {
let resolver = impl_id.resolver(db.upcast());
let ctx =
TyLoweringContext::new(db, &resolver).with_type_param_mode(TypeParamLoweringMode::Variable);
- let self_ty = db.impl_self_ty(impl_id);
+ let (self_ty, binders) = db.impl_self_ty(impl_id).into_value_and_skipped_binders();
let target_trait = impl_data.target_trait.as_ref()?;
- Some(Binders::new(self_ty.num_binders, ctx.lower_trait_ref(target_trait, Some(self_ty.value))?))
+ Some(Binders::new(binders, ctx.lower_trait_ref(target_trait, Some(self_ty))?))
}
pub(crate) fn return_type_impl_traits(
.with_type_param_mode(TypeParamLoweringMode::Variable);
let _ret = (&ctx_ret).lower_ty(&data.ret_type);
let generics = generics(db.upcast(), def.into());
- let num_binders = generics.len();
let return_type_impl_traits =
ReturnTypeImplTraits { impl_traits: ctx_ret.opaque_type_data.into_inner() };
if return_type_impl_traits.impl_traits.is_empty() {
None
} else {
- Some(Arc::new(Binders::new(num_binders, return_type_impl_traits)))
+ Some(Arc::new(make_binders(&generics, return_type_impl_traits)))
}
}
hir_def::type_ref::Mutability::Mut => Mutability::Mut,
}
}
+
+fn make_binders<T: HasInterner<Interner = Interner>>(generics: &Generics, value: T) -> Binders<T> {
+ crate::make_only_type_binders(generics.len(), value)
+}
projects / rust.git / blobdiff