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 roc_alloc

Browse source
This commit is contained in:
Richard Feldman 2021-05-24 20:05:12 -04:00
commit 7d7588ca19
41 changed files with 4658 additions and 2767 deletions
Download patch file Download diff file Expand all files Collapse all files

4
compiler/builtins/bitcode/src/str.zig
View file

@ -920,7 +920,7 @@ fn strConcat(result_in_place: InPlace, arg1: RocStr, arg2: RocStr) RocStr {
return RocStr.clone(result_in_place, arg2);
} else if (arg2.isEmpty()) {
// the first argument is owned, so we can return it without cloning
return RocStr.clone(result_in_place, arg1);
return arg1;
} else {
const combined_length = arg1.len() + arg2.len();
@ -948,8 +948,6 @@ fn strConcat(result_in_place: InPlace, arg1: RocStr, arg2: RocStr) RocStr {
arg1.memcpy(result_ptr);
arg2.memcpy(result_ptr + arg1.len());
arg1.deinit();
return result;
}
}