Skip to content

Commit

Permalink
Update clang-format assumptions pushed by current VS2022. (#625)
Browse files Browse the repository at this point in the history
  • Loading branch information
BillyONeal authored Jul 13, 2022
1 parent aab7be4 commit ac2ee12
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion azure-pipelines/Format-CxxCode.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
[CmdletBinding()]
$Root = Resolve-Path -LiteralPath "$PSScriptRoot/.."

$clangFormat = Get-Command 'clang-format-12' -ErrorAction 'SilentlyContinue'
$clangFormat = Get-Command 'clang-format-14' -ErrorAction 'SilentlyContinue'
if ($null -eq $clangFormat)
{
$clangFormat = Get-Command 'clang-format' -ErrorAction 'SilentlyContinue'
Expand Down
2 changes: 1 addition & 1 deletion src/vcpkg/commands.porthistory.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ namespace vcpkg::Commands::PortHistory
if (auto output = maybe_output.get())
{
auto commits = Util::fmap(
Strings::split(*output, '\n'), [](const std::string& line) -> auto {
Strings::split(*output, '\n'), [](const std::string& line) -> auto{
auto parts = Strings::split(line, ' ');
return std::make_pair(parts[0], parts[1]);
});
Expand Down
2 changes: 1 addition & 1 deletion src/vcpkg/registries.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1186,7 +1186,7 @@ namespace vcpkg
if (auto pversions = maybe_versions.get())
{
return Util::fmap(
*pversions, [](auto&& entry) -> auto {
*pversions, [](auto&& entry) -> auto{
return std::make_pair(SchemedVersion{entry.scheme, entry.version}, entry.git_tree);
});
}
Expand Down
2 changes: 1 addition & 1 deletion src/vcpkg/vcpkgpaths.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -886,7 +886,7 @@ namespace vcpkg
const Path VcpkgPaths::get_triplet_file_path(Triplet triplet) const
{
return m_pimpl->m_triplets_cache.get_lazy(
triplet, [&]() -> auto {
triplet, [&]() -> auto{
for (const auto& triplet_dir : m_pimpl->triplets_dirs)
{
auto path = triplet_dir / (triplet.canonical_name() + ".cmake");
Expand Down

0 comments on commit ac2ee12

Please sign in to comment.