json2: minor fixes

Author: medvednikov

.github/workflows/other_ci.yml

@@ -103,7 +103,7 @@ jobs:
       - name: Repeat -o hw.c examples/hello_world.v
         run: ./v repeat --max_time 280 --series 3 --runs 20 --nmins 2 --nmaxs 5 --warmup 3 --fail_percent 10 -t 'cd {T} ; ./v -o hw.c examples/hello_world.v' . ./vmaster
       - name: Repeat -o v.c cmd/v
-        run: ./v repeat --max_time 2800 --series 3 --runs 20 --nmins 2 --nmaxs 5 --warmup 3 --fail_percent 10 -t 'cd {T} ; ./v -o v.c cmd/v' . ./vmaster
+        run: ./v repeat --max_time 4000 --series 3 --runs 20 --nmins 2 --nmaxs 5 --warmup 3 --fail_percent 10 -t 'cd {T} ; ./v -o v.c cmd/v' . ./vmaster
 
   misc-tooling:
     runs-on: ubuntu-24.04

vlib/x/json2/encode.v

@@ -443,21 +443,25 @@ fn (mut encoder Encoder) encode_sumtype[T](val T) {
 		$for variant in T.variants {
 			if val is variant {
 				variant_name := sumtype_variant_name(typeof(variant.typ).name)
-				if T.name in ['x.json2.Any', 'json2.Any', 'Any'] {
-					$if variant.typ is $map {
-						encoder.encode_value(val)
-					} $else {
+				$if variant.typ is time.Time {
+					if T.name in ['x.json2.Any', 'json2.Any', 'Any'] {
 						variant_value := val
 						encoder.encode_value(variant_value)
-					}
-				} else {
-					$if variant.typ is time.Time {
+					} else {
 						encoder.encode_sumtype_time_variant(val, variant_name)
-					} $else $if variant.typ is $struct {
+					}
+				} $else $if variant.typ is $struct {
+					if T.name in ['x.json2.Any', 'json2.Any', 'Any'] {
+						variant_value := val
+						encoder.encode_value(variant_value)
+					} else {
 						encoder.encode_sumtype_struct_variant(val, variant_name)
-					} $else {
-						encoder.encode_value(val)
 					}
+				} $else $if variant.typ is $map {
+					encoder.encode_value(val)
+				} $else {
+					variant_value := val
+					encoder.encode_value(variant_value)
 				}
 			}
 		}