Update clang-format assumptions pushed by current VS2022. (#625)
This commit is contained in:
Родитель
aab7be4fdc
Коммит
ac2ee12f45
|
@ -3,7 +3,7 @@
|
||||||
[CmdletBinding()]
|
[CmdletBinding()]
|
||||||
$Root = Resolve-Path -LiteralPath "$PSScriptRoot/.."
|
$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)
|
if ($null -eq $clangFormat)
|
||||||
{
|
{
|
||||||
$clangFormat = Get-Command 'clang-format' -ErrorAction 'SilentlyContinue'
|
$clangFormat = Get-Command 'clang-format' -ErrorAction 'SilentlyContinue'
|
||||||
|
|
|
@ -112,7 +112,7 @@ namespace vcpkg::Commands::PortHistory
|
||||||
if (auto output = maybe_output.get())
|
if (auto output = maybe_output.get())
|
||||||
{
|
{
|
||||||
auto commits = Util::fmap(
|
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, ' ');
|
auto parts = Strings::split(line, ' ');
|
||||||
return std::make_pair(parts[0], parts[1]);
|
return std::make_pair(parts[0], parts[1]);
|
||||||
});
|
});
|
||||||
|
|
|
@ -1186,7 +1186,7 @@ namespace vcpkg
|
||||||
if (auto pversions = maybe_versions.get())
|
if (auto pversions = maybe_versions.get())
|
||||||
{
|
{
|
||||||
return Util::fmap(
|
return Util::fmap(
|
||||||
*pversions, [](auto&& entry) -> auto {
|
*pversions, [](auto&& entry) -> auto{
|
||||||
return std::make_pair(SchemedVersion{entry.scheme, entry.version}, entry.git_tree);
|
return std::make_pair(SchemedVersion{entry.scheme, entry.version}, entry.git_tree);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
|
@ -886,7 +886,7 @@ namespace vcpkg
|
||||||
const Path VcpkgPaths::get_triplet_file_path(Triplet triplet) const
|
const Path VcpkgPaths::get_triplet_file_path(Triplet triplet) const
|
||||||
{
|
{
|
||||||
return m_pimpl->m_triplets_cache.get_lazy(
|
return m_pimpl->m_triplets_cache.get_lazy(
|
||||||
triplet, [&]() -> auto {
|
triplet, [&]() -> auto{
|
||||||
for (const auto& triplet_dir : m_pimpl->triplets_dirs)
|
for (const auto& triplet_dir : m_pimpl->triplets_dirs)
|
||||||
{
|
{
|
||||||
auto path = triplet_dir / (triplet.canonical_name() + ".cmake");
|
auto path = triplet_dir / (triplet.canonical_name() + ".cmake");
|
||||||
|
|
Загрузка…
Ссылка в новой задаче