Codechange: minor bits and pieces related to fmt::format() (#11806)

- Don't make run-time formatting what can be done compile-time.
- Be explicit about run-time formatting.
- Fix datetime printing.
This commit is contained in:
Patric Stout 2024-01-16 22:10:34 +01:00 committed by GitHub
parent 0b7410d979
commit 6550682b49
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 8 additions and 4 deletions

View File

@ -95,7 +95,7 @@ void DumpDebugFacilityNames(std::back_insert_iterator<std::string> &output_itera
} else {
fmt::format_to(output_iterator, ", ");
}
fmt::format_to(output_iterator, i->name);
fmt::format_to(output_iterator, "{}", i->name);
written = true;
}
if (written) {

View File

@ -242,7 +242,11 @@ void Gamelog::Print(std::function<void(const std::string &)> proc)
{
/* A NewGRF got removed from the game, either manually or by it missing when loading the game. */
auto gm = grf_names.find(this->grfid);
fmt::format_to(output_iterator, action_type == GLAT_LOAD ? "Missing NewGRF: " : "Removed NewGRF: ");
if (action_type == GLAT_LOAD) {
fmt::format_to(output_iterator, "Missing NewGRF: ");
} else {
fmt::format_to(output_iterator, "Removed NewGRF: ");
}
AddGrfInfo(output_iterator, this->grfid, nullptr, gm != grf_names.end() ? gm->second.gc : nullptr);
if (gm == grf_names.end()) {
fmt::format_to(output_iterator, ". Gamelog inconsistency: GrfID was never added!");

View File

@ -93,7 +93,7 @@ static const char *GetAddressFormatString(uint16_t family, bool with_family)
*/
std::string NetworkAddress::GetAddressAsString(bool with_family)
{
return fmt::format(GetAddressFormatString(this->GetAddress()->ss_family, with_family), this->GetHostname(), this->GetPort());
return fmt::format(fmt::runtime(GetAddressFormatString(this->GetAddress()->ss_family, with_family)), this->GetHostname(), this->GetPort());
}
/**

View File

@ -131,7 +131,7 @@ void NewGRFProfiler::Abort()
*/
std::string NewGRFProfiler::GetOutputFilename() const
{
return fmt::format("{}grfprofile-{%Y%m%d-%H%M}-{:08X}.csv", FiosGetScreenshotDir(), fmt::localtime(time(nullptr)), BSWAP32(this->grffile->grfid));
return fmt::format("{}grfprofile-{:%Y%m%d-%H%M}-{:08X}.csv", FiosGetScreenshotDir(), fmt::localtime(time(nullptr)), BSWAP32(this->grffile->grfid));
}
/* static */ uint32_t NewGRFProfiler::FinishAll()