Skip to content

Remove TargetInterner #648

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
merged 1 commit into from
Nov 5, 2020
Merged

Remove TargetInterner #648

Show file tree
Hide file tree
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
44 changes: 14 additions & 30 deletions chalk-derive/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,49 +277,33 @@ fn derive_fold(mut s: synstructure::Structure) -> TokenStream {

let type_name = &input.ident;

let (target_interner, result) = match kind {
DeriveKind::FromHasInternerAttr => (interner.clone(), quote! { #type_name }),
DeriveKind::FromHasInterner => {
let param = get_generic_param_name(input).unwrap();

s.add_impl_generic(parse_quote! { _U })
.add_impl_generic(parse_quote! { _TI })
.add_where_predicate(
parse_quote! { #param: ::chalk_ir::fold::Fold<#interner, _TI, Result = _U> },
)
.add_where_predicate(
parse_quote! { _U: ::chalk_ir::interner::HasInterner<Interner = _TI> },
)
.add_where_predicate(
parse_quote! { _TI: ::chalk_ir::interner::TargetInterner<#interner> },
);

(quote! { _TI }, quote! { #type_name<_U> })
}
DeriveKind::FromInterner => {
s.add_impl_generic(parse_quote! { _TI })
.add_where_predicate(
parse_quote! { _TI: ::chalk_ir::interner::TargetInterner<#interner> },
);

(quote! { _TI }, quote! { #type_name<_TI> })
}
let result = if kind == DeriveKind::FromHasInterner {
let param = get_generic_param_name(input).unwrap();
s.add_impl_generic(parse_quote! { _U })
.add_where_predicate(
parse_quote! { #param: ::chalk_ir::fold::Fold<#interner, Result = _U> },
)
.add_where_predicate(
parse_quote! { _U: ::chalk_ir::interner::HasInterner<Interner = #interner> },
);
quote! { #type_name <_U> }
} else {
quote! { #type_name < #interner > }
};

s.add_bounds(synstructure::AddBounds::None);
s.bound_impl(
quote!(::chalk_ir::fold::Fold<#interner, #target_interner>),
quote!(::chalk_ir::fold::Fold<#interner>),
quote! {
type Result = #result;

fn fold_with<'i>(
&self,
folder: &mut dyn ::chalk_ir::fold::Folder < 'i, #interner, #target_interner >,
folder: &mut dyn ::chalk_ir::fold::Folder < 'i, #interner >,
outer_binder: ::chalk_ir::DebruijnIndex,
) -> ::chalk_ir::Fallible<Self::Result>
where
#interner: 'i,
#target_interner: 'i,
{
Ok(match *self { #body })
}
Expand Down
2 changes: 1 addition & 1 deletion chalk-engine/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ use std::cmp::min;
use std::usize;

use chalk_derive::{Fold, HasInterner, Visit};
use chalk_ir::interner::{Interner, TargetInterner};
use chalk_ir::interner::Interner;
use chalk_ir::visit::VisitResult;
use chalk_ir::{
AnswerSubst, Canonical, ConstrainedSubst, Constraint, DebruijnIndex, Goal, InEnvironment,
Expand Down
4 changes: 0 additions & 4 deletions chalk-engine/src/normalize_deep.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,10 +97,6 @@ where
fn interner(&self) -> &'i I {
self.interner
}

fn target_interner(&self) -> &'i I {
self.interner()
}
}

#[cfg(test)]
Expand Down
Loading