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

Fixes merge conflict

Browse source
This commit is contained in:
Joshua Hoeflich 2021-08-08 21:38:15 -05:00
commit c00d400d85
54 changed files with 946 additions and 631 deletions
Download patch file Download diff file Expand all files Collapse all files

8
compiler/builtins/src/std.rs
View file

@ -564,9 +564,9 @@ pub fn types() -> MutMap<Symbol, (SolvedType, Region)> {
Box::new(bool_type())
);
// startsWithCodePoint : Str, U32 -> Bool
// startsWithCodePt : Str, U32 -> Bool
add_top_level_function_type!(
Symbol::STR_STARTS_WITH_CODE_POINT,
Symbol::STR_STARTS_WITH_CODE_PT,
vec![str_type(), u32_type()],
Box::new(bool_type())
);
@ -639,9 +639,9 @@ pub fn types() -> MutMap<Symbol, (SolvedType, Region)> {
);
}
// toBytes : Str -> List U8
// toUtf8 : Str -> List U8
add_top_level_function_type!(
Symbol::STR_TO_BYTES,
Symbol::STR_TO_UTF8,
vec![str_type()],
Box::new(list_type(u8_type()))
);