Skip to content

Add missing fold_free_var_const #756

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bors merged 1 commit into from
Mar 12, 2022
Merged

Add missing fold_free_var_const #756

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 22 additions & 2 deletions chalk-solve/src/clauses/generalize.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
use chalk_ir::{
fold::{Fold, Folder},
interner::{HasInterner, Interner},
Binders, BoundVar, DebruijnIndex, Fallible, Lifetime, LifetimeData, NoSolution, Ty, TyKind,
TyVariableKind, VariableKind, VariableKinds,
Binders, BoundVar, Const, ConstData, ConstValue, DebruijnIndex, Fallible, Lifetime,
LifetimeData, NoSolution, Ty, TyKind, TyVariableKind, VariableKind, VariableKinds,
};
use rustc_hash::FxHashMap;

Expand Down Expand Up @@ -63,6 +63,26 @@ impl<I: Interner> Folder<I> for Generalize<I> {
Ok(TyKind::BoundVar(new_var).intern(self.interner()))
}

fn fold_free_var_const(
&mut self,
ty: Ty<I>,
bound_var: BoundVar,
outer_binder: DebruijnIndex,
) -> Fallible<Const<I>> {
let binder_vec = &mut self.binders;
let new_index = self.mapping.entry(bound_var).or_insert_with(|| {
let i = binder_vec.len();
binder_vec.push(VariableKind::Const(ty.clone()));
i
});
let new_var = BoundVar::new(outer_binder, *new_index);
Ok(ConstData {
ty,
value: ConstValue::BoundVar(new_var),
}
.intern(self.interner()))
}

fn fold_free_var_lifetime(
&mut self,
bound_var: BoundVar,
Expand Down