Clone/New-Cli-Installer
1
0
Fork 0
mirror of https://github.com/CachyOS/New-Cli-Installer.git synced 2025-02-02 22:07:13 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

👷 gucc: use std ranges from C++23 in umount

Browse Source
This commit is contained in:
Vladislav Nepogodin 2024-07-13 03:26:32 +04:00
parent ff2e64bfee
commit e2a39f2a8b
No known key found for this signature in database
GPG Key ID: B62C3D10C54D5DA9
1 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
gucc/src/umount_partitions.cpp
View File

@ -2,26 +2,9 @@
#include "gucc/file_utils.hpp" #include "gucc/file_utils.hpp"
#include "gucc/io_utils.hpp" #include "gucc/io_utils.hpp"
#include "gucc/mtab.hpp" #include "gucc/mtab.hpp"
#include "gucc/string_utils.hpp"
#include <algorithm> // for sort #include <algorithm> // for sort
#include <ranges> // for ranges::*
#if defined(__clang__)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wold-style-cast"
#elif defined(__GNUC__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wuseless-cast"
#pragma GCC diagnostic ignored "-Wold-style-cast"
#endif
#include <range/v3/algorithm/sort.hpp>
#if defined(__clang__)
#pragma clang diagnostic pop
#elif defined(__GNUC__)
#pragma GCC diagnostic pop
#endif
#include <fmt/compile.h> #include <fmt/compile.h>
#include <fmt/format.h> #include <fmt/format.h>
@ -38,7 +21,7 @@ auto umount_partitions(std::string_view root_mountpoint, const std::vector<std::
spdlog::error("Failed to umount partitions: failed to parse /etc/mtab"); spdlog::error("Failed to umount partitions: failed to parse /etc/mtab");
return false; return false;
} }
ranges::sort(*mtab_entries, {}, &mtab::MTabEntry::mountpoint); std::ranges::sort(*mtab_entries, {}, &mtab::MTabEntry::mountpoint);
spdlog::debug("Got {} entries from mountpoint {}", mtab_entries->size(), root_mountpoint); spdlog::debug("Got {} entries from mountpoint {}", mtab_entries->size(), root_mountpoint);
for (auto&& mtab_entry : std::move(*mtab_entries)) { for (auto&& mtab_entry : std::move(*mtab_entries)) {