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

Resolve conflicts with remote

Browse source
This commit is contained in:
Chad Stearns 2020-07-26 21:41:38 -04:00
commit 59b30ad20f
14 changed files with 346 additions and 282 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -510,9 +510,9 @@ pub fn types() -> MutMap<Symbol, (SolvedType, Region)> {
),
);
// push : List elem, elem -> List elem
// append : List elem, elem -> List elem
add_type(
Symbol::LIST_PUSH,
Symbol::LIST_APPEND,
SolvedType::Func(
vec![list_type(flex(TVAR1)), flex(TVAR1)],
Box::new(list_type(flex(TVAR1))),
@ -552,15 +552,6 @@ pub fn types() -> MutMap<Symbol, (SolvedType, Region)> {
),
);
// append : List elem, List elem -> List elem
add_type(
Symbol::LIST_APPEND,
SolvedType::Func(
vec![list_type(flex(TVAR1)), list_type(flex(TVAR1))],
Box::new(list_type(flex(TVAR1))),
),
);
// len : List * -> Int
add_type(
Symbol::LIST_LEN,