Simplify return statements in tryReadGoDirective

owen-mc · owen-mc · commit 62653fbec5fb · 2023-05-03T16:55:19.000+01:00
This makes it easier to reason about what is returned and would have
avoided the bug with variable shadowing.
diff --git a/go/extractor/cli/go-autobuilder/go-autobuilder.go b/go/extractor/cli/go-autobuilder/go-autobuilder.go
@@ -269,8 +269,6 @@ func getDepMode() DependencyInstallerMode {
 
 // Tries to open `go.mod` and read a go directive, returning the version and whether it was found.
 func tryReadGoDirective(depMode DependencyInstallerMode) (string, bool) {
-	version := ""
-	found := false
 	if depMode == GoGetWithModules {
 		versionRe := regexp.MustCompile(`(?m)^go[ \t\r]+([0-9]+\.[0-9]+)$`)
 		goMod, err := os.ReadFile("go.mod")
@@ -279,14 +277,13 @@ func tryReadGoDirective(depMode DependencyInstallerMode) (string, bool) {
 		} else {
 			matches := versionRe.FindSubmatch(goMod)
 			if matches != nil {
-				found = true
 				if len(matches) > 1 {
-					version = string(matches[1])
+					return string(matches[1]), true
 				}
 			}
 		}
 	}
-	return version, found
+	return "", false
 }
 
 // Returns the appropriate ModMode for the current project

Original file line number	Diff line number	Diff line change
`@@ -269,8 +269,6 @@ func getDepMode() DependencyInstallerMode {`
`269`	`269`
`270`	`270`	// Tries to open `go.mod` and read a go directive, returning the version and whether it was found.
`271`	`271`	`func tryReadGoDirective(depMode DependencyInstallerMode) (string, bool) {`
`272`		`- version := ""`
`273`		`- found := false`
`274`	`272`	`if depMode == GoGetWithModules {`
`275`	`273`	versionRe := regexp.MustCompile(`(?m)^go[ \t\r]+([0-9]+\.[0-9]+)$`)
`276`	`274`	`goMod, err := os.ReadFile("go.mod")`
`@@ -279,14 +277,13 @@ func tryReadGoDirective(depMode DependencyInstallerMode) (string, bool) {`
`279`	`277`	`} else {`
`280`	`278`	`matches := versionRe.FindSubmatch(goMod)`
`281`	`279`	`if matches != nil {`
`282`		`- found = true`
`283`	`280`	`if len(matches) > 1 {`
`284`		`- version = string(matches[1])`
	`281`	`+ return string(matches[1]), true`
`285`	`282`	`}`
`286`	`283`	`}`
`287`	`284`	`}`
`288`	`285`	`}`
`289`		`- return version, found`
	`286`	`+ return "", false`
`290`	`287`	`}`
`291`	`288`
`292`	`289`	`// Returns the appropriate ModMode for the current project`