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
12b1d8b1
Unverified
Commit
12b1d8b1
authored
Nov 06, 2021
by
lukester1975
Committed by
GitHub
Nov 06, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix precision 0 with std::chrono::duration and added additional tests. (#2588)
parent
e67f92c5
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
23 additions
and
2 deletions
+23
-2
include/fmt/chrono.h
include/fmt/chrono.h
+2
-2
test/chrono-test.cc
test/chrono-test.cc
+21
-0
No files found.
include/fmt/chrono.h
View file @
12b1d8b1
...
@@ -923,8 +923,8 @@ template <typename Char, typename Rep, typename OutputIt,
...
@@ -923,8 +923,8 @@ template <typename Char, typename Rep, typename OutputIt,
OutputIt
format_duration_value
(
OutputIt
out
,
Rep
val
,
int
precision
)
{
OutputIt
format_duration_value
(
OutputIt
out
,
Rep
val
,
int
precision
)
{
auto
specs
=
basic_format_specs
<
Char
>
();
auto
specs
=
basic_format_specs
<
Char
>
();
specs
.
precision
=
precision
;
specs
.
precision
=
precision
;
specs
.
type
=
precision
>
0
?
presentation_type
::
fixed_lower
specs
.
type
=
precision
>
=
0
?
presentation_type
::
fixed_lower
:
presentation_type
::
general_lower
;
:
presentation_type
::
general_lower
;
return
write
<
Char
>
(
out
,
val
,
specs
);
return
write
<
Char
>
(
out
,
val
,
specs
);
}
}
...
...
test/chrono-test.cc
View file @
12b1d8b1
...
@@ -449,17 +449,30 @@ TEST(chrono_test, format_precision) {
...
@@ -449,17 +449,30 @@ TEST(chrono_test, format_precision) {
EXPECT_THROW_MSG
(
fmt
::
format
(
runtime
(
"{:.2}"
),
std
::
chrono
::
seconds
(
42
)),
EXPECT_THROW_MSG
(
fmt
::
format
(
runtime
(
"{:.2}"
),
std
::
chrono
::
seconds
(
42
)),
fmt
::
format_error
,
fmt
::
format_error
,
"precision not allowed for this argument type"
);
"precision not allowed for this argument type"
);
EXPECT_EQ
(
"1ms"
,
fmt
::
format
(
"{:.0}"
,
dms
(
1.234
)));
EXPECT_EQ
(
"1.2ms"
,
fmt
::
format
(
"{:.1}"
,
dms
(
1.234
)));
EXPECT_EQ
(
"1.2ms"
,
fmt
::
format
(
"{:.1}"
,
dms
(
1.234
)));
EXPECT_EQ
(
"1.23ms"
,
fmt
::
format
(
"{:.{}}"
,
dms
(
1.234
),
2
));
EXPECT_EQ
(
"1.23ms"
,
fmt
::
format
(
"{:.{}}"
,
dms
(
1.234
),
2
));
EXPECT_EQ
(
"13ms"
,
fmt
::
format
(
"{:.0}"
,
dms
(
12.56
)));
EXPECT_EQ
(
"12.6ms"
,
fmt
::
format
(
"{:.1}"
,
dms
(
12.56
)));
EXPECT_EQ
(
"12.56ms"
,
fmt
::
format
(
"{:.2}"
,
dms
(
12.56
)));
}
}
TEST
(
chrono_test
,
format_full_specs
)
{
TEST
(
chrono_test
,
format_full_specs
)
{
EXPECT_EQ
(
"1ms "
,
fmt
::
format
(
"{:6.0}"
,
dms
(
1.234
)));
EXPECT_EQ
(
"1.2ms "
,
fmt
::
format
(
"{:6.1}"
,
dms
(
1.234
)));
EXPECT_EQ
(
"1.2ms "
,
fmt
::
format
(
"{:6.1}"
,
dms
(
1.234
)));
EXPECT_EQ
(
" 1.23ms"
,
fmt
::
format
(
"{:>8.{}}"
,
dms
(
1.234
),
2
));
EXPECT_EQ
(
" 1.23ms"
,
fmt
::
format
(
"{:>8.{}}"
,
dms
(
1.234
),
2
));
EXPECT_EQ
(
" 1.2ms "
,
fmt
::
format
(
"{:^{}.{}}"
,
dms
(
1.234
),
7
,
1
));
EXPECT_EQ
(
" 1.2ms "
,
fmt
::
format
(
"{:^{}.{}}"
,
dms
(
1.234
),
7
,
1
));
EXPECT_EQ
(
" 1.23ms "
,
fmt
::
format
(
"{0:^{2}.{1}}"
,
dms
(
1.234
),
2
,
8
));
EXPECT_EQ
(
" 1.23ms "
,
fmt
::
format
(
"{0:^{2}.{1}}"
,
dms
(
1.234
),
2
,
8
));
EXPECT_EQ
(
"=1.234ms="
,
fmt
::
format
(
"{:=^{}.{}}"
,
dms
(
1.234
),
9
,
3
));
EXPECT_EQ
(
"=1.234ms="
,
fmt
::
format
(
"{:=^{}.{}}"
,
dms
(
1.234
),
9
,
3
));
EXPECT_EQ
(
"*1.2340ms*"
,
fmt
::
format
(
"{:*^10.4}"
,
dms
(
1.234
)));
EXPECT_EQ
(
"*1.2340ms*"
,
fmt
::
format
(
"{:*^10.4}"
,
dms
(
1.234
)));
EXPECT_EQ
(
"13ms "
,
fmt
::
format
(
"{:6.0}"
,
dms
(
12.56
)));
EXPECT_EQ
(
" 13ms"
,
fmt
::
format
(
"{:>8.{}}"
,
dms
(
12.56
),
0
));
EXPECT_EQ
(
" 13ms "
,
fmt
::
format
(
"{:^{}.{}}"
,
dms
(
12.56
),
6
,
0
));
EXPECT_EQ
(
" 13ms "
,
fmt
::
format
(
"{0:^{2}.{1}}"
,
dms
(
12.56
),
0
,
8
));
EXPECT_EQ
(
"==13ms==="
,
fmt
::
format
(
"{:=^{}.{}}"
,
dms
(
12.56
),
9
,
0
));
EXPECT_EQ
(
"***13ms***"
,
fmt
::
format
(
"{:*^10.0}"
,
dms
(
12.56
)));
}
}
TEST
(
chrono_test
,
format_simple_q
)
{
TEST
(
chrono_test
,
format_simple_q
)
{
...
@@ -481,12 +494,20 @@ TEST(chrono_test, format_precision_q) {
...
@@ -481,12 +494,20 @@ TEST(chrono_test, format_precision_q) {
}
}
TEST
(
chrono_test
,
format_full_specs_q
)
{
TEST
(
chrono_test
,
format_full_specs_q
)
{
EXPECT_EQ
(
"1 ms "
,
fmt
::
format
(
"{:7.0%Q %q}"
,
dms
(
1.234
)));
EXPECT_EQ
(
"1.2 ms "
,
fmt
::
format
(
"{:7.1%Q %q}"
,
dms
(
1.234
)));
EXPECT_EQ
(
"1.2 ms "
,
fmt
::
format
(
"{:7.1%Q %q}"
,
dms
(
1.234
)));
EXPECT_EQ
(
" 1.23 ms"
,
fmt
::
format
(
"{:>8.{}%Q %q}"
,
dms
(
1.234
),
2
));
EXPECT_EQ
(
" 1.23 ms"
,
fmt
::
format
(
"{:>8.{}%Q %q}"
,
dms
(
1.234
),
2
));
EXPECT_EQ
(
" 1.2 ms "
,
fmt
::
format
(
"{:^{}.{}%Q %q}"
,
dms
(
1.234
),
8
,
1
));
EXPECT_EQ
(
" 1.2 ms "
,
fmt
::
format
(
"{:^{}.{}%Q %q}"
,
dms
(
1.234
),
8
,
1
));
EXPECT_EQ
(
" 1.23 ms "
,
fmt
::
format
(
"{0:^{2}.{1}%Q %q}"
,
dms
(
1.234
),
2
,
9
));
EXPECT_EQ
(
" 1.23 ms "
,
fmt
::
format
(
"{0:^{2}.{1}%Q %q}"
,
dms
(
1.234
),
2
,
9
));
EXPECT_EQ
(
"=1.234 ms="
,
fmt
::
format
(
"{:=^{}.{}%Q %q}"
,
dms
(
1.234
),
10
,
3
));
EXPECT_EQ
(
"=1.234 ms="
,
fmt
::
format
(
"{:=^{}.{}%Q %q}"
,
dms
(
1.234
),
10
,
3
));
EXPECT_EQ
(
"*1.2340 ms*"
,
fmt
::
format
(
"{:*^11.4%Q %q}"
,
dms
(
1.234
)));
EXPECT_EQ
(
"*1.2340 ms*"
,
fmt
::
format
(
"{:*^11.4%Q %q}"
,
dms
(
1.234
)));
EXPECT_EQ
(
"13 ms "
,
fmt
::
format
(
"{:7.0%Q %q}"
,
dms
(
12.56
)));
EXPECT_EQ
(
" 13 ms"
,
fmt
::
format
(
"{:>8.{}%Q %q}"
,
dms
(
12.56
),
0
));
EXPECT_EQ
(
" 13 ms "
,
fmt
::
format
(
"{:^{}.{}%Q %q}"
,
dms
(
12.56
),
8
,
0
));
EXPECT_EQ
(
" 13 ms "
,
fmt
::
format
(
"{0:^{2}.{1}%Q %q}"
,
dms
(
12.56
),
0
,
9
));
EXPECT_EQ
(
"==13 ms=="
,
fmt
::
format
(
"{:=^{}.{}%Q %q}"
,
dms
(
12.56
),
9
,
0
));
EXPECT_EQ
(
"***13 ms***"
,
fmt
::
format
(
"{:*^11.0%Q %q}"
,
dms
(
12.56
)));
}
}
TEST
(
chrono_test
,
invalid_width_id
)
{
TEST
(
chrono_test
,
invalid_width_id
)
{
...
...
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