Skip to content
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

fix: error on trait impl generics count mismatch #5582

Merged
merged 5 commits into from
Jul 23, 2024
Merged

fix: error on trait impl generics count mismatch #5582

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5c3427a
fix: error on trait impl generics count mismatch
asterite Jul 23, 2024
146d351
Extract `resolve_trait_impl_generics`
asterite Jul 23, 2024
afebc44
Move resolve_trait_impl_generics to traits file
asterite Jul 23, 2024
ebb8558
Introduce some intermediate vars
asterite Jul 23, 2024
df3e906
Update compiler/noirc_frontend/src/elaborator/traits.rs
asterite Jul 23, 2024
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
61 changes: 31 additions & 30 deletions compiler/noirc_frontend/src/elaborator/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1420,36 +1420,7 @@ impl<'context> Elaborator<'context> {
// Fetch trait constraints here
let trait_generics = trait_impl
.trait_id
.and_then(|trait_id| {
let trait_def = self.interner.get_trait(trait_id);
let resolved_generics = trait_def.generics.clone();
if resolved_generics.len() == trait_impl.trait_generics.len() {
Some(
trait_impl
.trait_generics
.iter()
.enumerate()
.map(|(i, generic)| {
self.resolve_type_inner(
generic.clone(),
&resolved_generics[i].kind,
)
})
.collect(),
)
} else {
self.push_err(CompilationError::TypeError(
TypeCheckError::GenericCountMismatch {
item: trait_def.name.to_string(),
expected: resolved_generics.len(),
found: trait_impl.trait_generics.len(),
span: trait_impl.trait_path.span(),
},
));

None
}
})
.and_then(|trait_id| self.resolve_trait_impl_generics(trait_impl, trait_id))
.unwrap_or_else(|| {
// We still resolve as to continue type checking
vecmap(&trait_impl.trait_generics, |generic| self.resolve_type(generic.clone()))
Expand Down Expand Up @@ -1481,6 +1452,36 @@ impl<'context> Elaborator<'context> {
}
}

fn resolve_trait_impl_generics(
&mut self,
trait_impl: &UnresolvedTraitImpl,
trait_id: TraitId,
) -> Option<Vec<Type>> {
let trait_def = self.interner.get_trait(trait_id);
let resolved_generics = trait_def.generics.clone();
if resolved_generics.len() != trait_impl.trait_generics.len() {
self.push_err(CompilationError::TypeError(TypeCheckError::GenericCountMismatch {
item: trait_def.name.to_string(),
expected: resolved_generics.len(),
found: trait_impl.trait_generics.len(),
span: trait_impl.trait_path.span(),
}));

return None;
}

Some(
trait_impl
.trait_generics
.iter()
.zip(resolved_generics.iter())
.map(|(generic, resolved_generic)| {
self.resolve_type_inner(generic.clone(), &resolved_generic.kind)
})
.collect(),
)
jfecher marked this conversation as resolved.
Show resolved Hide resolved
}

fn define_function_metas_for_functions(&mut self, function_set: &mut UnresolvedFunctions) {
self.file = function_set.file_id;

Expand Down
Loading