hare

commit 8313cbfbe84365b8846d53df532b374923016631
parent aaa6b93379bb4b064238da67f298e6dbb91e7a56
Author: Drew DeVault <sir@cmpwn.com>
Date:   Sun,  7 Feb 2021 12:32:52 -0500

strings::concat: reduce hack factor

Diffstat:
M
strings/concat.ha
 | 
11
+++--------

1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/strings/concat.ha b/strings/concat.ha
@@ -1,6 +1,3 @@
-use rt;
-use types;
-
 // Concatenates two or more strings. The caller must free the return value.
 export fn concat(strs: str...) str = {
 	let z = 0z;
@@ -8,14 +5,12 @@ export fn concat(strs: str...) str = {
 		z += len(strs[i]);
 	};
 	let new = alloc([]u8, [], z + 1z);
-	let buf = new: *[*]u8;
 	for (let i = 0z, j = 0z; i < len(strs); i += 1z) {
-		rt::memcpy(&buf[j], strs[i]: *const char: *[*]u8, len(strs[i]));
+		append(new, ...to_utf8(strs[i]));
 		j += len(strs[i]);
 	};
-	buf[z + 1z] = 0u8;
-	(&new: *types::string).length = z;
-	return *(&new: *str);
+	append(new, 0u8);
+	return from_utf8(new[..z]);
 };
 
 @test fn concat() void = {