language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-08-04 20:28:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Resolve merge conflict regarding tag name slices

Browse source
This commit is contained in:
Ayaz Hafiz 2022-10-11 00:00:41 -05:00
parent dfcb72602d
commit 80e0690a70
No known key found for this signature in database
GPG key ID: 0E2A37416A25EF58
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
crates/compiler/derive_key/src/hash.rs
View file

@ -2,7 +2,7 @@ use roc_module::{
ident::{Lowercase, TagName},
symbol::Symbol,
};
use roc_types::subs::{Content, FlatType, Subs, Variable};
use roc_types::subs::{Content, FlatType, GetSubsSlice, Subs, Variable};
use crate::{
util::{check_derivable_ext_var, debug_name_record, debug_name_tag},
@ -94,8 +94,11 @@ impl FlatHash {
Ok(Key(FlatHashKey::TagUnion(tag_names_and_payload_sizes)))
}
FlatType::FunctionOrTagUnion(name_index, _, _) => Ok(Key(FlatHashKey::TagUnion(
vec![(subs[name_index].clone(), 0)],
FlatType::FunctionOrTagUnion(names_index, _, _) => Ok(Key(FlatHashKey::TagUnion(
subs.get_subs_slice(names_index)
.iter()
.map(|t| (t.clone(), 0))
.collect(),
))),
FlatType::EmptyRecord => Ok(Key(FlatHashKey::Record(vec![]))),
FlatType::EmptyTagUnion => Ok(Key(FlatHashKey::TagUnion(vec![]))),