diff options
author | Hans Bolinder <[email protected]> | 2018-12-03 08:29:35 +0100 |
---|---|---|
committer | Hans Bolinder <[email protected]> | 2018-12-03 08:29:35 +0100 |
commit | b2f07297e8ee65b34b2e74d721ff537223210a72 (patch) | |
tree | 677b787ef4863fa54ab773511ab2617402659415 /lib/stdlib/src/calendar.erl | |
parent | 8ca061c3006ad69c2a8d1c835d0d678438966dfc (diff) | |
parent | 2eeab3cc011ec503d7831fe588557f60d69aa8be (diff) | |
download | otp-b2f07297e8ee65b34b2e74d721ff537223210a72.tar.gz otp-b2f07297e8ee65b34b2e74d721ff537223210a72.tar.bz2 otp-b2f07297e8ee65b34b2e74d721ff537223210a72.zip |
Merge branch 'maint'
* maint:
stdlib: Let calendar:system_time_to_rfc3339() keep fractions
Diffstat (limited to 'lib/stdlib/src/calendar.erl')
-rw-r--r-- | lib/stdlib/src/calendar.erl | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/lib/stdlib/src/calendar.erl b/lib/stdlib/src/calendar.erl index 9a600c1972..bb5d450cd6 100644 --- a/lib/stdlib/src/calendar.erl +++ b/lib/stdlib/src/calendar.erl @@ -693,14 +693,11 @@ local_offset(SystemTime, Unit) -> UniversalSecs = datetime_to_gregorian_seconds(UniversalTime), LocalSecs - UniversalSecs. +fraction_str(1, _Time) -> + ""; fraction_str(Factor, Time) -> - case Time rem Factor of - 0 -> - ""; - Fraction -> - FS = io_lib:fwrite(".~*..0B", [log10(Factor), abs(Fraction)]), - string:trim(FS, trailing, "0") - end. + Fraction = Time rem Factor, + io_lib:fwrite(".~*..0B", [log10(Factor), abs(Fraction)]). fraction(second, _) -> 0; |