From c939e4df97fa37f0d1814ec23cd9fb6c3075ae05 Mon Sep 17 00:00:00 2001
From: Delyan Angelov <delian66@gmail.com>
Date: Sun, 11 Apr 2021 11:28:52 +0300
Subject: [PATCH] x.json2: fix `direct sum type init` notices

---
 vlib/x/json2/decoder.v      |  2 +-
 vlib/x/json2/decoder_test.v | 16 ++++++++--------
 vlib/x/json2/json2_test.v   |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/vlib/x/json2/decoder.v b/vlib/x/json2/decoder.v
index 645e6332fd..5758a3e562 100644
--- a/vlib/x/json2/decoder.v
+++ b/vlib/x/json2/decoder.v
@@ -144,7 +144,7 @@ fn (mut p Parser) decode_value() ?Any {
 			})
 		}
 	}
-	return Any{}
+	return Any(null)
 }
 
 fn (mut p Parser) decode_array() ?Any {
diff --git a/vlib/x/json2/decoder_test.v b/vlib/x/json2/decoder_test.v
index 9168c8e965..fab947a1a4 100644
--- a/vlib/x/json2/decoder_test.v
+++ b/vlib/x/json2/decoder_test.v
@@ -3,7 +3,7 @@ import x.json2
 fn test_raw_decode_string() {
 	str := json2.raw_decode('"Hello!"') or {
 		assert false
-		json2.Any{}
+		json2.Any(json2.null)
 	}
 	assert str.str() == 'Hello!'
 }
@@ -11,7 +11,7 @@ fn test_raw_decode_string() {
 fn test_raw_decode_number() {
 	num := json2.raw_decode('123') or {
 		assert false
-		json2.Any{}
+		json2.Any(json2.null)
 	}
 	assert num.int() == 123
 }
@@ -19,7 +19,7 @@ fn test_raw_decode_number() {
 fn test_raw_decode_array() {
 	raw_arr := json2.raw_decode('["Foo", 1]') or {
 		assert false
-		json2.Any{}
+		json2.Any(json2.null)
 	}
 	arr := raw_arr.arr()
 	assert arr[0].str() == 'Foo'
@@ -29,7 +29,7 @@ fn test_raw_decode_array() {
 fn test_raw_decode_bool() {
 	bol := json2.raw_decode('false') or {
 		assert false
-		json2.Any{}
+		json2.Any(json2.null)
 	}
 	assert bol.bool() == false
 }
@@ -37,7 +37,7 @@ fn test_raw_decode_bool() {
 fn test_raw_decode_map() {
 	raw_mp := json2.raw_decode('{"name":"Bob","age":20}') or {
 		assert false
-		json2.Any{}
+		json2.Any(json2.null)
 	}
 	mp := raw_mp.as_map()
 	assert mp['name'].str() == 'Bob'
@@ -47,7 +47,7 @@ fn test_raw_decode_map() {
 fn test_raw_decode_null() {
 	nul := json2.raw_decode('null') or {
 		assert false
-		json2.Any{}
+		json2.Any(json2.null)
 	}
 	assert nul is json2.Null
 }
@@ -63,7 +63,7 @@ fn test_raw_decode_invalid() {
 fn test_raw_decode_string_with_dollarsign() {
 	str := json2.raw_decode(r'"Hello $world"') or {
 		assert false
-		json2.Any{}
+		json2.Any(json2.null)
 	}
 	assert str.str() == r'Hello $world'
 }
@@ -72,7 +72,7 @@ fn test_raw_decode_map_with_whitespaces() {
 	raw_mp := json2.raw_decode(' \n\t{"name":"Bob","age":20}\n\t') or {
 		eprintln(err.msg)
 		assert false
-		json2.Any{}
+		json2.Any(json2.null)
 	}
 	mp := raw_mp.as_map()
 	assert mp['name'].str() == 'Bob'
diff --git a/vlib/x/json2/json2_test.v b/vlib/x/json2/json2_test.v
index 5df73f9c5d..b808f421ca 100644
--- a/vlib/x/json2/json2_test.v
+++ b/vlib/x/json2/json2_test.v
@@ -63,7 +63,7 @@ fn test_fast_raw_decode() {
 	s := '{"name":"Peter","age":28,"salary":95000.5,"title":2}'
 	o := json2.fast_raw_decode(s) or {
 		assert false
-		json2.Any{}
+		json2.Any(json2.null)
 	}
 	str := o.str()
 	assert str == '{"name":"Peter","age":"28","salary":"95000.5","title":"2"}'