- Remove dependency on temp allocator in String.join.

lib/std/core/string.c3

@@ -1,5 +1,7 @@
 module std::core::string;
 import std::io, std::ascii;
+import std::core::mem::allocator;
+
 
 
 typedef String @if(!$defined(String)) = inline char[];
@@ -96,7 +98,8 @@ fn ZString tformat_zstr(String fmt, args...) @format(0)
 }
 
 <*
- Return a new String created using the formatting function.
+ Return a new String created using the formatting function, this function will implicitly
+ use the temp allocator.
 
  @param [inout] allocator : `The allocator to use`
  @param [in] fmt : `The formatting string`
@@ -156,29 +159,34 @@ macro bool char_in_set(char c, String set)
 	return false;
 }
 
+<*
+ @return "a String which is safe to convert to a ZString"
+*>
 fn String join(Allocator allocator, String[] s, String joiner)
 {
 	if (!s)
 	{
 		return (String)allocator::new_array(allocator, char, 2)[:0];
 	}
-
+	usz joiner_len = joiner.len;
-	usz total_size = joiner.len * s.len;
+	usz total_size = joiner_len * (s.len - 1) + 1;
 	foreach (String* &str : s)
 	{
 		total_size += str.len;
 	}
-	@pool()
+	char[] data = allocator::alloc_array(allocator, char, total_size);
+	usz offset = s[0].len;
+	data[:offset] = s[0][:offset];
+	foreach (String* &str : s[1..])
 	{
-		DString res = dstring::temp_with_capacity(total_size);
+		data[offset:joiner_len] = joiner[:joiner_len];
-		res.append(s[0]);
+		offset += joiner_len;
-		foreach (String* &str : s[1..])
+		usz len = str.len;
-		{
+		data[offset:len] = str.[:len];
-			res.append(joiner);
+		offset += len;
-			res.append(*str);
-		}
-		return res.copy_str(allocator);
 	};
+	data[offset] = 0;
+	return (String)data[:offset];
 }
 
 <*

releasenotes.md

@@ -7,6 +7,7 @@
 
 ### Stdlib changes
 - Summarize sort macros as generic function wrappers to reduce the amount of generated code. #2831
+- Remove dependency on temp allocator in String.join.
 
 ### Fixes
 - Add error message if directory with output file name already exists