From 8f844ea313f0cf0e2125cb4d6f58e60a8ce20080 Mon Sep 17 00:00:00 2001 From: Alexander Medvednikov Date: Sun, 2 Mar 2025 18:31:00 +0300 Subject: [PATCH] veb: deprecate vweb (part 3) --- vlib/v/checker/checker.v | 4 ++-- vlib/v/checker/tests/comptime_veb_vweb_call_err.out | 3 ++- vlib/v/checker/tests/invalid_vweb_param_type.out | 3 ++- vlib/v/checker/tests/vweb_missing_result.out | 1 + vlib/v/checker/tests/vweb_routing_checks.out | 1 + vlib/v/checker/tests/vweb_tmpl_used_var.out | 2 +- .../skip_unused/{x_vweb_run_at.run.out => veb_run_at.run.out} | 0 ..._at.skip_unused.run.out => veb_run_at.skip_unused.run.out} | 0 vlib/v/tests/skip_unused/{x_vweb_run_at.vv => veb_run_at.vv} | 0 vlib/v/tests/skip_unused/vweb_run_at.run.out | 1 + vlib/v/tests/skip_unused/vweb_run_at.skip_unused.run.out | 1 + 11 files changed, 11 insertions(+), 5 deletions(-) rename vlib/v/tests/skip_unused/{x_vweb_run_at.run.out => veb_run_at.run.out} (100%) rename vlib/v/tests/skip_unused/{x_vweb_run_at.skip_unused.run.out => veb_run_at.skip_unused.run.out} (100%) rename vlib/v/tests/skip_unused/{x_vweb_run_at.vv => veb_run_at.vv} (100%) diff --git a/vlib/v/checker/checker.v b/vlib/v/checker/checker.v index 4b9f08edc..dfdea9de3 100644 --- a/vlib/v/checker/checker.v +++ b/vlib/v/checker/checker.v @@ -2777,8 +2777,8 @@ fn (mut c Checker) hash_stmt(mut node ast.HashStmt) { fn (mut c Checker) import_stmt(node ast.Import) { if node.mod == 'x.vweb' { println('`x.vweb` is now `veb`. The module is no longer experimental. Simply `import veb` instead of `import x.vweb`.') - //} else if node.mod == 'vweb' { - // println('`vweb` has been deprecated. Please use the more stable and fast `veb` instead') + } else if node.mod == 'vweb' { + println('`vweb` has been deprecated. Please use the more stable and fast `veb` instead.') } c.check_valid_snake_case(node.alias, 'module alias', node.pos) for sym in node.syms { diff --git a/vlib/v/checker/tests/comptime_veb_vweb_call_err.out b/vlib/v/checker/tests/comptime_veb_vweb_call_err.out index da151c53f..57c017a71 100644 --- a/vlib/v/checker/tests/comptime_veb_vweb_call_err.out +++ b/vlib/v/checker/tests/comptime_veb_vweb_call_err.out @@ -1,5 +1,6 @@ +`vweb` has been deprecated. Please use the more stable and fast `veb` instead. vlib/v/checker/tests/comptime_veb_vweb_call_err.vv:5:2: error: `$veb.html()` must be called inside a web method, e.g. `fn (mut app App) foo(mut ctx Context) veb.Result { return $veb.html('index.html') }` - 3 | + 3 | 4 | fn main() { 5 | $veb.html('./templates/empty.html') | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/vlib/v/checker/tests/invalid_vweb_param_type.out b/vlib/v/checker/tests/invalid_vweb_param_type.out index 241191343..0e443ba48 100644 --- a/vlib/v/checker/tests/invalid_vweb_param_type.out +++ b/vlib/v/checker/tests/invalid_vweb_param_type.out @@ -1,5 +1,6 @@ +`vweb` has been deprecated. Please use the more stable and fast `veb` instead. vlib/v/checker/tests/invalid_vweb_param_type.vv:8:24: error: invalid type `[]bool` for parameter `list` in vweb app method `index` (only strings, numbers, and bools are allowed) - 6 | + 6 | 7 | @['/:list'; get] 8 | fn (mut app App) index(list []bool) vweb.Result { | ~~~~ diff --git a/vlib/v/checker/tests/vweb_missing_result.out b/vlib/v/checker/tests/vweb_missing_result.out index 19bfdc8cc..aa7915b6a 100644 --- a/vlib/v/checker/tests/vweb_missing_result.out +++ b/vlib/v/checker/tests/vweb_missing_result.out @@ -1,3 +1,4 @@ +`vweb` has been deprecated. Please use the more stable and fast `veb` instead. vlib/v/checker/tests/vweb_missing_result.vv:9:1: error: vweb actions must return `vweb.Result` 7 | // actions must return results 8 | @['/foo/:bar'] diff --git a/vlib/v/checker/tests/vweb_routing_checks.out b/vlib/v/checker/tests/vweb_routing_checks.out index 4b606566d..5afbb1bdd 100644 --- a/vlib/v/checker/tests/vweb_routing_checks.out +++ b/vlib/v/checker/tests/vweb_routing_checks.out @@ -1,3 +1,4 @@ +`vweb` has been deprecated. Please use the more stable and fast `veb` instead. vlib/v/checker/tests/vweb_routing_checks.vv:20:1: warning: mismatched parameters count between vweb method `App.bar` (1) and route attribute ['/bar'] (0) 18 | // segfault because path takes 0 vars and fcn takes 1 arg 19 | @['/bar'] diff --git a/vlib/v/checker/tests/vweb_tmpl_used_var.out b/vlib/v/checker/tests/vweb_tmpl_used_var.out index 8b1378917..7c80b67c9 100644 --- a/vlib/v/checker/tests/vweb_tmpl_used_var.out +++ b/vlib/v/checker/tests/vweb_tmpl_used_var.out @@ -1 +1 @@ - +`vweb` has been deprecated. Please use the more stable and fast `veb` instead. diff --git a/vlib/v/tests/skip_unused/x_vweb_run_at.run.out b/vlib/v/tests/skip_unused/veb_run_at.run.out similarity index 100% rename from vlib/v/tests/skip_unused/x_vweb_run_at.run.out rename to vlib/v/tests/skip_unused/veb_run_at.run.out diff --git a/vlib/v/tests/skip_unused/x_vweb_run_at.skip_unused.run.out b/vlib/v/tests/skip_unused/veb_run_at.skip_unused.run.out similarity index 100% rename from vlib/v/tests/skip_unused/x_vweb_run_at.skip_unused.run.out rename to vlib/v/tests/skip_unused/veb_run_at.skip_unused.run.out diff --git a/vlib/v/tests/skip_unused/x_vweb_run_at.vv b/vlib/v/tests/skip_unused/veb_run_at.vv similarity index 100% rename from vlib/v/tests/skip_unused/x_vweb_run_at.vv rename to vlib/v/tests/skip_unused/veb_run_at.vv diff --git a/vlib/v/tests/skip_unused/vweb_run_at.run.out b/vlib/v/tests/skip_unused/vweb_run_at.run.out index 19f86f493..61c5601eb 100644 --- a/vlib/v/tests/skip_unused/vweb_run_at.run.out +++ b/vlib/v/tests/skip_unused/vweb_run_at.run.out @@ -1 +1,2 @@ done +`vweb` has been deprecated. Please use the more stable and fast `veb` instead. diff --git a/vlib/v/tests/skip_unused/vweb_run_at.skip_unused.run.out b/vlib/v/tests/skip_unused/vweb_run_at.skip_unused.run.out index 19f86f493..61c5601eb 100644 --- a/vlib/v/tests/skip_unused/vweb_run_at.skip_unused.run.out +++ b/vlib/v/tests/skip_unused/vweb_run_at.skip_unused.run.out @@ -1 +1,2 @@ done +`vweb` has been deprecated. Please use the more stable and fast `veb` instead. -- 2.39.5