language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-28 22:34:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge remote-tracking branch 'origin/trunk' into use-fewer-variables

Browse source
This commit is contained in:
Folkert 2020-03-07 00:53:13 +01:00
commit 21bbfd3c94
88 changed files with 2532 additions and 2251 deletions
Download patch file Download diff file Expand all files Collapse all files

4
compiler/solve/src/solve.rs
View file

@ -605,7 +605,7 @@ fn check_for_infinite_type(
) {
let var = loc_var.value;
let is_uniqueness_infer = match subs.get(var).content {
let is_uniq_infer = match subs.get(var).content {
Content::Alias(Symbol::ATTR_ATTR, _, _) => true,
_ => false,
};
@ -617,7 +617,7 @@ fn check_for_infinite_type(
// try to make a tag union recursive, see if that helps
match content {
Content::Structure(FlatType::TagUnion(tags, ext_var)) => {
if !is_uniqueness_infer {
if !is_uniq_infer {
let rec_var = subs.fresh_unnamed_flex_var();
subs.set_rank(rec_var, description.rank);