From ff97ff8320a8c057578b00e4a50888b2fd009201 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Tue, 12 Nov 2024 13:41:21 +0100 Subject: [PATCH] daemon/logger/loggerutils: remove redundant capturing of loop vars (copyloopvar) daemon/logger/loggerutils/logfile.go:809:3: The copy of the 'for' variable "ra" can be deleted (Go 1.22+) (copyloopvar) ra := ra ^ daemon/logger/loggerutils/sharedtemp_test.go:117:4: The copy of the 'for' variable "i" can be deleted (Go 1.22+) (copyloopvar) i := i ^ daemon/logger/loggerutils/sharedtemp_test.go:179:4: The copy of the 'for' variable "i" can be deleted (Go 1.22+) (copyloopvar) i := i ^ Signed-off-by: Sebastiaan van Stijn --- daemon/logger/loggerutils/logfile.go | 1 - daemon/logger/loggerutils/sharedtemp_test.go | 2 -- 2 files changed, 3 deletions(-) diff --git a/daemon/logger/loggerutils/logfile.go b/daemon/logger/loggerutils/logfile.go index 4f2ad8bbba..e9583521f6 100644 --- a/daemon/logger/loggerutils/logfile.go +++ b/daemon/logger/loggerutils/logfile.go @@ -806,7 +806,6 @@ func tailFiles(ctx context.Context, files []fileOpener, watcher *logger.LogWatch }() for _, ra := range readers { - ra := ra select { case <-watcher.WatchConsumerGone(): return false diff --git a/daemon/logger/loggerutils/sharedtemp_test.go b/daemon/logger/loggerutils/sharedtemp_test.go index ac04b544d7..ac959d2107 100644 --- a/daemon/logger/loggerutils/sharedtemp_test.go +++ b/daemon/logger/loggerutils/sharedtemp_test.go @@ -114,7 +114,6 @@ func TestSharedTempFileConverter(t *testing.T) { var wg sync.WaitGroup wg.Add(3) for i := 0; i < 3; i++ { - i := i go func() { defer wg.Done() t.Logf("goroutine %v: enter", i) @@ -176,7 +175,6 @@ func TestSharedTempFileConverter(t *testing.T) { var done sync.WaitGroup done.Add(3) for i := 0; i < 3; i++ { - i := i go func() { defer done.Done() t.Logf("goroutine %v: enter", i)