patch 9.0.1750: CI: fails because of changed error messages
Commit:
https://github.com/vim/vim/commit/0bbc1be0a3f7bb1e15203ea70ed35d2ca99320f4
Author: rhysd <[email protected]>
Date: Sat Aug 19 15:42:54 2023 +0200
patch 9.0.1750: CI: fails because of changed error messages
Problem: CI: fails because of changed error messages
(after: 9.0.1741)
Solution: Adjust expected error messages
closes: #12853
Signed-off-by: Christian Brabandt <[email protected]>
Co-authored-by: rhysd <[email protected]>
diff --git a/src/testdir/test_vim9_builtin.vim
b/src/testdir/test_vim9_builtin.vim
index 5e57b90fd..d64366d03 100644
--- a/src/testdir/test_vim9_builtin.vim
+++ b/src/testdir/test_vim9_builtin.vim
@@ -2613,7 +2613,7 @@ def Test_map_function_arg()
var ll: list<number> = [1, 2, 3]
echo map(ll, Map)
END
- v9.CheckDefAndScriptFailure(lines, ['E1013: Argument 2: type mismatch,
expected func(?number, ?number): number but got func(number, number): string',
'E1012: Type mismatch; expected number but got string in map()'])
+ v9.CheckDefAndScriptFailure(lines, ['E1013: Argument 2: type mismatch,
expected func(?number, ?number): number but got func(number, number): string',
'E1012: Type mismatch; expected number but got string'])
# not declared list can change type
echo [1, 2, 3]->map((..._) => 'x')
@@ -2631,19 +2631,19 @@ def Test_map_item_type()
var l: list<number> = [0]
echo map(l, (_, v) => [])
END
- v9.CheckDefAndScriptFailure(lines, ['E1013: Argument 2: type mismatch,
expected func(?number, ?number): number but got func(any, any): list<unknown>',
'E1012: Type mismatch; expected number but got list<unknown> in map()'], 2)
+ v9.CheckDefAndScriptFailure(lines, ['E1013: Argument 2: type mismatch,
expected func(?number, ?number): number but got func(any, any): list<unknown>',
'E1012: Type mismatch; expected number but got list<unknown>'], 2)
lines =<< trim END
var l: list<number> = range(2)
echo map(l, (_, v) => [])
END
- v9.CheckDefAndScriptFailure(lines, ['E1013: Argument 2: type mismatch,
expected func(?number, ?number): number but got func(any, any): list<unknown>',
'E1012: Type mismatch; expected number but got list<unknown> in map()'], 2)
+ v9.CheckDefAndScriptFailure(lines, ['E1013: Argument 2: type mismatch,
expected func(?number, ?number): number but got func(any, any): list<unknown>',
'E1012: Type mismatch; expected number but got list<unknown>'], 2)
lines =<< trim END
var d: dict<number> = {key: 0}
echo map(d, (_, v) => [])
END
- v9.CheckDefAndScriptFailure(lines, ['E1013: Argument 2: type mismatch,
expected func(?string, ?number): number but got func(any, any): list<unknown>',
'E1012: Type mismatch; expected number but got list<unknown> in map()'], 2)
+ v9.CheckDefAndScriptFailure(lines, ['E1013: Argument 2: type mismatch,
expected func(?string, ?number): number but got func(any, any): list<unknown>',
'E1012: Type mismatch; expected number but got list<unknown>'], 2)
enddef
def Test_maparg()
diff --git a/src/version.c b/src/version.c
index 243457666..8c91c1c2a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -695,6 +695,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 1750,
/**/
1749,
/**/
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion on the web visit
https://groups.google.com/d/msgid/vim_dev/E1qXMGH-0095YV-24%40256bit.org.
