Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
F
fmt
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Libraries
fmt
Commits
796662a6
Commit
796662a6
authored
Dec 27, 2021
by
Victor Zverovich
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Escape range items convertible to std::string_view
parent
33ee4cc5
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
1 deletion
+21
-1
include/fmt/ranges.h
include/fmt/ranges.h
+10
-1
test/ranges-test.cc
test/ranges-test.cc
+11
-0
No files found.
include/fmt/ranges.h
View file @
796662a6
...
@@ -65,7 +65,9 @@ template <typename T> class is_std_string_like {
...
@@ -65,7 +65,9 @@ template <typename T> class is_std_string_like {
public:
public:
static
FMT_CONSTEXPR_DECL
const
bool
value
=
static
FMT_CONSTEXPR_DECL
const
bool
value
=
is_string
<
T
>::
value
||
!
std
::
is_void
<
decltype
(
check
<
T
>
(
nullptr
))
>::
value
;
is_string
<
T
>::
value
||
std
::
is_convertible
<
T
,
std_string_view
<
char
>>::
value
||
!
std
::
is_void
<
decltype
(
check
<
T
>
(
nullptr
))
>::
value
;
};
};
template
<
typename
Char
>
template
<
typename
Char
>
...
@@ -520,6 +522,13 @@ auto write_range_entry(OutputIt out, basic_string_view<Char> str) -> OutputIt {
...
@@ -520,6 +522,13 @@ auto write_range_entry(OutputIt out, basic_string_view<Char> str) -> OutputIt {
return
out
;
return
out
;
}
}
template
<
typename
Char
,
typename
OutputIt
,
typename
T
,
FMT_ENABLE_IF
(
std
::
is_convertible
<
T
,
std_string_view
<
char
>
>::
value
)
>
inline
auto
write_range_entry
(
OutputIt
out
,
const
T
&
str
)
->
OutputIt
{
auto
sv
=
std_string_view
<
Char
>
(
str
);
return
write_range_entry
<
Char
>
(
out
,
basic_string_view
<
Char
>
(
sv
));
}
template
<
typename
Char
,
typename
OutputIt
,
typename
Arg
,
template
<
typename
Char
,
typename
OutputIt
,
typename
Arg
,
FMT_ENABLE_IF
(
std
::
is_same
<
Arg
,
Char
>
::
value
)
>
FMT_ENABLE_IF
(
std
::
is_same
<
Arg
,
Char
>
::
value
)
>
OutputIt
write_range_entry
(
OutputIt
out
,
const
Arg
v
)
{
OutputIt
write_range_entry
(
OutputIt
out
,
const
Arg
v
)
{
...
...
test/ranges-test.cc
View file @
796662a6
...
@@ -350,3 +350,14 @@ TEST(ranges_test, escape_string) {
...
@@ -350,3 +350,14 @@ TEST(ranges_test, escape_string) {
"[
\"\\
xf4
\\
x8f
\\
xbf
\\
xc0
\"
]"
);
"[
\"\\
xf4
\\
x8f
\\
xbf
\\
xc0
\"
]"
);
}
}
}
}
#ifdef FMT_USE_STRING_VIEW
struct
convertible_to_string_view
{
operator
std
::
string_view
()
const
{
return
"foo"
;
}
};
TEST
(
ranges_test
,
escape_convertible_to_string_view
)
{
EXPECT_EQ
(
fmt
::
format
(
"{}"
,
std
::
vector
<
convertible_to_string_view
>
(
1
)),
"[
\"
foo
\"
]"
);
}
#endif // FMT_USE_STRING_VIEW
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment