Run modernize to rewrite some older go constructs to newer ones

Mostly using slice.Sort, using min/max, slices.Concat, range of int and
fmt.Appendf for byte slices instead of strings.
This commit is contained in:
Mechiel Lukkien
2025-03-06 17:33:06 +01:00
parent f6132bdbc0
commit 64f2f788b1
61 changed files with 146 additions and 232 deletions

View File

@ -1243,7 +1243,7 @@ func (c *Client) DeliverMultiple(ctx context.Context, mailFrom string, rcptTo []
// Read responses to RCPT TO.
rcptResps = make([]Response, len(rcptTo))
nok := 0
for i := 0; i < len(rcptTo); i++ {
for i := range rcptTo {
code, secode, firstLine, moreLines, err := c.read()
// 552 should be treated as temporary historically, ../rfc/5321:3576
permanent := code/100 == 5 && code != smtp.C552MailboxFull

View File

@ -273,7 +273,7 @@ func TestClient(t *testing.T) {
if n == 0 {
n = 1
}
for i := 0; i < n; i++ {
for i := range n {
readline("RCPT TO:")
resp := "250 ok"
if i < len(opts.resps) {
@ -293,7 +293,7 @@ func TestClient(t *testing.T) {
readline("MAIL FROM:")
writeline("250 ok")
for i := 0; i < n; i++ {
for i := range n {
readline("RCPT TO:")
resp := "250 ok"
if i < len(opts.resps) {
@ -366,7 +366,7 @@ func TestClient(t *testing.T) {
}()
var errs []error
for i := 0; i < 2; i++ {
for range 2 {
err := <-result
if err != nil {
errs = append(errs, err)
@ -907,7 +907,7 @@ func run(t *testing.T, server func(s xserver), client func(conn net.Conn)) {
client(clientConn)
}()
var errs []error
for i := 0; i < 2; i++ {
for range 2 {
err := <-result
if err != nil {
errs = append(errs, err)

View File

@ -104,7 +104,7 @@ func TestGatherDestinations(t *testing.T) {
var zerodom dns.Domain
for i := 0; i < 2; i++ {
for i := range 2 {
authic := i == 1
resolver.AllAuthentic = authic
// Basic with simple MX.
@ -187,7 +187,7 @@ func TestGatherIPs(t *testing.T) {
return r
}
for i := 0; i < 2; i++ {
for i := range 2 {
authic := i == 1
resolver.AllAuthentic = authic