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
8a21e328
Commit
8a21e328
authored
Feb 04, 2022
by
Victor Zverovich
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove problematic constructibility check
parent
31e743d0
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
22 additions
and
15 deletions
+22
-15
include/fmt/core.h
include/fmt/core.h
+7
-8
test/core-test.cc
test/core-test.cc
+9
-3
test/ranges-test.cc
test/ranges-test.cc
+2
-2
test/xchar-test.cc
test/xchar-test.cc
+4
-2
No files found.
include/fmt/core.h
View file @
8a21e328
...
@@ -1337,20 +1337,19 @@ template <typename Context> struct arg_mapper {
...
@@ -1337,20 +1337,19 @@ template <typename Context> struct arg_mapper {
}
}
template
<
typename
T
,
template
<
typename
T
,
FMT_ENABLE_IF
(
FMT_ENABLE_IF
(
std
::
is_con
structible
<
basic_string_view
<
char_type
>,
T
>::
value
&&
std
::
is_con
vertible
<
T
,
basic_string_view
<
char_type
>
>::
value
&&
!
is_string
<
T
>::
value
&&
!
has_formatter
<
T
,
Context
>::
value
&&
!
is_string
<
T
>::
value
&&
!
has_formatter
<
T
,
Context
>::
value
&&
!
has_fallback_formatter
<
T
,
char_type
>::
value
)
>
!
has_fallback_formatter
<
T
,
char_type
>::
value
)
>
FMT_CONSTEXPR
FMT_INLINE
auto
map
(
const
T
&
val
)
FMT_CONSTEXPR
FMT_INLINE
auto
map
(
const
T
&
val
)
->
basic_string_view
<
char_type
>
{
->
basic_string_view
<
char_type
>
{
return
basic_string_view
<
char_type
>
(
val
);
return
basic_string_view
<
char_type
>
(
val
);
}
}
template
<
template
<
typename
T
,
typename
T
,
FMT_ENABLE_IF
(
FMT_ENABLE_IF
(
std
::
is_convertible
<
T
,
std_string_view
<
char_type
>
>::
value
&&
std
::
is_constructible
<
std_string_view
<
char_type
>,
T
>::
value
&&
!
std
::
is_convertible
<
T
,
basic_string_view
<
char_type
>>::
value
&&
!
std
::
is_constructible
<
basic_string_view
<
char_type
>
,
T
>::
value
&&
!
is_string
<
T
>::
value
&&
!
has_formatter
<
T
,
Context
>::
value
&&
!
is_string
<
T
>::
value
&&
!
has_formatter
<
T
,
Context
>::
value
&&
!
has_fallback_formatter
<
T
,
char_type
>::
value
)
>
!
has_fallback_formatter
<
T
,
char_type
>::
value
)
>
FMT_CONSTEXPR
FMT_INLINE
auto
map
(
const
T
&
val
)
FMT_CONSTEXPR
FMT_INLINE
auto
map
(
const
T
&
val
)
->
basic_string_view
<
char_type
>
{
->
basic_string_view
<
char_type
>
{
return
std_string_view
<
char_type
>
(
val
);
return
std_string_view
<
char_type
>
(
val
);
...
...
test/core-test.cc
View file @
8a21e328
...
@@ -890,7 +890,10 @@ struct explicitly_convertible_to_string_view {
...
@@ -890,7 +890,10 @@ struct explicitly_convertible_to_string_view {
};
};
TEST
(
core_test
,
format_explicitly_convertible_to_string_view
)
{
TEST
(
core_test
,
format_explicitly_convertible_to_string_view
)
{
EXPECT_EQ
(
"foo"
,
fmt
::
format
(
"{}"
,
explicitly_convertible_to_string_view
()));
// Types explicitly convertible to string_view are not formattable by
// default because it may introduce ODR violations.
static_assert
(
!
fmt
::
is_formattable
<
explicitly_convertible_to_string_view
>::
value
,
""
);
}
}
# ifdef FMT_USE_STRING_VIEW
# ifdef FMT_USE_STRING_VIEW
...
@@ -899,8 +902,11 @@ struct explicitly_convertible_to_std_string_view {
...
@@ -899,8 +902,11 @@ struct explicitly_convertible_to_std_string_view {
};
};
TEST
(
core_test
,
format_explicitly_convertible_to_std_string_view
)
{
TEST
(
core_test
,
format_explicitly_convertible_to_std_string_view
)
{
EXPECT_EQ
(
"foo"
,
// Types explicitly convertible to string_view are not formattable by
fmt
::
format
(
"{}"
,
explicitly_convertible_to_std_string_view
()));
// default because it may introduce ODR violations.
static_assert
(
!
fmt
::
is_formattable
<
explicitly_convertible_to_std_string_view
>::
value
,
""
);
}
}
# endif
# endif
#endif
#endif
...
...
test/ranges-test.cc
View file @
8a21e328
...
@@ -133,8 +133,8 @@ TEST(ranges_test, path_like) {
...
@@ -133,8 +133,8 @@ TEST(ranges_test, path_like) {
struct
string_like
{
struct
string_like
{
const
char
*
begin
();
const
char
*
begin
();
const
char
*
end
();
const
char
*
end
();
explicit
operator
fmt
::
string_view
()
const
{
return
"foo"
;
}
operator
fmt
::
string_view
()
const
{
return
"foo"
;
}
explicit
operator
std
::
string_view
()
const
{
return
"foo"
;
}
operator
std
::
string_view
()
const
{
return
"foo"
;
}
};
};
TEST
(
ranges_test
,
format_string_like
)
{
TEST
(
ranges_test
,
format_string_like
)
{
...
...
test/xchar-test.cc
View file @
8a21e328
...
@@ -72,8 +72,10 @@ struct explicitly_convertible_to_wstring_view {
...
@@ -72,8 +72,10 @@ struct explicitly_convertible_to_wstring_view {
};
};
TEST
(
xchar_test
,
format_explicitly_convertible_to_wstring_view
)
{
TEST
(
xchar_test
,
format_explicitly_convertible_to_wstring_view
)
{
EXPECT_EQ
(
L"foo"
,
// Types explicitly convertible to wstring_view are not formattable by
fmt
::
format
(
L"{}"
,
explicitly_convertible_to_wstring_view
()));
// default because it may introduce ODR violations.
static_assert
(
!
fmt
::
is_formattable
<
explicitly_convertible_to_wstring_view
>::
value
,
""
);
}
}
#endif
#endif
...
...
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