take advantage of methods on funcs

R=r
DELTA=14  (0 added, 13 deleted, 1 changed)
OCL=24458
CL=24470

diff --git a/src/lib/http/server.go b/src/lib/http/server.go
index 6747473c4727254bf5dd053cf3cbc026e980a0d2..ffb81cc90c9d150bfaeb6b7126160eec7232781f 100644 (file)
--- a/src/lib/http/server.go
+++ b/src/lib/http/server.go
@@ -220,24 +220,11 @@ func (c *Conn) Hijack() (fd io.ReadWriteClose, buf *bufio.BufReadWrite, err *os.
        return;
 }
 
-// Adapter: can use RequestFunction(f) as Handler
-type handlerFunc struct {
-       f func(*Conn, *Request)
-}
-func (h handlerFunc) ServeHTTP(c *Conn, req *Request) {
-       h.f(c, req)
-}
-func HandlerFunc(f func(*Conn, *Request)) Handler {
-       return handlerFunc{f}
-}
-
-/* simpler version of above, not accepted by 6g:
-
+// Adapter: can use HandlerFunc(f) as Handler
 type HandlerFunc func(*Conn, *Request)
 func (f HandlerFunc) ServeHTTP(c *Conn, req *Request) {
        f(c, req);
 }
-*/
 
 // Helper handlers