x.json2: remove x.json2.[decoder,decoder_deprecated].v

Author: dy-tea

vlib/v/checker/tests/comptime_selector_assign.out

@@ -1,14 +1,14 @@
-vlib/v/checker/tests/comptime_selector_assign.vv:18:24: error: mismatched types: check field type with $if to avoid this problem
-   16 |                 typ.$(field.name) = 2
-   17 |             }
-   18 |             typ.$(field.name) = 3
+vlib/v/checker/tests/comptime_selector_assign.vv:19:24: error: mismatched types: check field type with $if to avoid this problem
+   17 |                 typ.$(field.name) = 2
+   18 |             }
+   19 |             typ.$(field.name) = 3
       |                                 ^
-   19 |         }
-   20 |     }
-vlib/v/checker/tests/comptime_selector_assign.vv:18:24: error: cannot assign to `typ.$(field.name)`: expected `string`, not `int literal`
-   16 |                 typ.$(field.name) = 2
-   17 |             }
-   18 |             typ.$(field.name) = 3
+   20 |         }
+   21 |     }
+vlib/v/checker/tests/comptime_selector_assign.vv:19:24: error: cannot assign to `typ.$(field.name)`: expected `string`, not `int literal`
+   17 |                 typ.$(field.name) = 2
+   18 |             }
+   19 |             typ.$(field.name) = 3
       |                                 ^
-   19 |         }
-   20 |     }
+   20 |         }
+   21 |     }

vlib/v/checker/tests/comptime_selector_assign.vv

@@ -1,4 +1,5 @@
-import x.json2 { Any, raw_decode }
+import x.json2.decoder2 { decode }
+import x.json2 { Any }
 
 struct Income {
 mut:
@@ -22,7 +23,7 @@ pub fn structuring[T](res Any) T {
 }
 
 fn main() {
-	res := raw_decode('{
+	res := decode[Any]('{
         "email": ["sdvsdv", "sds"],
         "code": 12
     }')!.as_map()

vlib/v/slow_tests/valgrind/import_x_json2.v

@@ -1,6 +1,7 @@
 import x.json2
+import x.json2.decoder2
 
 fn main() {
 	x := '[[],[],[]]'
-	println(json2.decode[json2.Any](x)!)
+	println(decoder2.decode[json2.Any](x)!)
 }

vlib/v/tests/aliases/alias_sumtype_method_call_test.v

@@ -1,4 +1,5 @@
 import x.json2
+import x.json2.decoder2
 
 type MyType = json2.Any
 
@@ -8,7 +9,7 @@ struct Data {
 
 fn test_alias_sumtype_method_call() {
 	a := '{"a":"a","b":1}'
-	json := json2.raw_decode(a) or { panic(err) }
+	json := decoder2.decode[json2.Any](a) or { panic(err) }
 	data := Data{json}
 	json_str := data.prop.str()
 	println(json_str)

vlib/v/tests/comptime/comptime_map_generic_test.v

@@ -1,4 +1,5 @@
 import x.json2
+import x.json2.decoder2
 
 struct User {
 pub mut:
@@ -7,7 +8,7 @@ pub mut:
 
 fn test_main() {
 	user_json := '{"numbers":{"home":"123456","work":"987653"}}'
-	res := json2.raw_decode(user_json)!.as_map()
+	res := decoder2.decode[json2.Any](user_json)!.as_map()
 
 	mut numbers := map[string]string{}
 	decode_map(mut numbers, res['numbers']!.as_map())!

vlib/v/tests/result_with_index_expr_test.v

@@ -1,4 +1,5 @@
 import x.json2
+import x.json2.decoder2
 
 struct SomeStruct {
 	title string
@@ -11,7 +12,7 @@ fn test_result_with_index() {
   		"title": "sunt aut facere repellat provident occaecati excepturi optio reprehenderit",
   		"body": "quia et suscipitsuscipit recusandae consequuntur expedita et cumreprehenderit molestiae ut ut quas totamnostrum rerum est autem sunt rem eveniet architecto"
 }'
-	raw_data := json2.raw_decode(resp)!
+	raw_data := decoder2.decode[json2.Any](resp)!
 
 	data := raw_data as map[string]json2.Any
 

vlib/v/tests/skip_unused/generic_call_from_json.vv

@@ -1,5 +1,6 @@
 import veb
 import x.json2
+import x.json2.decoder2
 
 pub struct Context {
 	veb.Context
@@ -11,7 +12,7 @@ pub struct App {
 
 @['/'; POST]
 fn (app &App) index(mut ctx Context) veb.Result {
-	j := json2.raw_decode(ctx.req.data) or { return ctx.request_error('error') }
+  j := decoder2.decode[json2.Any](ctx.req.data) or { return ctx.request_error('error') }
 
 	m := j.as_map()
 	myarr := m['myarr'] or { panic(error) }

vlib/veb/tests/handle_split_requests_in_chrome_test.v

@@ -2,7 +2,7 @@ import log
 import veb
 import time
 import net
-import x.json2
+import x.json2.decoder2
 import net.http
 
 const port = 31228
@@ -84,7 +84,7 @@ Priority: u=4\r
 	assert response.contains('Content-Length: 706')
 	assert response.contains('Content-Type: application/json')
 	payload := response.all_after('\r\n\r\n')
-	r := json2.decode[http.FileData](payload)!
+	r := decoder2.decode[http.FileData](payload)!
 	dump(r.filename)
 	dump(r.content_type)
 	assert r.filename == 'Seeker.svg'

vlib/veb/tests/veb_test.v

@@ -1,6 +1,7 @@
 import os
 import time
 import x.json2 as json
+import x.json2.decoder2
 import net
 import net.http
 import io
@@ -205,7 +206,7 @@ fn test_http_client_json_post() {
 	}
 	assert x.header.get(.content_type)! == 'application/json'
 	assert x.body == json_for_ouser
-	nuser := json.decode[User](x.body) or { User{} }
+	nuser := decoder2.decode[User](x.body) or { User{} }
 	assert '${ouser}' == '${nuser}'
 
 	x = http.post_json('http://${localserver}/json', json_for_ouser) or { panic(err) }
@@ -214,7 +215,7 @@ fn test_http_client_json_post() {
 	}
 	assert x.header.get(.content_type)! == 'application/json'
 	assert x.body == json_for_ouser
-	nuser2 := json.decode[User](x.body) or { User{} }
+	nuser2 := decoder2.decode[User](x.body) or { User{} }
 	assert '${ouser}' == '${nuser2}'
 }
 

vlib/vweb/tests/vweb_test.v

@@ -1,6 +1,7 @@
 // vtest build: !windows
 import io
 import x.json2 as json
+import x.json2.decoder2
 import time
 import net
 import net.http
@@ -150,7 +151,7 @@ fn test_http_client_json_post() {
 	}
 	assert x.header.get(.content_type)! == 'application/json'
 	assert x.body == json_for_ouser
-	nuser := json.decode[User](x.body) or { User{} }
+	nuser := decoder2.decode[User](x.body) or { User{} }
 	assert '${ouser}' == '${nuser}'
 
 	x = http.post_json('http://${localserver}/json', json_for_ouser) or { panic(err) }
@@ -159,7 +160,7 @@ fn test_http_client_json_post() {
 	}
 	assert x.header.get(.content_type)! == 'application/json'
 	assert x.body == json_for_ouser
-	nuser2 := json.decode[User](x.body) or { User{} }
+	nuser2 := decoder2.decode[User](x.body) or { User{} }
 	assert '${ouser}' == '${nuser2}'
 }