From 515358b18dc47f7d29229af3272b376345bd1790 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Sun, 24 Nov 2024 14:23:31 +0000 Subject: [PATCH] remove two unused fields from sharedCache ExecPath is only used within toolexecCmd, so make it a local variable. GOMOD hasn't been used since we dropped the use of GOPRIVATE. --- main.go | 7 +++---- shared.go | 2 -- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/main.go b/main.go index 8202fb2..42e53af 100644 --- a/main.go +++ b/main.go @@ -577,8 +577,7 @@ This command wraps "go %s". Below is its help: return nil, errJustExit(1) } - var err error - sharedCache.ExecPath, err = os.Executable() + execPath, err := os.Executable() if err != nil { return nil, err } @@ -597,7 +596,7 @@ This command wraps "go %s". Below is its help: sharedCache.CacheDir = filepath.Join(parentDir, "garble") } - binaryBuildID, err := buildidOf(sharedCache.ExecPath) + binaryBuildID, err := buildidOf(execPath) if err != nil { return nil, err } @@ -643,7 +642,7 @@ This command wraps "go %s". Below is its help: // We can add extra flags to the end of the same -toolexec argument. var toolexecFlag strings.Builder toolexecFlag.WriteString("-toolexec=") - quotedExecPath, err := cmdgoQuotedJoin([]string{sharedCache.ExecPath}) + quotedExecPath, err := cmdgoQuotedJoin([]string{execPath}) if err != nil { // Can only happen if the absolute path to the garble binary contains // both single and double quotes. Seems extremely unlikely. diff --git a/shared.go b/shared.go index 287d727..69a878d 100644 --- a/shared.go +++ b/shared.go @@ -30,7 +30,6 @@ import ( // store it into a temporary file via gob encoding, and then reuse that file // in each of the garble toolexec sub-processes. type sharedCacheType struct { - ExecPath string // absolute path to the garble binary being used ForwardBuildFlags []string // build flags fed to the original "garble ..." command CacheDir string // absolute path to the GARBLE_CACHE directory being used @@ -63,7 +62,6 @@ type sharedCacheType struct { GOOS string // the GOOS build target GOARCH string // the GOARCH build target - GOMOD string GOVERSION string GOROOT string }