From fce4f8d539b895e6cf8f3585a07a01a0e2f0aca8 Mon Sep 17 00:00:00 2001 From: ivan-aksamentov Date: Mon, 25 Oct 2021 13:28:20 +0200 Subject: [PATCH] refactor: upgrade fmt This version introduces bugfixes and related api changes --- conanfile.txt | 2 +- packages/nextclade_common/src/datasets.cpp | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/conanfile.txt b/conanfile.txt index 2ff09e700..26bb53739 100644 --- a/conanfile.txt +++ b/conanfile.txt @@ -6,7 +6,7 @@ cli11/1.9.1 cxxopts/2.2.1 date/3.0.1 fast-cpp-csv-parser/20191004 -fmt/7.1.3 +fmt/8.0.1 ghc-filesystem/1.4.0 gtest/1.10.0 jemalloc/5.2.1@local/stable diff --git a/packages/nextclade_common/src/datasets.cpp b/packages/nextclade_common/src/datasets.cpp index 8f934b57b..d62fe608c 100644 --- a/packages/nextclade_common/src/datasets.cpp +++ b/packages/nextclade_common/src/datasets.cpp @@ -347,7 +347,9 @@ namespace Nextclade { } std::string formatDatasets(const std::vector& datasets, bool verbose /* = false */) { - fmt::memory_buffer buf; + fmt::memory_buffer bufRaw; + auto buf = std::back_inserter(bufRaw); + for (const auto& dataset : datasets) { fmt::format_to(buf, "Dataset\n"); fmt::format_to(buf, "-------\n"); @@ -369,7 +371,7 @@ namespace Nextclade { auto numRefs = std::to_string(dataset.datasetRefs.size()); fmt::format_to(buf, "Specific reference sequences ({:}):\n", numRefs); - fmt::format_to(buf, "-----------------------------" + std::string{"-", numRefs.size() + 3} + "\n\n"); + // fmt::format_to(buf, "-----------------------------" + std::string{"-", numRefs.size() + 3} + "\n\n"); for (const auto& datasetRef : dataset.datasetRefs) { const auto& ref = datasetRef.reference; @@ -440,7 +442,7 @@ namespace Nextclade { } fmt::format_to(buf, "\n"); } - return fmt::to_string(buf); + return fmt::to_string(bufRaw); }