From ae5469fc81e55f38557f59748d39ab3f46790665 Mon Sep 17 00:00:00 2001
From: Atanas Janeshliev <atanas.janeshliev@proton.ch>
Date: Mon, 20 Jan 2025 12:48:43 +0100
Subject: [PATCH] chore: remove export loop ref and loop-scope assignments
 (changed with go 1.22)

---
 .golangci.yml                                | 1 -
 internal/services/smtp/smtp_packages_test.go | 5 -----
 internal/services/smtp/smtp_prefs_test.go    | 2 --
 internal/useragent/useragent_test.go         | 2 --
 4 files changed, 10 deletions(-)

diff --git a/.golangci.yml b/.golangci.yml
index 55c72a90..85b0f212 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -87,7 +87,6 @@ linters:
     - asciicheck        # Simple linter to check that your code does not contain non-ASCII identifiers [fast: true, auto-fix: false]
     - durationcheck     # check for two durations multiplied together [fast: false, auto-fix: false]
     - exhaustive        # check exhaustiveness of enum switch statements [fast: false, auto-fix: false]
-    - exportloopref     # checks for pointers to enclosing loop variables [fast: false, auto-fix: false]
     - copyloopvar       # detects places where loop variables are copied.
     - forcetypeassert   # finds forced type assertions [fast: true, auto-fix: false]
     - godot             # Check if comments end in a period [fast: true, auto-fix: true]
diff --git a/internal/services/smtp/smtp_packages_test.go b/internal/services/smtp/smtp_packages_test.go
index b93eaa6e..03124b97 100644
--- a/internal/services/smtp/smtp_packages_test.go
+++ b/internal/services/smtp/smtp_packages_test.go
@@ -241,7 +241,6 @@ func TestCreateSendReq_PGPMIMEScheme(t *testing.T) {
 		},
 	}
 	for _, test := range tests {
-		test := test // Avoid using range scope test inside function literal.
 		t.Run(test.name, func(t *testing.T) { checkCreateSendReq(t, test, kr) })
 	}
 }
@@ -442,7 +441,6 @@ func TestCreateSendReq_ClearMIMEScheme(t *testing.T) {
 		},
 	}
 	for _, test := range tests {
-		test := test // Avoid using range scope test inside function literal.
 		t.Run(test.name, func(t *testing.T) { checkCreateSendReq(t, test, kr) })
 	}
 }
@@ -643,7 +641,6 @@ func TestCreateSendReq_InternalScheme(t *testing.T) {
 		},
 	}
 	for _, test := range tests {
-		test := test // Avoid using range scope test inside function literal.
 		t.Run(test.name, func(t *testing.T) { checkCreateSendReq(t, test, kr) })
 	}
 }
@@ -849,7 +846,6 @@ func TestCreateSendReq_PGPInlineScheme(t *testing.T) {
 		},
 	}
 	for _, test := range tests {
-		test := test // Avoid using range scope test inside function literal.
 		t.Run(test.name, func(t *testing.T) { checkCreateSendReq(t, test, kr) })
 	}
 }
@@ -1065,7 +1061,6 @@ func TestCreateSendReq_ClearScheme(t *testing.T) {
 		},
 	}
 	for _, test := range tests {
-		test := test // Avoid using range scope test inside function literal.
 		t.Run(test.name, func(t *testing.T) { checkCreateSendReq(t, test, kr) })
 	}
 }
diff --git a/internal/services/smtp/smtp_prefs_test.go b/internal/services/smtp/smtp_prefs_test.go
index 120cb841..eeaa433d 100644
--- a/internal/services/smtp/smtp_prefs_test.go
+++ b/internal/services/smtp/smtp_prefs_test.go
@@ -405,8 +405,6 @@ func TestPreferencesBuilder(t *testing.T) {
 	}
 
 	for _, test := range tests {
-		test := test // Avoid using range scope test inside function literal.
-
 		t.Run(test.name, func(t *testing.T) {
 			b := &sendPrefsBuilder{}
 
diff --git a/internal/useragent/useragent_test.go b/internal/useragent/useragent_test.go
index 961c3f1d..47f0af3d 100644
--- a/internal/useragent/useragent_test.go
+++ b/internal/useragent/useragent_test.go
@@ -75,8 +75,6 @@ func TestUserAgent(t *testing.T) {
 	}
 
 	for _, test := range tests {
-		test := test
-
 		t.Run(test.want, func(t *testing.T) {
 			ua := New()