2 files changed, 22 insertions, 0 deletions
diff --git a/src/lib/utf8.go b/src/lib/utf8.go
index ff55df802..e7a5594b9 100644
--- a/src/lib/utf8.go
+++ b/src/lib/utf8.go
@@ -256,6 +256,17 @@ func EncodeRune(rune int, p []byte) int {
 	return 4;
 }
 
+// EncodeRuneToString returns the string corresponding to the UTF-8 encoding of the rune.
+func EncodeRuneToString(rune int) string {
+	if rune < _Rune1Max {
+		return string([1]byte{byte(rune)})
+	}
+
+	var buf[UTFMax] byte;
+	size := EncodeRune(rune, buf);
+	return string(buf[0:size]);
+}
+
 // RuneCount returns the number of runes in p.  Erroneous and short
 // encodings are treated as single runes of width 1 byte.
 func RuneCount(p []byte) int {
diff --git a/src/lib/utf8_test.go b/src/lib/utf8_test.go
index e35aff938..966b2c975 100644
--- a/src/lib/utf8_test.go
+++ b/src/lib/utf8_test.go
@@ -98,6 +98,17 @@ func TestEncodeRune(t *testing.T) {
 	}
 }
 
+func TestEncodeRuneToString(t *testing.T) {
+	for i := 0; i < len(utf8map); i++ {
+		m := utf8map[i];
+		s := m.str;
+		s1 := utf8.EncodeRuneToString(m.rune);
+		if s != s1 {
+			t.Errorf("EncodeRuneToString(0x%04x) = %s want %s", m.rune, s1, s);
+		}
+	}
+}
+
 func TestDecodeRune(t *testing.T) {
 	for i := 0; i < len(utf8map); i++ {
 		m := utf8map[i];