From: Rob Pike <r@golang.org>
Date: Mon, 25 Aug 2014 20:47:38 +0000 (-0700)
Subject: cmd/go: clean up a couple of inconsequential nits in generate
X-Git-Tag: go1.4beta1~701
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=958a6101eb75747555b2d5596de9ed93a54b83df;p=gostls13.git

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 5859e9eefd..167758207e 100644
--- 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 881a8fe9b6..93c0ae66e9 100644
--- 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"}},
 }