src/pkg/[n-z]*: gofix -r error -force=error
R=golang-dev, bsiegert, iant
CC=golang-dev
https://golang.org/cl/5294074
diff --git a/src/pkg/regexp/exec_test.go b/src/pkg/regexp/exec_test.go
index 905fd4e..499d1a5 100644
--- a/src/pkg/regexp/exec_test.go
+++ b/src/pkg/regexp/exec_test.go
@@ -104,7 +104,7 @@
for {
line, err := r.ReadString('\n')
if err != nil {
- if err == os.EOF {
+ if err == io.EOF {
break
}
t.Fatalf("%s:%d: %v", file, lineno, err)
@@ -141,7 +141,7 @@
}
re, err = tryCompile(q)
if err != nil {
- if err.String() == "error parsing regexp: invalid escape sequence: `\\C`" {
+ if err.Error() == "error parsing regexp: invalid escape sequence: `\\C`" {
// We don't and likely never will support \C; keep going.
continue
}
@@ -275,7 +275,7 @@
return true
}
-func tryCompile(s string) (re *Regexp, err os.Error) {
+func tryCompile(s string) (re *Regexp, err error) {
// Protect against panic during Compile.
defer func() {
if r := recover(); r != nil {
@@ -370,7 +370,7 @@
lineno++
line, err := b.ReadString('\n')
if err != nil {
- if err != os.EOF {
+ if err != io.EOF {
t.Errorf("%s:%d: %v", file, lineno, err)
}
break Reading
@@ -629,7 +629,7 @@
return
}
var v = -1
- var err os.Error
+ var err error
if s[:i] != "?" {
v, err = strconv.Atoi(s[:i])
if err != nil {
