Upstream go-playground/form state of the touched files before a6a8473901

decoder.go

@@ -199,11 +199,6 @@ func (d *decoder) setFieldByType(current reflect.Value, namespace []byte, idx in
 					return
 				}
 
-				// Set would panic on the invalid zero Value, so nil leaves the field alone.
-				if val == nil {
-					return
-				}
-
 				v.Set(reflect.ValueOf(val))
 				set = true
 				return

decoder_test.go

@@ -1881,36 +1881,6 @@ func TestDecoder_RegisterCustomTypeFunc(t *testing.T) {
 	Equal(t, v.Slice, []customString{"customv1", "customv2"})
 }
 
-func TestDecoder_CustomTypeFuncPointerNilValue(t *testing.T) {
-	type User struct {
-		Name string
-	}
-
-	type TestStruct struct {
-		U *User `form:"u"`
-	}
-
-	d := NewDecoder()
-	d.RegisterCustomTypeFunc(func(vals []string) (interface{}, error) {
-		if vals[0] == "" {
-			// "Leave the field at its zero value" must not panic on a pointer field.
-			return nil, nil
-		}
-		return &User{Name: vals[0]}, nil
-	}, &User{})
-
-	var empty TestStruct
-	err := d.Decode(&empty, url.Values{"u": {""}})
-	Equal(t, err, nil)
-	Equal(t, empty.U, nil)
-
-	var populated TestStruct
-	err = d.Decode(&populated, url.Values{"u": {"bob"}})
-	Equal(t, err, nil)
-	NotEqual(t, populated.U, nil)
-	Equal(t, populated.U.Name, "bob")
-}
-
 func TestDecoder_EmptyArrayString(t *testing.T) {
 	type T1 struct {
 		F1 string `form:"F1"`