mirror of
https://github.com/mjl-/mox.git
synced 2025-07-12 19:44:34 +03:00
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:
@ -3198,7 +3198,7 @@ func RemoveKeywords(l, remove []string) ([]string, bool) {
|
||||
for _, k := range remove {
|
||||
if i := slices.Index(l, k); i >= 0 {
|
||||
if !copied {
|
||||
l = append([]string{}, l...)
|
||||
l = slices.Clone(l)
|
||||
copied = true
|
||||
}
|
||||
copy(l[i:], l[i+1:])
|
||||
@ -3219,7 +3219,7 @@ func MergeKeywords(l, add []string) ([]string, bool) {
|
||||
for _, k := range add {
|
||||
if !slices.Contains(l, k) {
|
||||
if !copied {
|
||||
l = append([]string{}, l...)
|
||||
l = slices.Clone(l)
|
||||
copied = true
|
||||
}
|
||||
l = append(l, k)
|
||||
|
@ -234,14 +234,14 @@ func TestMailbox(t *testing.T) {
|
||||
})
|
||||
|
||||
// Run the auth tests twice for possible cache effects.
|
||||
for i := 0; i < 2; i++ {
|
||||
for range 2 {
|
||||
_, _, err := OpenEmailAuth(log, "mjl@mox.example", "bogus", false)
|
||||
if err != ErrUnknownCredentials {
|
||||
t.Fatalf("got %v, expected ErrUnknownCredentials", err)
|
||||
}
|
||||
}
|
||||
|
||||
for i := 0; i < 2; i++ {
|
||||
for range 2 {
|
||||
acc2, _, err := OpenEmailAuth(log, "mjl@mox.example", "testtest", false)
|
||||
tcheck(t, err, "open for email with auth")
|
||||
err = acc2.Close()
|
||||
|
@ -99,7 +99,7 @@ func TestLoginAttempt(t *testing.T) {
|
||||
|
||||
// Insert 3 failing entries. Then add another and see we still have 3.
|
||||
loginAttemptsMaxPerAccount = 3
|
||||
for i := 0; i < loginAttemptsMaxPerAccount; i++ {
|
||||
for i := range loginAttemptsMaxPerAccount {
|
||||
a := a2
|
||||
a.UserAgent = fmt.Sprintf("%d", i)
|
||||
LoginAttemptAdd(ctxbg, pkglog, a)
|
||||
|
Reference in New Issue
Block a user