Skip to content

Commit 30a339e

Browse files
flodieboldflodiebold
committed
Add Interner parameter to Binders::substitute
1 parent 05eba0d commit 30a339e

File tree

14 files changed

+52
-43
lines changed

14 files changed

+52
-43
lines changed

‎crates/hir/src/display.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ use hir_ty::display::{
99
write_bounds_like_dyn_trait_with_prefix, write_visibility, HirDisplay, HirDisplayError,
1010
HirFormatter,
1111
};
12+
use hir_ty::Interner;
1213
use syntax::ast::{self, NameOwner};
1314

1415
use crate::{
@@ -235,7 +236,8 @@ impl HirDisplay for TypeParam {
235236
write!(f, "{}", self.name(f.db))?;
236237
let bounds = f.db.generic_predicates_for_param(self.id);
237238
let substs = TyBuilder::type_params_subst(f.db, self.id.parent);
238-
let predicates = bounds.iter().cloned().map(|b| b.substitute(&substs)).collect::<Vec<_>>();
239+
let predicates =
240+
bounds.iter().cloned().map(|b| b.substitute(&Interner, &substs)).collect::<Vec<_>>();
239241
if !(predicates.is_empty() || f.omit_verbose_types()) {
240242
write_bounds_like_dyn_trait_with_prefix(":", &predicates, f)?;
241243
}

‎crates/hir/src/lib.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -516,7 +516,7 @@ impl Field {
516516
VariantDef::Variant(it) => it.parent.id.into(),
517517
};
518518
let substs = TyBuilder::type_params_subst(db, generic_def_id);
519-
let ty = db.field_types(var_id)[self.id].clone().substitute(&substs);
519+
let ty = db.field_types(var_id)[self.id].clone().substitute(&Interner, &substs);
520520
Type::new(db, self.parent.module(db).id.krate(), var_id, ty)
521521
}
522522

@@ -1503,7 +1503,7 @@ impl TypeParam {
15031503
let krate = self.id.parent.module(db.upcast()).krate();
15041504
let ty = params.get(local_idx)?.clone();
15051505
let subst = TyBuilder::type_params_subst(db, self.id.parent);
1506-
let ty = ty.substitute(&subst.prefix(local_idx));
1506+
let ty = ty.substitute(&Interner, &subst.prefix(local_idx));
15071507
Some(Type::new_with_resolver_inner(db, krate, &resolver, ty))
15081508
}
15091509
}
@@ -1916,7 +1916,7 @@ impl Type {
19161916
.iter()
19171917
.map(|(local_id, ty)| {
19181918
let def = Field { parent: variant_id.into(), id: local_id };
1919-
let ty = ty.clone().substitute(substs);
1919+
let ty = ty.clone().substitute(&Interner, substs);
19201920
(def, self.derived(ty))
19211921
})
19221922
.collect()

‎crates/hir/src/source_analyzer.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ use hir_def::{
2020
use hir_expand::{hygiene::Hygiene, name::AsName, HirFileId, InFile};
2121
use hir_ty::{
2222
diagnostics::{record_literal_missing_fields, record_pattern_missing_fields},
23-
InferenceResult, Substitution, TyLoweringContext,
23+
InferenceResult, Interner, Substitution, TyLoweringContext,
2424
};
2525
use syntax::{
2626
ast::{self, AstNode},
@@ -339,7 +339,7 @@ impl SourceAnalyzer {
339339
.into_iter()
340340
.map(|local_id| {
341341
let field = FieldId { parent: variant, local_id };
342-
let ty = field_types[local_id].clone().substitute(substs);
342+
let ty = field_types[local_id].clone().substitute(&Interner, substs);
343343
(field.into(), Type::new_with_resolver_inner(db, krate, &self.resolver, ty))
344344
})
345345
.collect()

‎crates/hir_ty/src/builder.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,8 @@ impl TyBuilder<hir_def::AdtId> {
139139
} else {
140140
// each default can depend on the previous parameters
141141
let subst_so_far = Substitution::intern(self.vec.clone());
142-
self.vec.push(default_ty.clone().substitute(&subst_so_far).cast(&Interner));
142+
self.vec
143+
.push(default_ty.clone().substitute(&Interner, &subst_so_far).cast(&Interner));
143144
}
144145
}
145146
self
@@ -200,7 +201,7 @@ impl<T: TypeWalk + HasInterner<Interner = Interner>> TyBuilder<Binders<T>> {
200201

201202
pub fn build(self) -> T {
202203
let (b, subst) = self.build_internal();
203-
b.substitute(&subst)
204+
b.substitute(&Interner, &subst)
204205
}
205206
}
206207

‎crates/hir_ty/src/display.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ impl HirDisplay for Ty {
352352
let data = (*datas)
353353
.as_ref()
354354
.map(|rpit| rpit.impl_traits[idx as usize].bounds.clone());
355-
let bounds = data.substitute(parameters);
355+
let bounds = data.substitute(&Interner, parameters);
356356
bounds.into_value_and_skipped_binders().0
357357
} else {
358358
Vec::new()
@@ -397,7 +397,7 @@ impl HirDisplay for Ty {
397397
}
398398
TyKind::FnDef(def, parameters) => {
399399
let def = from_chalk(f.db, *def);
400-
let sig = f.db.callable_item_signature(def).substitute(parameters);
400+
let sig = f.db.callable_item_signature(def).substitute(&Interner, parameters);
401401
match def {
402402
CallableDefId::FunctionId(ff) => {
403403
write!(f, "fn {}", f.db.function_data(ff).name)?
@@ -482,7 +482,7 @@ impl HirDisplay for Ty {
482482
(_, Some(default_parameter)) => {
483483
let actual_default = default_parameter
484484
.clone()
485-
.substitute(&parameters.prefix(i));
485+
.substitute(&Interner, &parameters.prefix(i));
486486
if parameter.assert_ty_ref(&Interner) != &actual_default
487487
{
488488
default_from = i + 1;
@@ -542,7 +542,7 @@ impl HirDisplay for Ty {
542542
let data = (*datas)
543543
.as_ref()
544544
.map(|rpit| rpit.impl_traits[idx as usize].bounds.clone());
545-
let bounds = data.substitute(&parameters);
545+
let bounds = data.substitute(&Interner, &parameters);
546546
write_bounds_like_dyn_trait_with_prefix("impl", bounds.skip_binders(), f)?;
547547
// FIXME: it would maybe be good to distinguish this from the alias type (when debug printing), and to show the substitution
548548
}
@@ -595,7 +595,7 @@ impl HirDisplay for Ty {
595595
let bounds =
596596
f.db.generic_predicates(id.parent)
597597
.into_iter()
598-
.map(|pred| pred.clone().substitute(&substs))
598+
.map(|pred| pred.clone().substitute(&Interner, &substs))
599599
.filter(|wc| match &wc.skip_binders() {
600600
WhereClause::Implemented(tr) => {
601601
tr.self_type_parameter(&Interner) == self
@@ -629,7 +629,7 @@ impl HirDisplay for Ty {
629629
let data = (*datas)
630630
.as_ref()
631631
.map(|rpit| rpit.impl_traits[idx as usize].bounds.clone());
632-
let bounds = data.substitute(&opaque_ty.substitution);
632+
let bounds = data.substitute(&Interner, &opaque_ty.substitution);
633633
write_bounds_like_dyn_trait_with_prefix("impl", bounds.skip_binders(), f)?;
634634
}
635635
ImplTraitId::AsyncBlockTypeImplTrait(..) => {

‎crates/hir_ty/src/infer.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -470,25 +470,25 @@ impl<'a> InferenceContext<'a> {
470470
TypeNs::AdtId(AdtId::StructId(strukt)) => {
471471
let substs = ctx.substs_from_path(path, strukt.into(), true);
472472
let ty = self.db.ty(strukt.into());
473-
let ty = self.insert_type_vars(ty.substitute(&substs));
473+
let ty = self.insert_type_vars(ty.substitute(&Interner, &substs));
474474
forbid_unresolved_segments((ty, Some(strukt.into())), unresolved)
475475
}
476476
TypeNs::AdtId(AdtId::UnionId(u)) => {
477477
let substs = ctx.substs_from_path(path, u.into(), true);
478478
let ty = self.db.ty(u.into());
479-
let ty = self.insert_type_vars(ty.substitute(&substs));
479+
let ty = self.insert_type_vars(ty.substitute(&Interner, &substs));
480480
forbid_unresolved_segments((ty, Some(u.into())), unresolved)
481481
}
482482
TypeNs::EnumVariantId(var) => {
483483
let substs = ctx.substs_from_path(path, var.into(), true);
484484
let ty = self.db.ty(var.parent.into());
485-
let ty = self.insert_type_vars(ty.substitute(&substs));
485+
let ty = self.insert_type_vars(ty.substitute(&Interner, &substs));
486486
forbid_unresolved_segments((ty, Some(var.into())), unresolved)
487487
}
488488
TypeNs::SelfType(impl_id) => {
489489
let generics = crate::utils::generics(self.db.upcast(), impl_id.into());
490490
let substs = generics.type_params_subst(self.db);
491-
let ty = self.db.impl_self_ty(impl_id).substitute(&substs);
491+
let ty = self.db.impl_self_ty(impl_id).substitute(&Interner, &substs);
492492
match unresolved {
493493
None => {
494494
let variant = ty_variant(&ty);

‎crates/hir_ty/src/infer/expr.rs

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,7 @@ impl<'a> InferenceContext<'a> {
419419
self.result.record_field_resolutions.insert(field.expr, field_def);
420420
}
421421
let field_ty = field_def.map_or(self.err_ty(), |it| {
422-
field_types[it.local_id].clone().substitute(&substs)
422+
field_types[it.local_id].clone().substitute(&Interner, &substs)
423423
});
424424
self.infer_expr_coerce(field.expr, &Expectation::has_type(field_ty));
425425
}
@@ -462,7 +462,7 @@ impl<'a> InferenceContext<'a> {
462462
Some(
463463
self.db.field_types((*s).into())[field.local_id]
464464
.clone()
465-
.substitute(&parameters),
465+
.substitute(&Interner, &parameters),
466466
)
467467
} else {
468468
None
@@ -476,7 +476,7 @@ impl<'a> InferenceContext<'a> {
476476
Some(
477477
self.db.field_types((*u).into())[field.local_id]
478478
.clone()
479-
.substitute(&parameters),
479+
.substitute(&Interner, &parameters),
480480
)
481481
} else {
482482
None
@@ -852,7 +852,7 @@ impl<'a> InferenceContext<'a> {
852852
None => (receiver_ty, Binders::empty(&Interner, self.err_ty()), None),
853853
};
854854
let substs = self.substs_for_method_call(def_generics, generic_args, &derefed_receiver_ty);
855-
let method_ty = method_ty.substitute(&substs);
855+
let method_ty = method_ty.substitute(&Interner, &substs);
856856
let method_ty = self.insert_type_vars(method_ty);
857857
self.register_obligations_for_call(&method_ty);
858858
let (expected_receiver_ty, param_tys, ret_ty) = match method_ty.callable_sig(self.db) {
@@ -949,8 +949,10 @@ impl<'a> InferenceContext<'a> {
949949
let def: CallableDefId = from_chalk(self.db, *fn_def);
950950
let generic_predicates = self.db.generic_predicates(def.into());
951951
for predicate in generic_predicates.iter() {
952-
let (predicate, binders) =
953-
predicate.clone().substitute(parameters).into_value_and_skipped_binders();
952+
let (predicate, binders) = predicate
953+
.clone()
954+
.substitute(&Interner, parameters)
955+
.into_value_and_skipped_binders();
954956
always!(binders.len(&Interner) == 0); // quantified where clauses not yet handled
955957
self.push_obligation(predicate.cast(&Interner));
956958
}

‎crates/hir_ty/src/infer/pat.rs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,9 @@ impl<'a> InferenceContext<'a> {
4949
let expected_ty = var_data
5050
.as_ref()
5151
.and_then(|d| d.field(&Name::new_tuple_field(i)))
52-
.map_or(self.err_ty(), |field| field_tys[field].clone().substitute(&substs));
52+
.map_or(self.err_ty(), |field| {
53+
field_tys[field].clone().substitute(&Interner, &substs)
54+
});
5355
let expected_ty = self.normalize_associated_types_in(expected_ty);
5456
self.infer_pat(subpat, &expected_ty, default_bm);
5557
}
@@ -83,8 +85,9 @@ impl<'a> InferenceContext<'a> {
8385
self.result.record_pat_field_resolutions.insert(subpat.pat, field_def);
8486
}
8587

86-
let expected_ty = matching_field
87-
.map_or(self.err_ty(), |field| field_tys[field].clone().substitute(&substs));
88+
let expected_ty = matching_field.map_or(self.err_ty(), |field| {
89+
field_tys[field].clone().substitute(&Interner, &substs)
90+
});
8891
let expected_ty = self.normalize_associated_types_in(expected_ty);
8992
self.infer_pat(subpat.pat, &expected_ty, default_bm);
9093
}

‎crates/hir_ty/src/infer/path.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,9 @@ impl<'a> InferenceContext<'a> {
8181
ValueNs::ImplSelf(impl_id) => {
8282
let generics = crate::utils::generics(self.db.upcast(), impl_id.into());
8383
let substs = generics.type_params_subst(self.db);
84-
let ty = self.db.impl_self_ty(impl_id).substitute(&substs);
84+
let ty = self.db.impl_self_ty(impl_id).substitute(&Interner, &substs);
8585
if let Some((AdtId::StructId(struct_id), substs)) = ty.as_adt() {
86-
let ty = self.db.value_ty(struct_id.into()).substitute(&substs);
86+
let ty = self.db.value_ty(struct_id.into()).substitute(&Interner, &substs);
8787
return Some(ty);
8888
} else {
8989
// FIXME: diagnostic, invalid Self reference
@@ -243,7 +243,8 @@ impl<'a> InferenceContext<'a> {
243243
let impl_substs = TyBuilder::subst_for_def(self.db, impl_id)
244244
.fill(iter::repeat_with(|| self.table.new_type_var()))
245245
.build();
246-
let impl_self_ty = self.db.impl_self_ty(impl_id).substitute(&impl_substs);
246+
let impl_self_ty =
247+
self.db.impl_self_ty(impl_id).substitute(&Interner, &impl_substs);
247248
self.unify(&impl_self_ty, &ty);
248249
Some(impl_substs)
249250
}

‎crates/hir_ty/src/lib.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -130,9 +130,9 @@ impl<T> Binders<T> {
130130

131131
impl<T: TypeWalk> Binders<T> {
132132
/// Substitutes all variables.
133-
pub fn substitute(self, subst: &Substitution) -> T {
133+
pub fn substitute(self, interner: &Interner, subst: &Substitution) -> T {
134134
let (value, binders) = self.into_value_and_skipped_binders();
135-
assert_eq!(subst.len(&Interner), binders.len(&Interner));
135+
assert_eq!(subst.len(interner), binders.len(interner));
136136
value.subst_bound_vars(subst)
137137
}
138138
}
@@ -362,7 +362,7 @@ impl Ty {
362362
TyKind::FnDef(def, parameters) => {
363363
let callable_def = db.lookup_intern_callable_def((*def).into());
364364
let sig = db.callable_item_signature(callable_def);
365-
Some(sig.substitute(&parameters))
365+
Some(sig.substitute(&Interner, &parameters))
366366
}
367367
TyKind::Closure(.., substs) => {
368368
let sig_param = substs.at(&Interner, 0).assert_ty_ref(&Interner);
@@ -436,7 +436,7 @@ impl Ty {
436436
let data = (*it)
437437
.as_ref()
438438
.map(|rpit| rpit.impl_traits[idx as usize].bounds.clone());
439-
data.substitute(&opaque_ty.substitution)
439+
data.substitute(&Interner, &opaque_ty.substitution)
440440
})
441441
}
442442
// It always has an parameter for Future::Output type.
@@ -455,7 +455,7 @@ impl Ty {
455455
let predicates = db
456456
.generic_predicates(id.parent)
457457
.into_iter()
458-
.map(|pred| pred.clone().substitute(&substs))
458+
.map(|pred| pred.clone().substitute(&Interner, &substs))
459459
.filter(|wc| match &wc.skip_binders() {
460460
WhereClause::Implemented(tr) => {
461461
tr.self_type_parameter(&Interner) == self

‎crates/hir_ty/src/lower.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -414,15 +414,15 @@ impl<'a> TyLoweringContext<'a> {
414414
TypeParamLoweringMode::Placeholder => generics.type_params_subst(self.db),
415415
TypeParamLoweringMode::Variable => generics.bound_vars_subst(self.in_binders),
416416
};
417-
self.db.impl_self_ty(impl_id).substitute(&substs)
417+
self.db.impl_self_ty(impl_id).substitute(&Interner, &substs)
418418
}
419419
TypeNs::AdtSelfType(adt) => {
420420
let generics = generics(self.db.upcast(), adt.into());
421421
let substs = match self.type_param_mode {
422422
TypeParamLoweringMode::Placeholder => generics.type_params_subst(self.db),
423423
TypeParamLoweringMode::Variable => generics.bound_vars_subst(self.in_binders),
424424
};
425-
self.db.ty(adt.into()).substitute(&substs)
425+
self.db.ty(adt.into()).substitute(&Interner, &substs)
426426
}
427427

428428
TypeNs::AdtId(it) => self.lower_path_inner(resolved_segment, it.into(), infer_args),
@@ -516,7 +516,7 @@ impl<'a> TyLoweringContext<'a> {
516516
TyDefId::TypeAliasId(it) => Some(it.into()),
517517
};
518518
let substs = self.substs_from_path_segment(segment, generic_def, infer_args, None);
519-
self.db.ty(typeable).substitute(&substs)
519+
self.db.ty(typeable).substitute(&Interner, &substs)
520520
}
521521

522522
/// Collect generic arguments from a path into a `Substs`. See also
@@ -620,7 +620,7 @@ impl<'a> TyLoweringContext<'a> {
620620
for default_ty in defaults.iter().skip(substs.len()) {
621621
// each default can depend on the previous parameters
622622
let substs_so_far = Substitution::from_iter(&Interner, substs.clone());
623-
substs.push(default_ty.clone().substitute(&substs_so_far));
623+
substs.push(default_ty.clone().substitute(&Interner, &substs_so_far));
624624
}
625625
}
626626
}

‎crates/hir_ty/src/method_resolution.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -712,7 +712,7 @@ pub(crate) fn inherent_impl_substs(
712712
let vars = TyBuilder::subst_for_def(db, impl_id)
713713
.fill_with_bound_vars(DebruijnIndex::INNERMOST, self_ty.binders.len(&Interner))
714714
.build();
715-
let self_ty_with_vars = db.impl_self_ty(impl_id).substitute(&vars);
715+
let self_ty_with_vars = db.impl_self_ty(impl_id).substitute(&Interner, &vars);
716716
let mut kinds = self_ty.binders.interned().to_vec();
717717
kinds.extend(
718718
iter::repeat(chalk_ir::WithKind::new(
@@ -774,7 +774,7 @@ fn transform_receiver_ty(
774774
AssocContainerId::ModuleId(_) => unreachable!(),
775775
};
776776
let sig = db.callable_item_signature(function_id.into());
777-
Some(sig.map(|s| s.params()[0].clone()).substitute(&substs))
777+
Some(sig.map(|s| s.params()[0].clone()).substitute(&Interner, &substs))
778778
}
779779

780780
pub fn implements_trait(

‎crates/hir_ty/src/traits/chalk/mapping.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -519,7 +519,7 @@ pub(super) fn convert_where_clauses(
519519
let generic_predicates = db.generic_predicates(def);
520520
let mut result = Vec::with_capacity(generic_predicates.len());
521521
for pred in generic_predicates.iter() {
522-
result.push(pred.clone().substitute(substs).to_chalk(db));
522+
result.push(pred.clone().substitute(&Interner, substs).to_chalk(db));
523523
}
524524
result
525525
}

‎crates/hir_ty/src/utils.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ fn direct_super_trait_refs(db: &dyn HirDatabase, trait_ref: &TraitRef) -> Vec<Tr
7272
_ => None,
7373
})
7474
})
75-
.map(|pred| pred.substitute(&trait_ref.substitution))
75+
.map(|pred| pred.substitute(&Interner, &trait_ref.substitution))
7676
.collect()
7777
}
7878

0 commit comments

Comments
 (0)