From bb42e1ce7378577ee2f988894f5cd9ebe797ed7f Mon Sep 17 00:00:00 2001 From: Turiiya <34311583+ttytm@users.noreply.github.com> Date: Wed, 3 Apr 2024 19:58:59 +0200 Subject: [PATCH] checker: remove resolved vfmt workaround and TODO (#21175) --- .../tests/modules/deprecated_module.out | 31 +++++++++---------- .../tests/modules/deprecated_module/main.v | 4 --- 2 files changed, 15 insertions(+), 20 deletions(-) diff --git a/vlib/v/checker/tests/modules/deprecated_module.out b/vlib/v/checker/tests/modules/deprecated_module.out index 87056136f2..ed74c4f391 100644 --- a/vlib/v/checker/tests/modules/deprecated_module.out +++ b/vlib/v/checker/tests/modules/deprecated_module.out @@ -1,19 +1,18 @@ -vlib/v/checker/tests/modules/deprecated_module/main.v:5:1: notice: module `deprecated_module.www.ttt` will be deprecated after 2999-01-01, and will become an error after 2999-06-30; use xxx.yyy - 3 | // That is unrelated to what this file tests, but should be investigated further and fixed when the module lookup disrepancy is fixed. - 4 | import bbb.ccc - 5 | import www.ttt +vlib/v/checker/tests/modules/deprecated_module/main.v:2:1: notice: module `deprecated_module.www.ttt` will be deprecated after 2999-01-01, and will become an error after 2999-06-30; use xxx.yyy + 1 | import bbb.ccc + 2 | import www.ttt | ~~~~~~~~~~~~~~ - 6 | import xxx.yyy - 7 | // vfmt on -vlib/v/checker/tests/modules/deprecated_module/main.v:16:11: error: undefined ident: `deprecated_module.www.ttt.non_existing` - 14 | dump(ttt.f()) - 15 | dump(yyy.f()) - 16 | dump(ttt.non_existing) + 3 | import xxx.yyy + 4 | +vlib/v/checker/tests/modules/deprecated_module/main.v:12:11: error: undefined ident: `deprecated_module.www.ttt.non_existing` + 10 | dump(ttt.f()) + 11 | dump(yyy.f()) + 12 | dump(ttt.non_existing) | ~~~~~~~~~~~~ - 17 | } -vlib/v/checker/tests/modules/deprecated_module/main.v:16:11: error: dump expression can not be void - 14 | dump(ttt.f()) - 15 | dump(yyy.f()) - 16 | dump(ttt.non_existing) + 13 | } +vlib/v/checker/tests/modules/deprecated_module/main.v:12:11: error: dump expression can not be void + 10 | dump(ttt.f()) + 11 | dump(yyy.f()) + 12 | dump(ttt.non_existing) | ~~~~~~~~~~~~ - 17 | } + 13 | } diff --git a/vlib/v/checker/tests/modules/deprecated_module/main.v b/vlib/v/checker/tests/modules/deprecated_module/main.v index f69596c30e..e2bbe8b087 100644 --- a/vlib/v/checker/tests/modules/deprecated_module/main.v +++ b/vlib/v/checker/tests/modules/deprecated_module/main.v @@ -1,10 +1,6 @@ -// vfmt off -// TODO: without vfmt off, vfmt is buggy, and keeps converting the imports below to `import deprecated_module.bbb.ccc` for some reason, even though the folder has `v.mod`. -// That is unrelated to what this file tests, but should be investigated further and fixed when the module lookup disrepancy is fixed. import bbb.ccc import www.ttt import xxx.yyy -// vfmt on // Note: www.ttt has been deprecated. // => compiling this should produce an error,