From 9e9bbf215cb72467ec71be144b24b177e31afe0a Mon Sep 17 00:00:00 2001 From: hjk Date: Tue, 8 Apr 2025 17:17:23 +0200 Subject: Utils: Replace Result class by type alias to std::expected ... to be able to conveniently return also non-void cases without being exposed to the syntax of expected. The price for the more general approach is some uglification of the void case: The previous 'Result' is now equivalent to 'Result<>', which needs to be spelled out in function signatures, and some changes to the special cases. Change-Id: Ic5026e237ef2077a0765cdb8287122cae99d699f Reviewed-by: Marcus Tillmanns Reviewed-by: Eike Ziller --- src/plugins/clangcodemodel/test/clangdtests.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/plugins/clangcodemodel/test') diff --git a/src/plugins/clangcodemodel/test/clangdtests.cpp b/src/plugins/clangcodemodel/test/clangdtests.cpp index 8a3072a47fd..45b4f33913e 100644 --- a/src/plugins/clangcodemodel/test/clangdtests.cpp +++ b/src/plugins/clangcodemodel/test/clangdtests.cpp @@ -1994,8 +1994,10 @@ void ClangdTestCompletion::testCompleteAfterProjectChange() EditorManager::openEditor(project()->projectFilePath())); QVERIFY(proFileEditor); proFileEditor->insert("DEFINES += PROJECT_CONFIGURATION_1\n"); - const Result res = proFileEditor->document()->save(); - QVERIFY2(res, qPrintable(res.error())); + const Result<> res = proFileEditor->document()->save(); + QVERIFY(res); + if (!res) + QVERIFY2(false, qPrintable(res.error())); QVERIFY(waitForSignalOrTimeout(project(), &Project::anyParsingFinished, timeOutInMs())); QVERIFY(waitForSignalOrTimeout(LanguageClientManager::instance(), &LanguageClientManager::clientRemoved, -- cgit v1.2.3