Merge branch 'master' into vtk-components

1 files changed, 3 insertions, 22 deletions

diff --git a/toolsrc/src/commands_search.cpp b/toolsrc/src/commands_search.cpp
index 529d52a8b..d35a546c4 100644
--- a/toolsrc/src/commands_search.cpp
+++ b/toolsrc/src/commands_search.cpp
@@ -80,34 +80,15 @@ namespace vcpkg::Commands::Search
 
     void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths)
     {
-        static const std::string example = Strings::format(
+        static const std::string EXAMPLE = Strings::format(
             "The argument should be a substring to search for, or no argument to display all libraries.\n%s",
             Commands::Help::create_example_string("search png"));
-        args.check_max_arg_count(1, example);
+        args.check_max_arg_count(1, EXAMPLE);
         const std::unordered_set<std::string> options =
             args.check_and_get_optional_command_arguments({OPTION_GRAPH, OPTION_FULLDESC});
 
-        auto sources_and_errors = Paragraphs::try_load_all_ports(paths.get_filesystem(), paths.ports);
+        auto source_paragraphs = Paragraphs::load_all_ports(paths.get_filesystem(), paths.ports);
 
-        if (!sources_and_errors.errors.empty())
-        {
-            if (GlobalState::debugging)
-            {
-                print_error_message(sources_and_errors.errors);
-            }
-            else
-            {
-                for (auto&& error : sources_and_errors.errors)
-                {
-                    System::println(
-                        System::Color::warning, "Warning: an error occurred while parsing '%s'", error->name);
-                }
-                System::println(System::Color::warning,
-                                "Use '--debug' to get more information about the parse failures.\n");
-            }
-        }
-
-        auto& source_paragraphs = sources_and_errors.paragraphs;
         if (options.find(OPTION_GRAPH) != options.cend())
         {
             const std::string graph_as_string = create_graph_as_string(source_paragraphs);