@@ -695,89 +695,89 @@ func TestSetFieldFromString(t *testing.T) {
695695 A any `json:"a"`
696696 }
697697
698- v := reflect .New (reflect .TypeOf ( testStruct {} )).Elem ()
698+ v := reflect .New (reflect .TypeFor [ testStruct ]( )).Elem ()
699699 t .Run ("string" , func (t * testing.T ) {
700- if err := setFieldFromString (v .Field (0 ), reflect .TypeOf ( "" ), "hello" ); err != nil {
700+ if err := setFieldFromString (v .Field (0 ), reflect .TypeFor [ string ]( ), "hello" ); err != nil {
701701 t .Fatal (err )
702702 }
703703 if v .Field (0 ).String () != "hello" {
704704 t .Fatal ("wrong string value" )
705705 }
706706 })
707707 t .Run ("bool" , func (t * testing.T ) {
708- if err := setFieldFromString (v .Field (1 ), reflect .TypeOf ( false ), "true" ); err != nil {
708+ if err := setFieldFromString (v .Field (1 ), reflect .TypeFor [ bool ]( ), "true" ); err != nil {
709709 t .Fatal (err )
710710 }
711711 if ! v .Field (1 ).Bool () {
712712 t .Fatal ("expected true" )
713713 }
714714 })
715715 t .Run ("uint32" , func (t * testing.T ) {
716- if err := setFieldFromString (v .Field (2 ), reflect .TypeOf ( uint32 ( 0 ) ), "42" ); err != nil {
716+ if err := setFieldFromString (v .Field (2 ), reflect .TypeFor [ uint32 ]( ), "42" ); err != nil {
717717 t .Fatal (err )
718718 }
719719 if v .Field (2 ).Uint () != 42 {
720720 t .Fatal ("wrong uint32" )
721721 }
722722 })
723723 t .Run ("uint64" , func (t * testing.T ) {
724- if err := setFieldFromString (v .Field (3 ), reflect .TypeOf ( uint64 ( 0 ) ), "1000000" ); err != nil {
724+ if err := setFieldFromString (v .Field (3 ), reflect .TypeFor [ uint64 ]( ), "1000000" ); err != nil {
725725 t .Fatal (err )
726726 }
727727 if v .Field (3 ).Uint () != 1000000 {
728728 t .Fatal ("wrong uint64" )
729729 }
730730 })
731731 t .Run ("int" , func (t * testing.T ) {
732- if err := setFieldFromString (v .Field (4 ), reflect .TypeOf ( 0 ), "99" ); err != nil {
732+ if err := setFieldFromString (v .Field (4 ), reflect .TypeFor [ int ]( ), "99" ); err != nil {
733733 t .Fatal (err )
734734 }
735735 if v .Field (4 ).Int () != 99 {
736736 t .Fatal ("wrong int" )
737737 }
738738 })
739739 t .Run ("int64" , func (t * testing.T ) {
740- if err := setFieldFromString (v .Field (5 ), reflect .TypeOf ( int64 ( 0 ) ), "-100" ); err != nil {
740+ if err := setFieldFromString (v .Field (5 ), reflect .TypeFor [ int64 ]( ), "-100" ); err != nil {
741741 t .Fatal (err )
742742 }
743743 if v .Field (5 ).Int () != - 100 {
744744 t .Fatal ("wrong int64" )
745745 }
746746 })
747747 t .Run ("*string" , func (t * testing.T ) {
748- if err := setFieldFromString (v .Field (6 ), reflect .TypeOf (( * string )( nil ) ), "hello" ); err != nil {
748+ if err := setFieldFromString (v .Field (6 ), reflect .TypeFor [ * string ]( ), "hello" ); err != nil {
749749 t .Fatal (err )
750750 }
751751 if v .Field (6 ).IsNil () || v .Field (6 ).Elem ().String () != "hello" {
752752 t .Fatal ("wrong *string" )
753753 }
754754 })
755755 t .Run ("*uint32" , func (t * testing.T ) {
756- if err := setFieldFromString (v .Field (7 ), reflect .TypeOf (( * uint32 )( nil ) ), "7" ); err != nil {
756+ if err := setFieldFromString (v .Field (7 ), reflect .TypeFor [ * uint32 ]( ), "7" ); err != nil {
757757 t .Fatal (err )
758758 }
759759 if v .Field (7 ).IsNil () || uint32 (v .Field (7 ).Elem ().Uint ()) != 7 {
760760 t .Fatal ("wrong *uint32" )
761761 }
762762 })
763763 t .Run ("map" , func (t * testing.T ) {
764- if err := setFieldFromString (v .Field (8 ), reflect .TypeOf ( map [string ]string {} ), `{"a":"b"}` ); err != nil {
764+ if err := setFieldFromString (v .Field (8 ), reflect .TypeFor [ map [string ]string ]( ), `{"a":"b"}` ); err != nil {
765765 t .Fatal (err )
766766 }
767767 if v .Field (8 ).Len () != 1 {
768768 t .Fatal ("wrong map length" )
769769 }
770770 })
771771 t .Run ("any" , func (t * testing.T ) {
772- if err := setFieldFromString (v .Field (9 ), reflect .TypeOf (( * any )( nil )). Elem (), "some_value" ); err != nil {
772+ if err := setFieldFromString (v .Field (9 ), reflect .TypeFor [ any ] (), "some_value" ); err != nil {
773773 t .Fatal (err )
774774 }
775775 if v .Field (9 ).Interface () != "some_value" {
776776 t .Fatal ("wrong any value" )
777777 }
778778 })
779779 t .Run ("bad bool" , func (t * testing.T ) {
780- if err := setFieldFromString (v .Field (1 ), reflect .TypeOf ( false ), "notabool" ); err == nil {
780+ if err := setFieldFromString (v .Field (1 ), reflect .TypeFor [ bool ]( ), "notabool" ); err == nil {
781781 t .Fatal ("expected error for bad bool" )
782782 }
783783 })
0 commit comments