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

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

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

34
gucc/src/bootloader.cpp
View File

@ -4,32 +4,13 @@
#include "gucc/io_utils.hpp" #include "gucc/io_utils.hpp"
#include "gucc/string_utils.hpp" #include "gucc/string_utils.hpp"
#include <ranges> // for ranges::*
#include <fmt/compile.h> #include <fmt/compile.h>
#include <fmt/format.h> #include <fmt/format.h>
#include <spdlog/spdlog.h> #include <spdlog/spdlog.h>
#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 "-Wnull-dereference"
#pragma GCC diagnostic ignored "-Wuseless-cast"
#pragma GCC diagnostic ignored "-Wold-style-cast"
#endif
#include <range/v3/range/conversion.hpp>
#include <range/v3/view/join.hpp>
#include <range/v3/view/split.hpp>
#include <range/v3/view/transform.hpp>
#if defined(__clang__)
#pragma clang diagnostic pop
#elif defined(__GNUC__)
#pragma GCC diagnostic pop
#endif
using namespace std::string_view_literals; using namespace std::string_view_literals;
#define CONV_REQ_F(needle, f) \ #define CONV_REQ_F(needle, f) \
@ -182,14 +163,13 @@ auto parse_grub_line(const gucc::bootloader::GrubConfig& grub_config, std::strin
namespace gucc::bootloader { namespace gucc::bootloader {
auto gen_grub_config(const GrubConfig& grub_config) noexcept -> std::string { auto gen_grub_config(const GrubConfig& grub_config) noexcept -> std::string {
std::string result = GRUB_DEFAULT_CONFIG | ranges::views::split('\n') std::string result = GRUB_DEFAULT_CONFIG | std::ranges::views::split('\n')
| ranges::views::transform([&](auto&& rng) { | std::ranges::views::transform([&](auto&& rng) {
auto&& line = std::string_view(&*rng.begin(), static_cast<size_t>(ranges::distance(rng))); auto&& line = std::string_view(&*rng.begin(), static_cast<size_t>(std::ranges::distance(rng)));
return parse_grub_line(grub_config, line); return parse_grub_line(grub_config, line);
}) })
| ranges::views::join('\n') | std::ranges::views::join_with('\n')
| ranges::to<std::string>(); | std::ranges::to<std::string>();
result += '\n';
return result; return result;
} }