Remove uneeded else branch. Fix variable hiding

1 files changed, 6 insertions, 9 deletions

diff --git a/toolsrc/src/VcpkgPaths.cpp b/toolsrc/src/VcpkgPaths.cpp
index 50032b740..7d574006e 100644
--- a/toolsrc/src/VcpkgPaths.cpp
+++ b/toolsrc/src/VcpkgPaths.cpp
@@ -393,15 +393,12 @@ namespace vcpkg
         {
             return vs_toolsets.back();
         }
-        else
-        {
-            const auto toolset = Util::find_if(vs_toolsets, [&](const Toolset& toolset) {
-                return toolset_version == Strings::to_utf8(toolset.version);
-            });
-            Checks::check_exit(
-                VCPKG_LINE_INFO, toolset != vs_toolsets.end(), "Could not find toolset '%s'", toolset_version);
-            return *toolset;
-        }
+
+        const auto toolset = Util::find_if(
+            vs_toolsets, [&](const Toolset& t) { return toolset_version == Strings::to_utf8(t.version); });
+        Checks::check_exit(
+            VCPKG_LINE_INFO, toolset != vs_toolsets.end(), "Could not find toolset '%s'", toolset_version);
+        return *toolset;
     }
 
     Files::Filesystem& VcpkgPaths::get_filesystem() const { return Files::get_real_filesystem(); }