From 6aec8244f0fb796ae82ce9780f8a80471c150a37 Mon Sep 17 00:00:00 2001
From: Delyan Angelov <delian66@gmail.com>
Date: Sun, 2 Apr 2023 00:03:00 +0300
Subject: [PATCH] strings: simplify Builder.drain_builder; add test (#17846)

---
 vlib/strings/builder.c.v    |  4 +++-
 vlib/strings/builder_test.v | 15 +++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/vlib/strings/builder.c.v b/vlib/strings/builder.c.v
index 54e8756f7e..52b69e0321 100644
--- a/vlib/strings/builder.c.v
+++ b/vlib/strings/builder.c.v
@@ -87,7 +87,9 @@ pub fn (mut b Builder) write(data []u8) !int {
 // `other`, so that the `other` strings builder is ready to receive new content.
 [manualfree]
 pub fn (mut b Builder) drain_builder(mut other Builder, other_new_cap int) {
-	b.write(other) or { panic(err) }
+	if other.len > 0 {
+		b << *other
+	}
 	unsafe { other.free() }
 	other = new_builder(other_new_cap)
 }
diff --git a/vlib/strings/builder_test.v b/vlib/strings/builder_test.v
index 77e6e8a6a5..25c3d53ad9 100644
--- a/vlib/strings/builder_test.v
+++ b/vlib/strings/builder_test.v
@@ -129,3 +129,18 @@ fn test_ensure_cap() {
 	sb.ensure_cap(-1)
 	assert sb.cap == 15
 }
+
+fn test_drain_builder() {
+	mut sb := strings.new_builder(0)
+	mut target_sb := strings.new_builder(0)
+	assert sb.cap == 0
+	assert target_sb.cap == 0
+
+	sb.write_string('abc')
+	assert sb.len == 3
+
+	target_sb.drain_builder(mut sb, 0)
+	assert sb.len == 0
+	assert target_sb.len == 3
+	assert target_sb.str() == 'abc'
+}