refactor: Replace(a, b, -1) → ReplaceAll(a, b)

Signed-off-by: Maxime Soulé <btik-git@scoubidou.com>

helpers/tdhttp/internal/response.go

@@ -37,7 +37,7 @@ func canBackquote(b []byte) bool {
 }
 
 func replaceCrLf(b []byte) []byte {
-	return bytes.Replace(b, []byte("\r\n"), []byte("\n"), -1) //nolint: gocritic
+	return bytes.ReplaceAll(b, []byte("\r\n"), []byte("\n"))
 }
 
 func backquote(b []byte) ([]byte, bool) {

helpers/tdhttp/multipart_test.go

@@ -31,7 +31,7 @@ func TestMultipartPart(t *testing.T) {
 		if assert.CmpNoError(err) {
 			_, err := io.Copy(&final, part)
 			if assert.CmpNoError(err) {
-				assert.Cmp(final.String(), strings.Replace(expected, "%CR", "\r", -1)) //nolint: gocritic
+				assert.Cmp(final.String(), strings.ReplaceAll(expected, "%CR", "\r"))
 			}
 		}
 	}
@@ -239,7 +239,7 @@ Content-Disposition: form-data; name="io"%CR
 		if !assert.CmpNoError(err) {
 			continue
 		}
-		if !assert.Cmp(final.String(), strings.Replace(expected, "%CR", "\r", -1)) { //nolint: gocritic
+		if !assert.Cmp(final.String(), strings.ReplaceAll(expected, "%CR", "\r")) {
 			continue
 		}
 

helpers/tdhttp/test_api_test.go

@@ -259,7 +259,7 @@ func TestNewTestAPI(t *testing.T) {
 				}).
 				CmpStatus(200).
 				CmpHeader(containsKey).
-				CmpBody(strings.Replace( //nolint: gocritic
+				CmpBody(strings.ReplaceAll(
 					`POST!
 ---
 --BoUnDaRy%CR
@@ -269,7 +269,7 @@ Content-Type: text/plain; charset=utf-8%CR
 bingo%CR
 --BoUnDaRy--%CR
 `,
-					"%CR", "\r", -1)).
+					"%CR", "\r")).
 				Failed())
 		td.CmpEmpty(t, mockT.LogBuf())
 

internal/json/marshal.go

@@ -129,7 +129,7 @@ func (m *marshaler) marshal(v any) error {
 		}
 		repl := bytes.Repeat([]byte(" "), 1+m.indent)
 		repl[0] = '\n'
-		m.buf.Write(bytes.Replace(b, []byte("\n"), repl, -1)) //nolint: gocritic
+		m.buf.Write(bytes.ReplaceAll(b, []byte("\n"), repl))
 
 	default:
 		return fmt.Errorf("Cannot marshal %T", vt)

internal/json/parser_test.go

@@ -300,8 +300,8 @@ func TestJSON(t *testing.T) {
 		} {
 			for j, s := range []string{
 				js,
-				strings.Replace(js, "\n", "\r", -1),   //nolint: gocritic
-				strings.Replace(js, "\n", "\r\n", -1), //nolint: gocritic
+				strings.ReplaceAll(js, "\n", "\r"),
+				strings.ReplaceAll(js, "\n", "\r\n"),
 			} {
 				got, err := json.Parse([]byte(s))
 				if !test.NoError(t, err, "#%d/%d, json.Parse succeeds", i, j) {

internal/util/string.go

@@ -67,7 +67,7 @@ func ToString(val any) string {
 // IndentString indents str lines (from 2nd one = 1st line is not
 // indented) by indent.
 func IndentString(str, indent string) string {
-	return strings.Replace(str, "\n", "\n"+indent, -1) //nolint: gocritic
+	return strings.ReplaceAll(str, "\n", "\n"+indent)
 }
 
 // IndentStringIn indents str lines (from 2nd one = 1st line is not

td/check_test.go

@@ -83,12 +83,13 @@ func mustContain(str string) expectedErrorMatch {
 }
 
 func indent(str string, numSpc int) string {
-	return strings.Replace(str, "\n", "\n\t"+strings.Repeat(" ", numSpc), -1) //nolint: gocritic
+	return strings.ReplaceAll(str, "\n", "\n\t"+strings.Repeat(" ", numSpc))
 }
 
 func cmpErrorStr(t *testing.T, err *ctxerr.Error,
 	got string, expected expectedErrorMatch, fieldName string,
-	args ...any) bool {
+	args ...any,
+) bool {
 	t.Helper()
 
 	if expected.Exact != "" && got != expected.Exact {
@@ -99,7 +100,7 @@ func cmpErrorStr(t *testing.T, err *ctxerr.Error,
 	> %s`,
 			tdutil.BuildTestName(args...),
 			fieldName, indent(got, 10), indent(expected.Exact, 10),
-			strings.Replace(err.Error(), "\n\t", "\n\t> ", -1)) //nolint: gocritic
+			strings.ReplaceAll(err.Error(), "\n\t", "\n\t> "))
 		return false
 	}
 
@@ -112,7 +113,7 @@ func cmpErrorStr(t *testing.T, err *ctxerr.Error,
 			tdutil.BuildTestName(args...),
 			fieldName,
 			indent(got, 16), indent(expected.Contain, 16),
-			strings.Replace(err.Error(), "\n\t", "\n\t> ", -1)) //nolint: gocritic
+			strings.ReplaceAll(err.Error(), "\n\t", "\n\t> "))
 		return false
 	}
 
@@ -125,15 +126,16 @@ func cmpErrorStr(t *testing.T, err *ctxerr.Error,
 			tdutil.BuildTestName(args...),
 			fieldName,
 			indent(got, 14), indent(expected.Match.String(), 14),
-			strings.Replace(err.Error(), "\n\t", "\n\t> ", -1)) //nolint: gocritic
+			strings.ReplaceAll(err.Error(), "\n\t", "\n\t> "))
 		return false
 	}
 
 	return true
 }
 
 func matchError(t *testing.T, err *ctxerr.Error, expectedError expectedError,
-	expectedIsTestDeep bool, args ...any) bool {
+	expectedIsTestDeep bool, args ...any,
+) bool {
 	t.Helper()
 
 	if !cmpErrorStr(t, err, err.Message, expectedError.Message,
@@ -201,7 +203,8 @@ func matchError(t *testing.T, err *ctxerr.Error, expectedError expectedError,
 }
 
 func _checkError(t *testing.T, got, expected any,
-	expectedError expectedError, args ...any) bool {
+	expectedError expectedError, args ...any,
+) bool {
 	t.Helper()
 
 	err := td.EqDeeplyError(got, expected)
@@ -247,7 +250,8 @@ func ifaceExpectedError(t *testing.T, expectedError expectedError) expectedError
 // checkError calls _checkError twice. The first time with the same
 // parameters, the second time in an any context.
 func checkError(t *testing.T, got, expected any,
-	expectedError expectedError, args ...any) bool {
+	expectedError expectedError, args ...any,
+) bool {
 	t.Helper()
 
 	if ok := _checkError(t, got, expected, expectedError, args...); !ok {
@@ -270,7 +274,8 @@ func checkError(t *testing.T, got, expected any,
 
 func checkErrorForEach(t *testing.T,
 	gotList []any, expected any,
-	expectedError expectedError, args ...any) (ret bool) {
+	expectedError expectedError, args ...any,
+) (ret bool) {
 	t.Helper()
 
 	globalTestName := tdutil.BuildTestName(args...)
@@ -314,7 +319,8 @@ func customCheckOK(t *testing.T,
 }
 
 func _checkOK(t *testing.T, got, expected any,
-	args ...any) bool {
+	args ...any,
+) bool {
 	t.Helper()
 
 	if !td.Cmp(t, got, expected, args...) {
@@ -340,13 +346,15 @@ func _checkOK(t *testing.T, got, expected any,
 // checkOK calls _checkOK twice. The first time with the same
 // parameters, the second time in an any context.
 func checkOK(t *testing.T, got, expected any,
-	args ...any) bool {
+	args ...any,
+) bool {
 	t.Helper()
 	return customCheckOK(t, _checkOK, got, expected, args...)
 }
 
 func checkOKOrPanicIfUnsafeDisabled(t *testing.T, got, expected any,
-	args ...any) bool {
+	args ...any,
+) bool {
 	t.Helper()
 
 	var ret bool
@@ -366,7 +374,8 @@ func checkOKOrPanicIfUnsafeDisabled(t *testing.T, got, expected any,
 }
 
 func checkOKForEach(t *testing.T, gotList []any, expected any,
-	args ...any) (ret bool) {
+	args ...any,
+) (ret bool) {
 	t.Helper()
 
 	globalTestName := tdutil.BuildTestName(args...)
@@ -383,7 +392,8 @@ func checkOKForEach(t *testing.T, gotList []any, expected any,
 }
 
 func equalTypes(t *testing.T, got td.TestDeep, expected any,
-	args ...any) bool {
+	args ...any,
+) bool {
 	gotType := got.TypeBehind()
 
 	expectedType, ok := expected.(reflect.Type)