mirror/fmt
1
0
Fork 0
mirror of https://github.com/fmtlib/fmt.git synced 2025-01-13 18:39:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix empty spec for time point (#3275)

Browse Source
This commit is contained in:
Shawn Zhong 2023-01-16 13:48:00 -06:00 committed by GitHub
parent 39971eb336
commit dfbb952b2c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/fmt/chrono.h
View File

@ -2180,7 +2180,7 @@ template <typename Char> struct formatter<std::tm, Char> {
FMT_CONSTEXPR auto do_parse(basic_format_parse_context<Char>& ctx) FMT_CONSTEXPR auto do_parse(basic_format_parse_context<Char>& ctx)
-> decltype(ctx.begin()) { -> decltype(ctx.begin()) {
auto begin = ctx.begin(), end = ctx.end(); auto begin = ctx.begin(), end = ctx.end();
if (begin == end || *begin == '}') return end; if (begin == end || *begin == '}') return begin;
begin = detail::parse_align(begin, end, specs); begin = detail::parse_align(begin, end, specs);
if (begin == end) return end; if (begin == end) return end;

2
test/chrono-test.cc
View File

@ -259,6 +259,7 @@ TEST(chrono_test, system_clock_time_point) {
std::chrono::system_clock::now()); std::chrono::system_clock::now());
EXPECT_EQ(strftime_full_utc(t1), fmt::format("{:%Y-%m-%d %H:%M:%S}", t1)); EXPECT_EQ(strftime_full_utc(t1), fmt::format("{:%Y-%m-%d %H:%M:%S}", t1));
EXPECT_EQ(strftime_full_utc(t1), fmt::format("{}", t1)); EXPECT_EQ(strftime_full_utc(t1), fmt::format("{}", t1));
EXPECT_EQ(strftime_full_utc(t1), fmt::format("{:}", t1));
using time_point = using time_point =
std::chrono::time_point<std::chrono::system_clock, std::chrono::seconds>; std::chrono::time_point<std::chrono::system_clock, std::chrono::seconds>;
auto t2 = time_point(std::chrono::seconds(42)); auto t2 = time_point(std::chrono::seconds(42));
@ -365,6 +366,7 @@ TEST(chrono_test, local_system_clock_time_point) {
std::chrono::current_zone()->to_local(std::chrono::system_clock::now())); std::chrono::current_zone()->to_local(std::chrono::system_clock::now()));
EXPECT_EQ(strftime_full_local(t1), fmt::format("{:%Y-%m-%d %H:%M:%S}", t1)); EXPECT_EQ(strftime_full_local(t1), fmt::format("{:%Y-%m-%d %H:%M:%S}", t1));
EXPECT_EQ(strftime_full_local(t1), fmt::format("{}", t1)); EXPECT_EQ(strftime_full_local(t1), fmt::format("{}", t1));
EXPECT_EQ(strftime_full_local(t1), fmt::format("{:}", t1));
using time_point = std::chrono::local_time<std::chrono::seconds>; using time_point = std::chrono::local_time<std::chrono::seconds>;
auto t2 = time_point(std::chrono::seconds(86400 + 42)); auto t2 = time_point(std::chrono::seconds(86400 + 42));
EXPECT_EQ(strftime_full_local(t2), fmt::format("{:%Y-%m-%d %H:%M:%S}", t2)); EXPECT_EQ(strftime_full_local(t2), fmt::format("{:%Y-%m-%d %H:%M:%S}", t2));