summaryrefslogtreecommitdiff
path: root/src/cmd/go
diff options
context:
space:
mode:
authorRob Pike <r@golang.org>2014-08-25 13:47:38 -0700
committerRob Pike <r@golang.org>2014-08-25 13:47:38 -0700
commit3784c88c145dba9ab677e22c496a4532d2c73fa4 (patch)
tree1ebc9adadbba77b9d3c91ed0b414c051a4fa3e54 /src/cmd/go
parent6ef7729edeee8c27b4fa4dcc732fc00c3fa5e6da (diff)
downloadgo-3784c88c145dba9ab677e22c496a4532d2c73fa4.tar.gz
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://codereview.appspot.com/126660043
Diffstat (limited to 'src/cmd/go')
-rw-r--r--src/cmd/go/generate.go2
-rw-r--r--src/cmd/go/generate_test.go1
2 files changed, 1 insertions, 2 deletions
diff --git a/src/cmd/go/generate.go b/src/cmd/go/generate.go
index 5859e9eef..167758207 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 881a8fe9b..93c0ae66e 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"}},
}