From 0bbc1be0a3f7bb1e15203ea70ed35d2ca99320f4 Mon Sep 17 00:00:00 2001 From: rhysd Date: Sat, 19 Aug 2023 15:42:54 +0200 Subject: [PATCH] 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 Co-authored-by: rhysd --- src/testdir/test_vim9_builtin.vim | 8 ++++---- src/version.c | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/testdir/test_vim9_builtin.vim b/src/testdir/test_vim9_builtin.vim index 5e57b90fd8..d64366d03c 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 = [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 = [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', 'E1012: Type mismatch; expected number but got list in map()'], 2) + v9.CheckDefAndScriptFailure(lines, ['E1013: Argument 2: type mismatch, expected func(?number, ?number): number but got func(any, any): list', 'E1012: Type mismatch; expected number but got list'], 2) lines =<< trim END var l: list = 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', 'E1012: Type mismatch; expected number but got list in map()'], 2) + v9.CheckDefAndScriptFailure(lines, ['E1013: Argument 2: type mismatch, expected func(?number, ?number): number but got func(any, any): list', 'E1012: Type mismatch; expected number but got list'], 2) lines =<< trim END var d: dict = {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', 'E1012: Type mismatch; expected number but got list in map()'], 2) + v9.CheckDefAndScriptFailure(lines, ['E1013: Argument 2: type mismatch, expected func(?string, ?number): number but got func(any, any): list', 'E1012: Type mismatch; expected number but got list'], 2) enddef def Test_maparg() diff --git a/src/version.c b/src/version.c index 2434576661..8c91c1c2ad 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, /**/