Restore constraint on map formatter #4326
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
vitaut
reviewed
Jan 25, 2025
test/ranges-test.cc
Outdated
| @@ -65,6 +67,9 @@ TEST(ranges_test, format_vector) { | |||
| EXPECT_EQ(fmt::format("{:n}", vvc), "['a', 'b', 'c'], ['a', 'b', 'c']"); | |||
| EXPECT_EQ(fmt::format("{:n:n}", vvc), "'a', 'b', 'c', 'a', 'b', 'c'"); | |||
| EXPECT_EQ(fmt::format("{:n:n:}", vvc), "a, b, c, a, b, c"); | |||
|
|
|||
| EXPECT_FALSE((fmt::is_formattable<unformattable>::value)); | |||
There was a problem hiding this comment.
Are extra parentheses needed here and in other places below?
There was a problem hiding this comment.
No. They were in the original (I moved this assertion up from the tuple one) so I just went with it, but I can remove the unnecessary ones.
| @@ -83,6 +88,8 @@ TEST(ranges_test, format_map) { | |||
| auto m = std::map<std::string, int>{{"one", 1}, {"two", 2}}; | |||
| EXPECT_EQ(fmt::format("{}", m), "{\"one\": 1, \"two\": 2}"); | |||
| EXPECT_EQ(fmt::format("{:n}", m), "\"one\": 1, \"two\": 2"); | |||
|
|
|||
| EXPECT_FALSE((fmt::is_formattable<std::map<int, unformattable>>::value)); | |||
There was a problem hiding this comment.
It seems that this is the only place that needs extra parentheses because of a comma.
|
Merged, thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
So that it correctly reports as unformattable when the element is.
This was lost when the formatter was split out in 77bfd84