version 12.1.5

Former-commit-id: cda69f08955cb0d594e98bf26197ee573cbba4b2

core/handlerconv/from_std.go

@@ -14,13 +14,13 @@ import (
 // 		 .FromStd(func(w http.ResponseWriter, r *http.Request))
 // 		 .FromStd(func(w http.ResponseWriter, r *http.Request, next http.HandlerFunc))
 func FromStd(handler interface{}) context.Handler {
-	switch handler.(type) {
+	switch h := handler.(type) {
 	case context.Handler:
 		{
 			//
 			// it's already a iris handler
 			//
-			return handler.(context.Handler)
+			return h
 		}
 
 	case http.Handler:
@@ -28,7 +28,6 @@ func FromStd(handler interface{}) context.Handler {
 		// handlerFunc.ServeHTTP(w,r)
 		//
 		{
-			h := handler.(http.Handler)
 			return func(ctx context.Context) {
 				h.ServeHTTP(ctx.ResponseWriter(), ctx.Request())
 			}
@@ -39,7 +38,7 @@ func FromStd(handler interface{}) context.Handler {
 			//
 			// handlerFunc(w,r)
 			//
-			return FromStd(http.HandlerFunc(handler.(func(http.ResponseWriter, *http.Request))))
+			return FromStd(http.HandlerFunc(h))
 		}
 
 	case func(http.ResponseWriter, *http.Request, http.HandlerFunc):
@@ -47,7 +46,7 @@ func FromStd(handler interface{}) context.Handler {
 			//
 			// handlerFunc(w,r, http.HandlerFunc)
 			//
-			return FromStdWithNext(handler.(func(http.ResponseWriter, *http.Request, http.HandlerFunc)))
+			return FromStdWithNext(h)
 		}
 
 	default:

core/handlerconv/from_std_test.go

@@ -15,7 +15,10 @@ import (
 func TestFromStd(t *testing.T) {
 	expected := "ok"
 	std := func(w http.ResponseWriter, r *http.Request) {
-		w.Write([]byte(expected))
+		_, err := w.Write([]byte(expected))
+		if err != nil {
+			t.Fatal(err)
+		}
 	}
 
 	h := handlerconv.FromStd(http.HandlerFunc(std))