aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad Fitzpatrick <bradfitz@golang.org>2013-05-02 18:59:39 -0700
committerBrad Fitzpatrick <bradfitz@golang.org>2013-05-02 18:59:39 -0700
commit7cc0581f86e3f77de44700a0a56c384d9d3677a4 (patch)
tree1704770ffc204622939a1569485463f7511e01d2
parenta941491b4eb3e877f64ba5dba24c1c3550e9d872 (diff)
downloadgo-7cc0581f86e3f77de44700a0a56c384d9d3677a4.tar.gz
go-7cc0581f86e3f77de44700a0a56c384d9d3677a4.zip
regexp: doc fix
This must have been from when "error" was a good variable name for an "os.Error". But we use "err" these days. R=golang-dev, dsymonds, r CC=golang-dev https://golang.org/cl/9132045
-rw-r--r--src/pkg/regexp/regexp.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/pkg/regexp/regexp.go b/src/pkg/regexp/regexp.go
index 6f6908a74f..c392b376f1 100644
--- a/src/pkg/regexp/regexp.go
+++ b/src/pkg/regexp/regexp.go
@@ -397,7 +397,7 @@ func (re *Regexp) Match(b []byte) bool {
// MatchReader checks whether a textual regular expression matches the text
// read by the RuneReader. More complicated queries need to use Compile and
// the full Regexp interface.
-func MatchReader(pattern string, r io.RuneReader) (matched bool, error error) {
+func MatchReader(pattern string, r io.RuneReader) (matched bool, err error) {
re, err := Compile(pattern)
if err != nil {
return false, err
@@ -408,7 +408,7 @@ func MatchReader(pattern string, r io.RuneReader) (matched bool, error error) {
// MatchString checks whether a textual regular expression
// matches a string. More complicated queries need
// to use Compile and the full Regexp interface.
-func MatchString(pattern string, s string) (matched bool, error error) {
+func MatchString(pattern string, s string) (matched bool, err error) {
re, err := Compile(pattern)
if err != nil {
return false, err
@@ -419,7 +419,7 @@ func MatchString(pattern string, s string) (matched bool, error error) {
// Match checks whether a textual regular expression
// matches a byte slice. More complicated queries need
// to use Compile and the full Regexp interface.
-func Match(pattern string, b []byte) (matched bool, error error) {
+func Match(pattern string, b []byte) (matched bool, err error) {
re, err := Compile(pattern)
if err != nil {
return false, err