Commit bb355ed5 authored by Ahmet Soormally's avatar Ahmet Soormally Committed by Brad Fitzpatrick

regexp: dont use builtin type as variable name

The existing implementation declares a variable error which collides
with builting type error.

This change simply renames error variable to err.

Change-Id: Ib56c2530f37f53ec70fdebb825a432d4c550cd04
Reviewed-on: https://go-review.googlesource.com/87775Reviewed-by: default avatarDaniel Martí <mvdan@mvdan.cc>
Reviewed-by: default avatarBrad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Daniel Martí <mvdan@mvdan.cc>
parent eb5925f5
...@@ -235,9 +235,9 @@ func (re *Regexp) put(z *machine) { ...@@ -235,9 +235,9 @@ func (re *Regexp) put(z *machine) {
// It simplifies safe initialization of global variables holding compiled regular // It simplifies safe initialization of global variables holding compiled regular
// expressions. // expressions.
func MustCompile(str string) *Regexp { func MustCompile(str string) *Regexp {
regexp, error := Compile(str) regexp, err := Compile(str)
if error != nil { if err != nil {
panic(`regexp: Compile(` + quote(str) + `): ` + error.Error()) panic(`regexp: Compile(` + quote(str) + `): ` + err.Error())
} }
return regexp return regexp
} }
...@@ -246,9 +246,9 @@ func MustCompile(str string) *Regexp { ...@@ -246,9 +246,9 @@ func MustCompile(str string) *Regexp {
// It simplifies safe initialization of global variables holding compiled regular // It simplifies safe initialization of global variables holding compiled regular
// expressions. // expressions.
func MustCompilePOSIX(str string) *Regexp { func MustCompilePOSIX(str string) *Regexp {
regexp, error := CompilePOSIX(str) regexp, err := CompilePOSIX(str)
if error != nil { if err != nil {
panic(`regexp: CompilePOSIX(` + quote(str) + `): ` + error.Error()) panic(`regexp: CompilePOSIX(` + quote(str) + `): ` + err.Error())
} }
return regexp return regexp
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment