From bb355ed5ebb24179be4e1093c3dce12e23f21d56 Mon Sep 17 00:00:00 2001 From: Ahmet Soormally Date: Mon, 15 Jan 2018 12:12:46 +0000 Subject: [PATCH] regexp: dont use builtin type as variable name MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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/87775 Reviewed-by: Daniel Martí Reviewed-by: Brad Fitzpatrick Run-TryBot: Daniel Martí --- src/regexp/regexp.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/regexp/regexp.go b/src/regexp/regexp.go index 023920c91e..2e4c6e8926 100644 --- a/src/regexp/regexp.go +++ b/src/regexp/regexp.go @@ -235,9 +235,9 @@ func (re *Regexp) put(z *machine) { // It simplifies safe initialization of global variables holding compiled regular // expressions. func MustCompile(str string) *Regexp { - regexp, error := Compile(str) - if error != nil { - panic(`regexp: Compile(` + quote(str) + `): ` + error.Error()) + regexp, err := Compile(str) + if err != nil { + panic(`regexp: Compile(` + quote(str) + `): ` + err.Error()) } return regexp } @@ -246,9 +246,9 @@ func MustCompile(str string) *Regexp { // It simplifies safe initialization of global variables holding compiled regular // expressions. func MustCompilePOSIX(str string) *Regexp { - regexp, error := CompilePOSIX(str) - if error != nil { - panic(`regexp: CompilePOSIX(` + quote(str) + `): ` + error.Error()) + regexp, err := CompilePOSIX(str) + if err != nil { + panic(`regexp: CompilePOSIX(` + quote(str) + `): ` + err.Error()) } return regexp }