remove named returns and useless closures

matchers.go

@@ -21,9 +21,7 @@ func Any() Matcher {
 // starts with any of the strings in strs.
 func PrefixMatcher(strs ...string) Matcher {
 	pt := newPatriciaTreeString(strs...)
-	return func(r io.Reader) bool {
-		return pt.matchPrefix(r)
-	}
+	return pt.matchPrefix
 }
 
 var defaultHTTPMethods = []string{
@@ -84,9 +82,7 @@ var http2Preface = []byte(http2.ClientPreface)
 // HTTP2 parses the frame header of the first frame to detect whether the
 // connection is an HTTP2 connection.
 func HTTP2() Matcher {
-	return func(r io.Reader) bool {
-		return hasHTTP2Preface(r)
-	}
+	return hasHTTP2Preface
 }
 
 // HTTP1HeaderField returns a matcher matching the header fields of the first
@@ -105,7 +101,7 @@ func HTTP2HeaderField(name, value string) Matcher {
 	}
 }
 
-func hasHTTP2Preface(r io.Reader) (ok bool) {
+func hasHTTP2Preface(r io.Reader) bool {
 	b := make([]byte, len(http2Preface))
 	n, err := r.Read(b)
 	if err != nil {