cmd/go: clean up a couple of inconsequential nits in generate

Post-submit glitches caught by reviewers.

LGTM=nightlyone, bradfitz
R=golang-codereviews, nightlyone, bradfitz
CC=golang-codereviews
https://golang.org/cl/126660043

diff --git a/src/cmd/go/generate.go b/src/cmd/go/generate.go
index 5859e9eefd9bfd6147b24b8fb5cd377f41d22a81..167758207e3301a8703a80fdddc0ab090728a8c2 100644 (file)
--- a/src/cmd/go/generate.go
+++ b/src/cmd/go/generate.go
@@ -161,7 +161,7 @@ type Generator struct {
 // run runs the generators in the current file.
 func (g *Generator) run() (ok bool) {
        // Processing below here calls g.errorf on failure, which does panic(stop).
-       // If we encouter an error, we abort the package.
+       // If we encounter an error, we abort the package.
        defer func() {
                e := recover()
                if e != nil {

diff --git a/src/cmd/go/generate_test.go b/src/cmd/go/generate_test.go
index 881a8fe9b60b822166721a5b55c9e69024afd5cb..93c0ae66e9b3d592030b5da58bfc81d45d26cc65 100644 (file)
--- a/src/cmd/go/generate_test.go
+++ b/src/cmd/go/generate_test.go
@@ -26,7 +26,6 @@ var splitTests = []splitTest{
        {"$GOPACKAGE", []string{"sys"}},
        {"a $XXNOTDEFINEDXX b", []string{"a", "", "b"}},
        {"/$XXNOTDEFINED/", []string{"//"}},
-       {"$GOARCH", []string{runtime.GOARCH}},
        {"yacc -o $GOARCH/yacc_$GOFILE", []string{"go", "tool", "yacc", "-o", runtime.GOARCH + "/yacc_proc.go"}},
 }