From 2a10dc7f417c97a7c0be6a4e325d7609e9e14fc4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Sun, 25 Jun 2023 13:17:09 +0100
Subject: [PATCH] minor tweaks in preparation for Go 1.21

Update CI to use a newer version of Go master,
now that we're already getting release candidates.

Look at the diffs between Go 1.20 and master of `go help build`
and `go help testflag`, and add two flags that were recently added.

While here, bump a hopeful TODO for a feature request,
since that one definitely did not happen for 1.21.
---
 .github/workflows/test.yml | 2 +-
 main.go                    | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 1a15351..6dd06ef 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -91,7 +91,7 @@ jobs:
     - uses: actions/checkout@v3
     - name: Install Go
       env:
-        GO_COMMIT: 363713223385476b87dc5f26d267df8c67d13006 # 2023-06-03
+        GO_COMMIT: a031f4ef83edc132d5f49382bfef491161de2476 # 2023-06-24
       run: |
         cd $HOME
         mkdir $HOME/gotip
diff --git a/main.go b/main.go
index 484a6aa..9245ba9 100644
--- a/main.go
+++ b/main.go
@@ -356,7 +356,7 @@ func mainErr(args []string) error {
 
 		// Until https://github.com/golang/go/issues/50603 is implemented,
 		// manually construct something like a pseudo-version.
-		// TODO: remove when this code is dead, hopefully in Go 1.21.
+		// TODO: remove when this code is dead, hopefully in Go 1.22.
 		if mod.Version == "(devel)" {
 			var vcsTime time.Time
 			var vcsRevision string
@@ -2107,6 +2107,7 @@ var forwardBuildFlags = map[string]bool{
 	"-buildmode":     true,
 	"-compiler":      true,
 	"-cover":         true,
+	"-covermode":     true,
 	"-coverpkg":      true,
 	"-gccgoflags":    true,
 	"-gcflags":       true,
@@ -2149,6 +2150,7 @@ var booleanFlags = map[string]bool{
 	"-benchmem": true,
 	"-c":        true,
 	"-failfast": true,
+	"-fullpath": true,
 	"-json":     true,
 	"-short":    true,
 }