From a83befa0d111a0ba6fac52d763e93c76a2ef94d4 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Fri, 19 Dec 2025 12:52:30 +0100 Subject: all: use any instead of interface{} Any is the preferred over interface{} now in Go. --- syz-ci/jobs.go | 6 +++--- syz-ci/manager.go | 4 ++-- syz-ci/manager_test.go | 2 +- syz-ci/managercmd.go | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) (limited to 'syz-ci') diff --git a/syz-ci/jobs.go b/syz-ci/jobs.go index ee2e861b3..ed24ab421 100644 --- a/syz-ci/jobs.go +++ b/syz-ci/jobs.go @@ -798,12 +798,12 @@ func aggregateTestResults(results []instance.EnvTestResult) (*patchTestResult, e return nil, anyErr } -func (jp *JobProcessor) Logf(level int, msg string, args ...interface{}) { - log.Logf(level, "%s: "+msg, append([]interface{}{jp.name}, args...)...) +func (jp *JobProcessor) Logf(level int, msg string, args ...any) { + log.Logf(level, "%s: "+msg, append([]any{jp.name}, args...)...) } // Errorf logs non-fatal error and sends it to dashboard. -func (jp *JobProcessor) Errorf(msg string, args ...interface{}) { +func (jp *JobProcessor) Errorf(msg string, args ...any) { log.Errorf("job: "+msg, args...) if jp.dash != nil { jp.dash.LogError(jp.name, msg, args...) diff --git a/syz-ci/manager.go b/syz-ci/manager.go index 116b605f0..605ddf05f 100644 --- a/syz-ci/manager.go +++ b/syz-ci/manager.go @@ -100,7 +100,7 @@ type ManagerDashapi interface { ReportBuildError(req *dashapi.BuildErrorReq) error UploadBuild(build *dashapi.Build) error BuilderPoll(manager string) (*dashapi.BuilderPollResp, error) - LogError(name, msg string, args ...interface{}) + LogError(name, msg string, args ...any) CommitPoll() (*dashapi.CommitPollResp, error) UploadCommits(commits []dashapi.Commit) error } @@ -1082,7 +1082,7 @@ func uploadFileHTTPPut(ctx context.Context, URL string, file io.Reader) error { } // Errorf logs non-fatal error and sends it to dashboard. -func (mgr *Manager) Errorf(msg string, args ...interface{}) { +func (mgr *Manager) Errorf(msg string, args ...any) { for _, arg := range args { err, _ := arg.(error) if err == nil { diff --git a/syz-ci/manager_test.go b/syz-ci/manager_test.go index e9ca7071d..5b37de2ec 100644 --- a/syz-ci/manager_test.go +++ b/syz-ci/manager_test.go @@ -37,7 +37,7 @@ func (dm *dashapiMock) BuilderPoll(manager string) (*dashapi.BuilderPollResp, er // We don't care about the methods below for now. func (dm *dashapiMock) ReportBuildError(req *dashapi.BuildErrorReq) error { return nil } func (dm *dashapiMock) UploadBuild(build *dashapi.Build) error { return nil } -func (dm *dashapiMock) LogError(name, msg string, args ...interface{}) {} +func (dm *dashapiMock) LogError(name, msg string, args ...any) {} func (dm *dashapiMock) CommitPoll() (*dashapi.CommitPollResp, error) { return nil, nil } func (dm *dashapiMock) UploadCommits(commits []dashapi.Commit) error { return nil } diff --git a/syz-ci/managercmd.go b/syz-ci/managercmd.go index 8156282b5..785739c7f 100644 --- a/syz-ci/managercmd.go +++ b/syz-ci/managercmd.go @@ -26,7 +26,7 @@ type ManagerCmd struct { closing chan bool } -type Errorf func(msg string, args ...interface{}) +type Errorf func(msg string, args ...any) // NewManagerCmd starts new syz-manager process. // name - name for logging. -- cgit mrf-deployment