Bringing in latest from master; refactoring under way

1 files changed, 3 insertions, 37 deletions

diff --git a/middleware/rewrite/rewrite.go b/middleware/rewrite/rewrite.go
index 9ce9381e9..870438dc2 100644
--- a/middleware/rewrite/rewrite.go
+++ b/middleware/rewrite/rewrite.go
@@ -8,22 +8,10 @@ import (
 	"github.com/mholt/caddy/middleware"
 )
 
-// New instantiates a new Rewrites middleware.
-func New(c middleware.Controller) (middleware.Middleware, error) {
-	rewrites, err := parse(c)
-	if err != nil {
-		return nil, err
-	}
-
-	return func(next middleware.Handler) middleware.Handler {
-		return Rewrite{Next: next, Rules: rewrites}
-	}, nil
-}
-
 // Rewrite is middleware to rewrite request locations internally before being handled.
 type Rewrite struct {
 	Next  middleware.Handler
-	Rules []RewriteRule
+	Rules []Rule
 }
 
 // ServeHTTP implements the middleware.Handler interface.
@@ -37,29 +25,7 @@ func (rw Rewrite) ServeHTTP(w http.ResponseWriter, r *http.Request) (int, error)
 	return rw.Next.ServeHTTP(w, r)
 }
 
-func parse(c middleware.Controller) ([]RewriteRule, error) {
-	var rewrites []RewriteRule
-
-	for c.Next() {
-		var rule RewriteRule
-
-		if !c.NextArg() {
-			return rewrites, c.ArgErr()
-		}
-		rule.From = c.Val()
-
-		if !c.NextArg() {
-			return rewrites, c.ArgErr()
-		}
-		rule.To = c.Val()
-
-		rewrites = append(rewrites, rule)
-	}
-
-	return rewrites, nil
-}
-
-// RewriteRule describes an internal location rewrite rule.
-type RewriteRule struct {
+// A Rule describes an internal location rewrite rule.
+type Rule struct {
 	From, To string
 }