Merge 7028f18 into 7c05140

examples_test.go

@@ -175,15 +175,15 @@ func ExampleNew() {
 	// Output: errored! route 0 "GET /hello/:name": path and handler have different numbers of parameters
 }
 
-func ExampleError() {
+func ExampleTableError() {
 	_, err := rte.New(rte.Routes(
 		"GET /hello", func(w http.ResponseWriter, r *http.Request) {
 		},
 		"GET /hello/:name", func(w http.ResponseWriter, r *http.Request, a, b string) {
 		},
 	))
 
-	_, _ = fmt.Printf("%v", err.(rte.Error).Route)
+	_, _ = fmt.Printf("%v", err.(*rte.TableError).Route)
 
 	// Output: GET /hello/:name
 }

helper.go

@@ -78,13 +78,13 @@ func Routes(is ...interface{}) []Route {
 					r.Method = split[0]
 				}
 			}
-			if _, _, err := funcs.Convert(v); err != nil {
+			if _, _, ok := funcs.Convert(v); !ok {
 				panic(fmt.Sprintf(
-					"rte.Routes: invalid handler for \"%v %v\" in position %v: %v",
+					"rte.Routes: invalid handler for \"%v %v\" in position %v: %T",
 					r.Method,
 					r.Path,
 					idxHandler,
-					err,
+					v,
 				))
 			}
 			r.Handler = v

helper_test.go

@@ -316,7 +316,7 @@ func TestRoutes(t *testing.T) {
 			Args: []interface{}{
 				"GET /", func() {},
 			},
-			PanicVal: "rte.Routes: invalid handler for \"GET /\" in position 1: unknown handler type: func()",
+			PanicVal: "rte.Routes: invalid handler for \"GET /\" in position 1: func()",
 		},
 		{
 			Name: "prefix shorthand",