roc-lang/roc
1
1
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2024-09-22 00:09:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Revert "Fix spurious UnusedDef on type aliases""

Browse Source 
This reverts commit e2f18eb693.
This commit is contained in:
Richard Feldman 2020-02-21 00:23:31 -08:00
parent e2f18eb693
commit 4f5a220d4c
1 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/can/def.rs
View File

@ -666,15 +666,18 @@ fn canonicalize_pending_def<'a>(
match pending_def {
AnnotationOnly(_, loc_can_pattern, loc_ann) => {
// TODO we have ann.references here, which includes information about
// which symbols were referenced in type annotations, but we never
// use them. We discard them!
// annotation sans body cannot introduce new rigids that are visible in other annotations
// but the rigids can show up in type error messages, so still register them
let ann =
canonicalize_annotation(env, scope, &loc_ann.value, loc_ann.region, var_store);
// Record all the annotation's references in output.references.lookups
let lookups = &mut output.references.lookups;
for symbol in ann.references {
lookups.insert(symbol);
}
for (symbol, alias) in ann.aliases.clone() {
aliases.insert(symbol, alias);
}
@ -762,6 +765,13 @@ fn canonicalize_pending_def<'a>(
let symbol = name.value;
let can_ann = canonicalize_annotation(env, scope, &ann.value, ann.region, var_store);
// Record all the annotation's references in output.references.lookups
let lookups = &mut output.references.lookups;
for symbol in can_ann.references {
lookups.insert(symbol);
}
let mut can_vars: Vec<Located<(Lowercase, Variable)>> = Vec::with_capacity(vars.len());
for loc_lowercase in vars {
@ -795,23 +805,23 @@ fn canonicalize_pending_def<'a>(
let alias = scope.lookup_alias(symbol).expect("alias was not added");
aliases.insert(symbol, alias.clone());
// TODO should probably incorporate can_ann.references here - possibly by
// inserting them into refs_by_symbol?
// aliases cannot introduce new rigids that are visible in other annotations
// but the rigids can show up in type error messages, so still register them
for (k, v) in can_ann.rigids {
output.rigids.insert(k, v);
}
}
TypedBody(loc_pattern, loc_can_pattern, loc_ann, loc_expr) => {
// TODO we have ann.references here, which includes information about
// which symbols were referenced in type annotations, but we never
// use them. We discard them!
let ann =
canonicalize_annotation(env, scope, &loc_ann.value, loc_ann.region, var_store);
// Record all the annotation's references in output.references.lookups
let lookups = &mut output.references.lookups;
for symbol in ann.references {
lookups.insert(symbol);
}
let typ = ann.typ;
for (symbol, alias) in ann.aliases.clone() {