Skip to content

Commit

Permalink
Fix for issue fmtlib#3319
Browse files Browse the repository at this point in the history
Signed-off-by: Vladislav Shchapov <vladislav@shchapov.ru>
  • Loading branch information
phprus committed Mar 4, 2023
1 parent e0748e6 commit 8123afe
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 0 deletions.
5 changes: 5 additions & 0 deletions include/fmt/std.h
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,11 @@ inline void write_escaped_path<std::filesystem::path::value_type>(
template <typename Char>
struct formatter<std::filesystem::path, Char>
: formatter<basic_string_view<Char>> {
template <typename ParseContext> FMT_CONSTEXPR auto parse(ParseContext& ctx) {
auto out = formatter<basic_string_view<Char>>::parse(ctx);
this->set_debug_format(false);
return out;
}
template <typename FormatContext>
auto format(const std::filesystem::path& p, FormatContext& ctx) const ->
typename FormatContext::iterator {
Expand Down
21 changes: 21 additions & 0 deletions test/std-test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ TEST(std_test, path) {
EXPECT_EQ(fmt::format("{:8}", std::filesystem::path("foo")), "\"foo\" ");
EXPECT_EQ(fmt::format("{}", std::filesystem::path("foo\"bar.txt")),
"\"foo\\\"bar.txt\"");
EXPECT_EQ(fmt::format("{:?}", std::filesystem::path("foo\"bar.txt")),
"\"foo\\\"bar.txt\"");

# ifdef _WIN32
// File.txt in Russian.
Expand All @@ -46,6 +48,25 @@ TEST(ranges_std_test, format_vector_path) {
#endif
}

TEST(ranges_std_test, format_quote_path) {
// Test quote problem described in #3319.
#ifdef __cpp_lib_filesystem
auto vec =
std::vector<std::filesystem::path>{"path1/file1.txt", "path2/file2.txt"};
EXPECT_EQ(fmt::format("{}", vec),
"[\"path1/file1.txt\", \"path2/file2.txt\"]");
# ifdef __cpp_lib_optional
auto o = std::optional<std::filesystem::path>("path/file.txt");
EXPECT_EQ(fmt::format("{}", o), "optional(\"path/file.txt\")");
EXPECT_EQ(fmt::format("{:?}", o), "optional(\"path/file.txt\")");
# endif
# ifdef __cpp_lib_variant
auto v = std::variant<std::filesystem::path, int>("path/file.txt");
EXPECT_EQ(fmt::format("{}", v), "variant(\"path/file.txt\")");
# endif
#endif
}

TEST(std_test, thread_id) {
EXPECT_FALSE(fmt::format("{}", std::this_thread::get_id()).empty());
}
Expand Down

0 comments on commit 8123afe

Please sign in to comment.