diff options
| author | Maksim Denisov <denisov.maksim@huawei.com> | 2024-12-05 17:12:58 +0100 |
|---|---|---|
| committer | Maksim Denisov <denisov.maksim@huawei.com> | 2024-12-09 13:01:58 +0100 |
| commit | a395bf245975348fb8f5407ae1f19893090b92d0 (patch) | |
| tree | f58fc3c4257da94a374aa557f18b2deff01f0fb9 /src/buildtool/serve_api/serve_service/target_utils.cpp | |
| parent | c60468fed42df70e4897d9144a89db55ffbf9af3 (diff) | |
| download | justbuild-a395bf245975348fb8f5407ae1f19893090b92d0.tar.gz | |
Use expected to return an error from ParseRoot
Diffstat (limited to 'src/buildtool/serve_api/serve_service/target_utils.cpp')
| -rw-r--r-- | src/buildtool/serve_api/serve_service/target_utils.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/buildtool/serve_api/serve_service/target_utils.cpp b/src/buildtool/serve_api/serve_service/target_utils.cpp index b87682c3..2cf940a8 100644 --- a/src/buildtool/serve_api/serve_service/target_utils.cpp +++ b/src/buildtool/serve_api/serve_service/target_utils.cpp @@ -112,11 +112,9 @@ auto DetermineRoots(RemoteServeConfig const& serve_config, std::string const& keyword) -> expected<FileRoot, std::string> { auto it = desc.find(keyword); if (it != desc.end()) { - std::string error_msg; - auto parsed_root = - FileRoot::ParseRoot(repo, keyword, *it, &error_msg); + auto parsed_root = FileRoot::ParseRoot(repo, keyword, *it); if (not parsed_root) { - return unexpected{std::move(error_msg)}; + return unexpected{std::move(parsed_root).error()}; } // check that root has absent-like format if (not parsed_root->first.IsAbsent()) { |