FIXUP: switch from []byte to string

Author: cbandy

internal/testing/cmp/cmp.go

@@ -6,9 +6,7 @@ package cmp
 
 import (
 	"bufio"
-	"bytes"
 	"regexp"
-	"slices"
 	"strings"
 
 	gocmp "github.com/google/go-cmp/cmp"
@@ -83,9 +81,9 @@ func MarshalMatches(actual any, expected string) Comparison {
 	if err != nil {
 		return func() gotest.Result { return gotest.ResultFromError(err) }
 	}
-	return gotest.DeepEqual(string(b), string(dedentLines(
-		[]byte(strings.TrimLeft(strings.TrimRight(expected, "\t\n"), "\n")), 2,
-	)))
+	return gotest.DeepEqual(string(b), dedentLines(
+		strings.TrimLeft(strings.TrimRight(expected, "\t\n"), "\n"), 2,
+	))
 }
 
 // Regexp succeeds if value contains any match of the regular expression.
@@ -99,32 +97,27 @@ var leadingTabs = regexp.MustCompile(`^\t+`)
 
 // dedentLines finds the shortest leading whitespace of every line in data and then removes it from every line.
 // When tabWidth is positive, leading tabs are converted to spaces first.
-func dedentLines(data []byte, tabWidth int) []byte {
-	var lines = make([][]byte, 0, 20)
-	var lowest, highest []byte
+func dedentLines(data string, tabWidth int) string {
+	var lines = make([]string, 0, 20)
+	var lowest, highest string
 
-	for s := bufio.NewScanner(bytes.NewReader(data)); s.Scan(); {
-		line := slices.Clone(s.Bytes())
-		tabs := leadingTabs.Find(line)
+	for s := bufio.NewScanner(strings.NewReader(data)); s.Scan(); {
+		line := s.Text()
+		tabs := leadingTabs.FindString(line)
 
 		// Replace any leading tabs with spaces when tabWidth is positive.
 		// NOTE: [strings.Repeat] has a fast-path for spaces.
 		if need := tabWidth * len(tabs); need > 0 {
-			line = append(append(make([]byte, 0, need+len(line)),
-				strings.Repeat(" ", need)...), line[len(tabs):]...)
+			line = strings.Repeat(" ", need) + line[len(tabs):]
 		}
 
 		switch {
-		case lowest == nil, highest == nil:
+		case lowest == "", highest == "":
 			lowest, highest = line, line
 
-		case len(bytes.TrimSpace(line)) > 0:
-			if bytes.Compare(line, lowest) < 0 {
-				lowest = line
-			}
-			if bytes.Compare(line, highest) > 0 {
-				highest = line
-			}
+		case len(strings.TrimSpace(line)) > 0:
+			lowest = min(lowest, line)
+			highest = max(highest, line)
 		}
 
 		lines = append(lines, line)
@@ -144,14 +137,14 @@ func dedentLines(data []byte, tabWidth int) []byte {
 			if len(lines[i]) > width {
 				lines[i] = lines[i][width:]
 			} else {
-				lines[i] = nil
+				lines[i] = ""
 			}
 		}
 	}
 
-	result := bytes.Join(lines, []byte("\n"))
+	result := strings.Join(lines, "\n")
 	if len(lines) > 0 {
-		result = append(result, '\n')
+		result += "\n"
 	}
 	return result
 }

internal/testing/cmp/cmp_test.go

@@ -57,7 +57,7 @@ func TestDedentLines(t *testing.T) {
 		{input: "\t\t", expected: "\n"},
 	} {
 		t.Run(fmt.Sprintf("%v:%#v", tc.width, tc.input), func(t *testing.T) {
-			assert.DeepEqual(t, dedentLines([]byte(tc.input), tc.width), []byte(tc.expected))
+			assert.DeepEqual(t, dedentLines(tc.input, tc.width), tc.expected)
 		})
 	}
 }

pkg/apis/postgres-operator.crunchydata.com/v1beta1/cmp_test.go

@@ -6,10 +6,8 @@ package v1beta1_test
 
 import (
 	"bufio"
-	"bytes"
 	"fmt"
 	"regexp"
-	"slices"
 	"strings"
 	"testing"
 
@@ -24,41 +22,36 @@ func MarshalsTo[T []byte | string](x any, y T) cmp.Comparison {
 	if err != nil {
 		return func() cmp.Result { return cmp.ResultFromError(err) }
 	}
-	return cmp.DeepEqual(string(b), string(dedentLines(
-		bytes.TrimLeft(bytes.TrimRight([]byte(y), "\t\n"), "\n"), 2,
-	)))
+	return cmp.DeepEqual(string(b), dedentLines(
+		strings.TrimLeft(strings.TrimRight(string(y), "\t\n"), "\n"), 2,
+	))
 }
 
 var leadingTabs = regexp.MustCompile(`^\t+`)
 
 // dedentLines finds the shortest leading whitespace of every line in data and then removes it from every line.
 // When tabWidth is positive, leading tabs are converted to spaces first.
-func dedentLines(data []byte, tabWidth int) []byte {
-	var lines = make([][]byte, 0, 20)
-	var lowest, highest []byte
+func dedentLines(data string, tabWidth int) string {
+	var lines = make([]string, 0, 20)
+	var lowest, highest string
 
-	for s := bufio.NewScanner(bytes.NewReader(data)); s.Scan(); {
-		line := slices.Clone(s.Bytes())
-		tabs := leadingTabs.Find(line)
+	for s := bufio.NewScanner(strings.NewReader(data)); s.Scan(); {
+		line := s.Text()
+		tabs := leadingTabs.FindString(line)
 
 		// Replace any leading tabs with spaces when tabWidth is positive.
 		// NOTE: [strings.Repeat] has a fast-path for spaces.
 		if need := tabWidth * len(tabs); need > 0 {
-			line = append(append(make([]byte, 0, need+len(line)),
-				strings.Repeat(" ", need)...), line[len(tabs):]...)
+			line = strings.Repeat(" ", need) + line[len(tabs):]
 		}
 
 		switch {
-		case lowest == nil, highest == nil:
+		case lowest == "", highest == "":
 			lowest, highest = line, line
 
-		case len(bytes.TrimSpace(line)) > 0:
-			if bytes.Compare(line, lowest) < 0 {
-				lowest = line
-			}
-			if bytes.Compare(line, highest) > 0 {
-				highest = line
-			}
+		case len(strings.TrimSpace(line)) > 0:
+			lowest = min(lowest, line)
+			highest = max(highest, line)
 		}
 
 		lines = append(lines, line)
@@ -78,14 +71,14 @@ func dedentLines(data []byte, tabWidth int) []byte {
 			if len(lines[i]) > width {
 				lines[i] = lines[i][width:]
 			} else {
-				lines[i] = nil
+				lines[i] = ""
 			}
 		}
 	}
 
-	result := bytes.Join(lines, []byte("\n"))
+	result := strings.Join(lines, "\n")
 	if len(lines) > 0 {
-		result = append(result, '\n')
+		result += "\n"
 	}
 	return result
 }
@@ -136,7 +129,7 @@ func TestDedentLines(t *testing.T) {
 		{input: "\t\t", expected: "\n"},
 	} {
 		t.Run(fmt.Sprintf("%v:%#v", tc.width, tc.input), func(t *testing.T) {
-			assert.DeepEqual(t, dedentLines([]byte(tc.input), tc.width), []byte(tc.expected))
+			assert.DeepEqual(t, dedentLines(tc.input, tc.width), tc.expected)
 		})
 	}
 }