Merge branch 'master' into master

1 files changed, 9 insertions, 9 deletions

diff --git a/toolsrc/src/commands_list.cpp b/toolsrc/src/commands_list.cpp
index 9bc9bcc08..640885860 100644
--- a/toolsrc/src/commands_list.cpp
+++ b/toolsrc/src/commands_list.cpp
@@ -8,27 +8,27 @@ namespace vcpkg::Commands::List
 {
     static const std::string OPTION_FULLDESC = "--x-full-desc"; // TODO: This should find a better home, eventually
 
-    static void do_print(const StatusParagraph& pgh, bool FullDesc)
+    static void do_print(const StatusParagraph& pgh, bool full_desc)
     {
-        if (FullDesc)
+        if (full_desc)
         {
-            System::println("%-27s %-16s %s", pgh.package.displayname(), pgh.package.version, pgh.package.description);
+            System::println("%-30s %-16s %s", pgh.package.displayname(), pgh.package.version, pgh.package.description);
         }
         else
         {
-            System::println("%-27s %-16s %s",
-                            pgh.package.displayname(),
-                            pgh.package.version,
-                            vcpkg::shorten_description(pgh.package.description));
+            System::println("%-30s %-16s %s",
+                            vcpkg::shorten_text(pgh.package.displayname(), 30),
+                            vcpkg::shorten_text(pgh.package.version, 16),
+                            vcpkg::shorten_text(pgh.package.description, 71));
         }
     }
 
     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 installed libraries.\n%s",
             Commands::Help::create_example_string("list 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_FULLDESC});