Stowage/go
2
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-12-08 06:10:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

src/pkg/[n-z]*: gofix -r error -force=error

Browse source 
R=golang-dev, bsiegert, iant
CC=golang-dev
https://golang.org/cl/5294074
This commit is contained in:
Russ Cox 2011-11-01 22:05:34 -04:00
parent c2049d2dfe
commit eb6929299b
166 changed files with 1139 additions and 1238 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/pkg/regexp/exec_test.go
View file

@ -104,7 +104,7 @@ func testRE2(t *testing.T, file string) {
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 @@ func testRE2(t *testing.T, file string) {
}
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 @@ func isSingleBytes(s string) bool {
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 @@ Reading:
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 @@ func parseFowlerResult(s string) (ok, compiled, matched bool, pos []int) {
return
}
var v = -1
var err os.Error
var err error
if s[:i] != "?" {
v, err = strconv.Atoi(s[:i])
if err != nil {