Restoring authorship annotation for Ivan Komarov <Ivan.Komarov@dfyz.info>. Commit 2 of 2.

3 files changed, 2130 insertions, 2130 deletions

diff --git a/contrib/libs/cctz/test/civil_time_test.cc b/contrib/libs/cctz/test/civil_time_test.cc
index aa4000c3f6..5ec0ca8d38 100644
--- a/contrib/libs/cctz/test/civil_time_test.cc
+++ b/contrib/libs/cctz/test/civil_time_test.cc
@@ -1,236 +1,236 @@
-// Copyright 2016 Google Inc. All Rights Reserved. 
-// 
-// Licensed under the Apache License, Version 2.0 (the "License"); 
-// you may not use this file except in compliance with the License. 
-// You may obtain a copy of the License at 
-// 
+// Copyright 2016 Google Inc. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
 //   https://www.apache.org/licenses/LICENSE-2.0
-// 
-//   Unless required by applicable law or agreed to in writing, software 
-//   distributed under the License is distributed on an "AS IS" BASIS, 
-//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-//   See the License for the specific language governing permissions and 
-//   limitations under the License. 
- 
+//
+//   Unless required by applicable law or agreed to in writing, software
+//   distributed under the License is distributed on an "AS IS" BASIS,
+//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//   See the License for the specific language governing permissions and
+//   limitations under the License.
+
 #include "cctz/civil_time.h"
- 
-#include <iomanip> 
-#include <limits> 
-#include <sstream> 
-#include <string> 
-#include <type_traits> 
- 
+
+#include <iomanip>
+#include <limits>
+#include <sstream>
+#include <string>
+#include <type_traits>
+
 #include "gtest/gtest.h"
- 
-namespace cctz { 
- 
-namespace { 
- 
-template <typename T> 
-std::string Format(const T& t) { 
-  std::stringstream ss; 
-  ss << t; 
-  return ss.str(); 
-} 
- 
-}  // namespace 
- 
+
+namespace cctz {
+
+namespace {
+
+template <typename T>
+std::string Format(const T& t) {
+  std::stringstream ss;
+  ss << t;
+  return ss.str();
+}
+
+}  // namespace
+
 #if __cpp_constexpr >= 201304 || (defined(_MSC_VER) && _MSC_VER >= 1910)
-// Construction constexpr tests 
- 
-TEST(CivilTime, Normal) { 
-  constexpr civil_second css(2016, 1, 28, 17, 14, 12); 
-  static_assert(css.second() == 12, "Normal.second"); 
-  constexpr civil_minute cmm(2016, 1, 28, 17, 14); 
-  static_assert(cmm.minute() == 14, "Normal.minute"); 
-  constexpr civil_hour chh(2016, 1, 28, 17); 
-  static_assert(chh.hour() == 17, "Normal.hour"); 
-  constexpr civil_day cd(2016, 1, 28); 
-  static_assert(cd.day() == 28, "Normal.day"); 
-  constexpr civil_month cm(2016, 1); 
-  static_assert(cm.month() == 1, "Normal.month"); 
-  constexpr civil_year cy(2016); 
-  static_assert(cy.year() == 2016, "Normal.year"); 
-} 
- 
-TEST(CivilTime, Conversion) { 
-  constexpr civil_year cy(2016); 
-  static_assert(cy.year() == 2016, "Conversion.year"); 
-  constexpr civil_month cm(cy); 
-  static_assert(cm.month() == 1, "Conversion.month"); 
-  constexpr civil_day cd(cm); 
-  static_assert(cd.day() == 1, "Conversion.day"); 
-  constexpr civil_hour chh(cd); 
-  static_assert(chh.hour() == 0, "Conversion.hour"); 
-  constexpr civil_minute cmm(chh); 
-  static_assert(cmm.minute() == 0, "Conversion.minute"); 
-  constexpr civil_second css(cmm); 
-  static_assert(css.second() == 0, "Conversion.second"); 
-} 
- 
-// Normalization constexpr tests 
- 
-TEST(CivilTime, Normalized) { 
-  constexpr civil_second cs(2016, 1, 28, 17, 14, 12); 
-  static_assert(cs.year() == 2016, "Normalized.year"); 
-  static_assert(cs.month() == 1, "Normalized.month"); 
-  static_assert(cs.day() == 28, "Normalized.day"); 
-  static_assert(cs.hour() == 17, "Normalized.hour"); 
-  static_assert(cs.minute() == 14, "Normalized.minute"); 
-  static_assert(cs.second() == 12, "Normalized.second"); 
-} 
- 
-TEST(CivilTime, SecondOverflow) { 
-  constexpr civil_second cs(2016, 1, 28, 17, 14, 121); 
-  static_assert(cs.year() == 2016, "SecondOverflow.year"); 
-  static_assert(cs.month() == 1, "SecondOverflow.month"); 
-  static_assert(cs.day() == 28, "SecondOverflow.day"); 
-  static_assert(cs.hour() == 17, "SecondOverflow.hour"); 
-  static_assert(cs.minute() == 16, "SecondOverflow.minute"); 
-  static_assert(cs.second() == 1, "SecondOverflow.second"); 
-} 
- 
-TEST(CivilTime, SecondUnderflow) { 
-  constexpr civil_second cs(2016, 1, 28, 17, 14, -121); 
-  static_assert(cs.year() == 2016, "SecondUnderflow.year"); 
-  static_assert(cs.month() == 1, "SecondUnderflow.month"); 
-  static_assert(cs.day() == 28, "SecondUnderflow.day"); 
-  static_assert(cs.hour() == 17, "SecondUnderflow.hour"); 
-  static_assert(cs.minute() == 11, "SecondUnderflow.minute"); 
-  static_assert(cs.second() == 59, "SecondUnderflow.second"); 
-} 
- 
-TEST(CivilTime, MinuteOverflow) { 
-  constexpr civil_second cs(2016, 1, 28, 17, 121, 12); 
-  static_assert(cs.year() == 2016, "MinuteOverflow.year"); 
-  static_assert(cs.month() == 1, "MinuteOverflow.month"); 
-  static_assert(cs.day() == 28, "MinuteOverflow.day"); 
-  static_assert(cs.hour() == 19, "MinuteOverflow.hour"); 
-  static_assert(cs.minute() == 1, "MinuteOverflow.minute"); 
-  static_assert(cs.second() == 12, "MinuteOverflow.second"); 
-} 
- 
-TEST(CivilTime, MinuteUnderflow) { 
-  constexpr civil_second cs(2016, 1, 28, 17, -121, 12); 
-  static_assert(cs.year() == 2016, "MinuteUnderflow.year"); 
-  static_assert(cs.month() == 1, "MinuteUnderflow.month"); 
-  static_assert(cs.day() == 28, "MinuteUnderflow.day"); 
-  static_assert(cs.hour() == 14, "MinuteUnderflow.hour"); 
-  static_assert(cs.minute() == 59, "MinuteUnderflow.minute"); 
-  static_assert(cs.second() == 12, "MinuteUnderflow.second"); 
-} 
- 
-TEST(CivilTime, HourOverflow) { 
-  constexpr civil_second cs(2016, 1, 28, 49, 14, 12); 
-  static_assert(cs.year() == 2016, "HourOverflow.year"); 
-  static_assert(cs.month() == 1, "HourOverflow.month"); 
-  static_assert(cs.day() == 30, "HourOverflow.day"); 
-  static_assert(cs.hour() == 1, "HourOverflow.hour"); 
-  static_assert(cs.minute() == 14, "HourOverflow.minute"); 
-  static_assert(cs.second() == 12, "HourOverflow.second"); 
-} 
- 
-TEST(CivilTime, HourUnderflow) { 
-  constexpr civil_second cs(2016, 1, 28, -49, 14, 12); 
-  static_assert(cs.year() == 2016, "HourUnderflow.year"); 
-  static_assert(cs.month() == 1, "HourUnderflow.month"); 
-  static_assert(cs.day() == 25, "HourUnderflow.day"); 
-  static_assert(cs.hour() == 23, "HourUnderflow.hour"); 
-  static_assert(cs.minute() == 14, "HourUnderflow.minute"); 
-  static_assert(cs.second() == 12, "HourUnderflow.second"); 
-} 
- 
-TEST(CivilTime, MonthOverflow) { 
-  constexpr civil_second cs(2016, 25, 28, 17, 14, 12); 
-  static_assert(cs.year() == 2018, "MonthOverflow.year"); 
-  static_assert(cs.month() == 1, "MonthOverflow.month"); 
-  static_assert(cs.day() == 28, "MonthOverflow.day"); 
-  static_assert(cs.hour() == 17, "MonthOverflow.hour"); 
-  static_assert(cs.minute() == 14, "MonthOverflow.minute"); 
-  static_assert(cs.second() == 12, "MonthOverflow.second"); 
-} 
- 
-TEST(CivilTime, MonthUnderflow) { 
-  constexpr civil_second cs(2016, -25, 28, 17, 14, 12); 
-  static_assert(cs.year() == 2013, "MonthUnderflow.year"); 
-  static_assert(cs.month() == 11, "MonthUnderflow.month"); 
-  static_assert(cs.day() == 28, "MonthUnderflow.day"); 
-  static_assert(cs.hour() == 17, "MonthUnderflow.hour"); 
-  static_assert(cs.minute() == 14, "MonthUnderflow.minute"); 
-  static_assert(cs.second() == 12, "MonthUnderflow.second"); 
-} 
- 
-TEST(CivilTime, C4Overflow) { 
-  constexpr civil_second cs(2016, 1, 292195, 17, 14, 12); 
-  static_assert(cs.year() == 2816, "C4Overflow.year"); 
-  static_assert(cs.month() == 1, "C4Overflow.month"); 
-  static_assert(cs.day() == 1, "C4Overflow.day"); 
-  static_assert(cs.hour() == 17, "C4Overflow.hour"); 
-  static_assert(cs.minute() == 14, "C4Overflow.minute"); 
-  static_assert(cs.second() == 12, "C4Overflow.second"); 
-} 
- 
-TEST(CivilTime, C4Underflow) { 
-  constexpr civil_second cs(2016, 1, -292195, 17, 14, 12); 
-  static_assert(cs.year() == 1215, "C4Underflow.year"); 
-  static_assert(cs.month() == 12, "C4Underflow.month"); 
-  static_assert(cs.day() == 30, "C4Underflow.day"); 
-  static_assert(cs.hour() == 17, "C4Underflow.hour"); 
-  static_assert(cs.minute() == 14, "C4Underflow.minute"); 
-  static_assert(cs.second() == 12, "C4Underflow.second"); 
-} 
- 
-TEST(CivilTime, MixedNormalization) { 
-  constexpr civil_second cs(2016, -42, 122, 99, -147, 4949); 
-  static_assert(cs.year() == 2012, "MixedNormalization.year"); 
-  static_assert(cs.month() == 10, "MixedNormalization.month"); 
-  static_assert(cs.day() == 4, "MixedNormalization.day"); 
-  static_assert(cs.hour() == 1, "MixedNormalization.hour"); 
-  static_assert(cs.minute() == 55, "MixedNormalization.minute"); 
-  static_assert(cs.second() == 29, "MixedNormalization.second"); 
-} 
- 
-// Relational constexpr tests 
- 
-TEST(CivilTime, Less) { 
-  constexpr civil_second cs1(2016, 1, 28, 17, 14, 12); 
-  constexpr civil_second cs2(2016, 1, 28, 17, 14, 13); 
-  constexpr bool less = cs1 < cs2; 
-  static_assert(less, "Less"); 
-} 
- 
-// Arithmetic constexpr tests 
- 
-TEST(CivilTime, Addition) { 
-  constexpr civil_second cs1(2016, 1, 28, 17, 14, 12); 
-  constexpr civil_second cs2 = cs1 + 50; 
-  static_assert(cs2.year() == 2016, "Addition.year"); 
-  static_assert(cs2.month() == 1, "Addition.month"); 
-  static_assert(cs2.day() == 28, "Addition.day"); 
-  static_assert(cs2.hour() == 17, "Addition.hour"); 
-  static_assert(cs2.minute() == 15, "Addition.minute"); 
-  static_assert(cs2.second() == 2, "Addition.second"); 
-} 
- 
-TEST(CivilTime, Subtraction) { 
-  constexpr civil_second cs1(2016, 1, 28, 17, 14, 12); 
-  constexpr civil_second cs2 = cs1 - 50; 
-  static_assert(cs2.year() == 2016, "Subtraction.year"); 
-  static_assert(cs2.month() == 1, "Subtraction.month"); 
-  static_assert(cs2.day() == 28, "Subtraction.day"); 
-  static_assert(cs2.hour() == 17, "Subtraction.hour"); 
-  static_assert(cs2.minute() == 13, "Subtraction.minute"); 
-  static_assert(cs2.second() == 22, "Subtraction.second"); 
-} 
- 
+// Construction constexpr tests
+
+TEST(CivilTime, Normal) {
+  constexpr civil_second css(2016, 1, 28, 17, 14, 12);
+  static_assert(css.second() == 12, "Normal.second");
+  constexpr civil_minute cmm(2016, 1, 28, 17, 14);
+  static_assert(cmm.minute() == 14, "Normal.minute");
+  constexpr civil_hour chh(2016, 1, 28, 17);
+  static_assert(chh.hour() == 17, "Normal.hour");
+  constexpr civil_day cd(2016, 1, 28);
+  static_assert(cd.day() == 28, "Normal.day");
+  constexpr civil_month cm(2016, 1);
+  static_assert(cm.month() == 1, "Normal.month");
+  constexpr civil_year cy(2016);
+  static_assert(cy.year() == 2016, "Normal.year");
+}
+
+TEST(CivilTime, Conversion) {
+  constexpr civil_year cy(2016);
+  static_assert(cy.year() == 2016, "Conversion.year");
+  constexpr civil_month cm(cy);
+  static_assert(cm.month() == 1, "Conversion.month");
+  constexpr civil_day cd(cm);
+  static_assert(cd.day() == 1, "Conversion.day");
+  constexpr civil_hour chh(cd);
+  static_assert(chh.hour() == 0, "Conversion.hour");
+  constexpr civil_minute cmm(chh);
+  static_assert(cmm.minute() == 0, "Conversion.minute");
+  constexpr civil_second css(cmm);
+  static_assert(css.second() == 0, "Conversion.second");
+}
+
+// Normalization constexpr tests
+
+TEST(CivilTime, Normalized) {
+  constexpr civil_second cs(2016, 1, 28, 17, 14, 12);
+  static_assert(cs.year() == 2016, "Normalized.year");
+  static_assert(cs.month() == 1, "Normalized.month");
+  static_assert(cs.day() == 28, "Normalized.day");
+  static_assert(cs.hour() == 17, "Normalized.hour");
+  static_assert(cs.minute() == 14, "Normalized.minute");
+  static_assert(cs.second() == 12, "Normalized.second");
+}
+
+TEST(CivilTime, SecondOverflow) {
+  constexpr civil_second cs(2016, 1, 28, 17, 14, 121);
+  static_assert(cs.year() == 2016, "SecondOverflow.year");
+  static_assert(cs.month() == 1, "SecondOverflow.month");
+  static_assert(cs.day() == 28, "SecondOverflow.day");
+  static_assert(cs.hour() == 17, "SecondOverflow.hour");
+  static_assert(cs.minute() == 16, "SecondOverflow.minute");
+  static_assert(cs.second() == 1, "SecondOverflow.second");
+}
+
+TEST(CivilTime, SecondUnderflow) {
+  constexpr civil_second cs(2016, 1, 28, 17, 14, -121);
+  static_assert(cs.year() == 2016, "SecondUnderflow.year");
+  static_assert(cs.month() == 1, "SecondUnderflow.month");
+  static_assert(cs.day() == 28, "SecondUnderflow.day");
+  static_assert(cs.hour() == 17, "SecondUnderflow.hour");
+  static_assert(cs.minute() == 11, "SecondUnderflow.minute");
+  static_assert(cs.second() == 59, "SecondUnderflow.second");
+}
+
+TEST(CivilTime, MinuteOverflow) {
+  constexpr civil_second cs(2016, 1, 28, 17, 121, 12);
+  static_assert(cs.year() == 2016, "MinuteOverflow.year");
+  static_assert(cs.month() == 1, "MinuteOverflow.month");
+  static_assert(cs.day() == 28, "MinuteOverflow.day");
+  static_assert(cs.hour() == 19, "MinuteOverflow.hour");
+  static_assert(cs.minute() == 1, "MinuteOverflow.minute");
+  static_assert(cs.second() == 12, "MinuteOverflow.second");
+}
+
+TEST(CivilTime, MinuteUnderflow) {
+  constexpr civil_second cs(2016, 1, 28, 17, -121, 12);
+  static_assert(cs.year() == 2016, "MinuteUnderflow.year");
+  static_assert(cs.month() == 1, "MinuteUnderflow.month");
+  static_assert(cs.day() == 28, "MinuteUnderflow.day");
+  static_assert(cs.hour() == 14, "MinuteUnderflow.hour");
+  static_assert(cs.minute() == 59, "MinuteUnderflow.minute");
+  static_assert(cs.second() == 12, "MinuteUnderflow.second");
+}
+
+TEST(CivilTime, HourOverflow) {
+  constexpr civil_second cs(2016, 1, 28, 49, 14, 12);
+  static_assert(cs.year() == 2016, "HourOverflow.year");
+  static_assert(cs.month() == 1, "HourOverflow.month");
+  static_assert(cs.day() == 30, "HourOverflow.day");
+  static_assert(cs.hour() == 1, "HourOverflow.hour");
+  static_assert(cs.minute() == 14, "HourOverflow.minute");
+  static_assert(cs.second() == 12, "HourOverflow.second");
+}
+
+TEST(CivilTime, HourUnderflow) {
+  constexpr civil_second cs(2016, 1, 28, -49, 14, 12);
+  static_assert(cs.year() == 2016, "HourUnderflow.year");
+  static_assert(cs.month() == 1, "HourUnderflow.month");
+  static_assert(cs.day() == 25, "HourUnderflow.day");
+  static_assert(cs.hour() == 23, "HourUnderflow.hour");
+  static_assert(cs.minute() == 14, "HourUnderflow.minute");
+  static_assert(cs.second() == 12, "HourUnderflow.second");
+}
+
+TEST(CivilTime, MonthOverflow) {
+  constexpr civil_second cs(2016, 25, 28, 17, 14, 12);
+  static_assert(cs.year() == 2018, "MonthOverflow.year");
+  static_assert(cs.month() == 1, "MonthOverflow.month");
+  static_assert(cs.day() == 28, "MonthOverflow.day");
+  static_assert(cs.hour() == 17, "MonthOverflow.hour");
+  static_assert(cs.minute() == 14, "MonthOverflow.minute");
+  static_assert(cs.second() == 12, "MonthOverflow.second");
+}
+
+TEST(CivilTime, MonthUnderflow) {
+  constexpr civil_second cs(2016, -25, 28, 17, 14, 12);
+  static_assert(cs.year() == 2013, "MonthUnderflow.year");
+  static_assert(cs.month() == 11, "MonthUnderflow.month");
+  static_assert(cs.day() == 28, "MonthUnderflow.day");
+  static_assert(cs.hour() == 17, "MonthUnderflow.hour");
+  static_assert(cs.minute() == 14, "MonthUnderflow.minute");
+  static_assert(cs.second() == 12, "MonthUnderflow.second");
+}
+
+TEST(CivilTime, C4Overflow) {
+  constexpr civil_second cs(2016, 1, 292195, 17, 14, 12);
+  static_assert(cs.year() == 2816, "C4Overflow.year");
+  static_assert(cs.month() == 1, "C4Overflow.month");
+  static_assert(cs.day() == 1, "C4Overflow.day");
+  static_assert(cs.hour() == 17, "C4Overflow.hour");
+  static_assert(cs.minute() == 14, "C4Overflow.minute");
+  static_assert(cs.second() == 12, "C4Overflow.second");
+}
+
+TEST(CivilTime, C4Underflow) {
+  constexpr civil_second cs(2016, 1, -292195, 17, 14, 12);
+  static_assert(cs.year() == 1215, "C4Underflow.year");
+  static_assert(cs.month() == 12, "C4Underflow.month");
+  static_assert(cs.day() == 30, "C4Underflow.day");
+  static_assert(cs.hour() == 17, "C4Underflow.hour");
+  static_assert(cs.minute() == 14, "C4Underflow.minute");
+  static_assert(cs.second() == 12, "C4Underflow.second");
+}
+
+TEST(CivilTime, MixedNormalization) {
+  constexpr civil_second cs(2016, -42, 122, 99, -147, 4949);
+  static_assert(cs.year() == 2012, "MixedNormalization.year");
+  static_assert(cs.month() == 10, "MixedNormalization.month");
+  static_assert(cs.day() == 4, "MixedNormalization.day");
+  static_assert(cs.hour() == 1, "MixedNormalization.hour");
+  static_assert(cs.minute() == 55, "MixedNormalization.minute");
+  static_assert(cs.second() == 29, "MixedNormalization.second");
+}
+
+// Relational constexpr tests
+
+TEST(CivilTime, Less) {
+  constexpr civil_second cs1(2016, 1, 28, 17, 14, 12);
+  constexpr civil_second cs2(2016, 1, 28, 17, 14, 13);
+  constexpr bool less = cs1 < cs2;
+  static_assert(less, "Less");
+}
+
+// Arithmetic constexpr tests
+
+TEST(CivilTime, Addition) {
+  constexpr civil_second cs1(2016, 1, 28, 17, 14, 12);
+  constexpr civil_second cs2 = cs1 + 50;
+  static_assert(cs2.year() == 2016, "Addition.year");
+  static_assert(cs2.month() == 1, "Addition.month");
+  static_assert(cs2.day() == 28, "Addition.day");
+  static_assert(cs2.hour() == 17, "Addition.hour");
+  static_assert(cs2.minute() == 15, "Addition.minute");
+  static_assert(cs2.second() == 2, "Addition.second");
+}
+
+TEST(CivilTime, Subtraction) {
+  constexpr civil_second cs1(2016, 1, 28, 17, 14, 12);
+  constexpr civil_second cs2 = cs1 - 50;
+  static_assert(cs2.year() == 2016, "Subtraction.year");
+  static_assert(cs2.month() == 1, "Subtraction.month");
+  static_assert(cs2.day() == 28, "Subtraction.day");
+  static_assert(cs2.hour() == 17, "Subtraction.hour");
+  static_assert(cs2.minute() == 13, "Subtraction.minute");
+  static_assert(cs2.second() == 22, "Subtraction.second");
+}
+
 TEST(CivilTime, Difference) {
-  constexpr civil_day cd1(2016, 1, 28); 
-  constexpr civil_day cd2(2015, 1, 28); 
-  constexpr int diff = cd1 - cd2; 
-  static_assert(diff == 365, "Difference"); 
-} 
- 
-// NOTE: Run this with --copt=-ftrapv to detect overflow problems. 
+  constexpr civil_day cd1(2016, 1, 28);
+  constexpr civil_day cd2(2015, 1, 28);
+  constexpr int diff = cd1 - cd2;
+  static_assert(diff == 365, "Difference");
+}
+
+// NOTE: Run this with --copt=-ftrapv to detect overflow problems.
 TEST(CivilTime, ConstructionWithHugeYear) {
   constexpr civil_hour h(-9223372036854775807, 1, 1, -1);
   static_assert(h.year() == -9223372036854775807 - 1,
@@ -241,825 +241,825 @@ TEST(CivilTime, ConstructionWithHugeYear) {
 }
 
 // NOTE: Run this with --copt=-ftrapv to detect overflow problems.
-TEST(CivilTime, DifferenceWithHugeYear) { 
-  { 
-    constexpr civil_day d1(9223372036854775807, 1, 1); 
-    constexpr civil_day d2(9223372036854775807, 12, 31); 
-    static_assert(d2 - d1 == 364, "DifferenceWithHugeYear"); 
-  } 
-  { 
-    constexpr civil_day d1(-9223372036854775807 - 1, 1, 1); 
-    constexpr civil_day d2(-9223372036854775807 - 1, 12, 31); 
-    static_assert(d2 - d1 == 365, "DifferenceWithHugeYear"); 
-  } 
-  { 
-    // Check the limits of the return value at the end of the year range. 
-    constexpr civil_day d1(9223372036854775807, 1, 1); 
-    constexpr civil_day d2(9198119301927009252, 6, 6); 
-    static_assert(d1 - d2 == 9223372036854775807, "DifferenceWithHugeYear"); 
-    static_assert((d2 - 1) - d1 == -9223372036854775807 - 1, 
-                  "DifferenceWithHugeYear"); 
-  } 
-  { 
-    // Check the limits of the return value at the start of the year range. 
-    constexpr civil_day d1(-9223372036854775807 - 1, 1, 1); 
-    constexpr civil_day d2(-9198119301927009254, 7, 28); 
-    static_assert(d2 - d1 == 9223372036854775807, "DifferenceWithHugeYear"); 
-    static_assert(d1 - (d2 + 1) == -9223372036854775807 - 1, 
-                  "DifferenceWithHugeYear"); 
-  } 
-  { 
-    // Check the limits of the return value from either side of year 0. 
-    constexpr civil_day d1(-12626367463883278, 9, 3); 
-    constexpr civil_day d2(12626367463883277, 3, 28); 
-    static_assert(d2 - d1 == 9223372036854775807, "DifferenceWithHugeYear"); 
-    static_assert(d1 - (d2 + 1) == -9223372036854775807 - 1, 
-                  "DifferenceWithHugeYear"); 
-  } 
-} 
- 
-// NOTE: Run this with --copt=-ftrapv to detect overflow problems. 
-TEST(CivilTime, DifferenceNoIntermediateOverflow) { 
-  { 
-    // The difference up to the minute field would be below the minimum 
-    // diff_t, but the 52 extra seconds brings us back to the minimum. 
-    constexpr civil_second s1(-292277022657, 1, 27, 8, 29 - 1, 52); 
-    constexpr civil_second s2(1970, 1, 1, 0, 0 - 1, 0); 
-    static_assert(s1 - s2 == -9223372036854775807 - 1, 
-                  "DifferenceNoIntermediateOverflow"); 
-  } 
-  { 
-    // The difference up to the minute field would be above the maximum 
-    // diff_t, but the -53 extra seconds brings us back to the maximum. 
-    constexpr civil_second s1(292277026596, 12, 4, 15, 30, 7 - 7); 
-    constexpr civil_second s2(1970, 1, 1, 0, 0, 0 - 7); 
-    static_assert(s1 - s2 == 9223372036854775807, 
-                  "DifferenceNoIntermediateOverflow"); 
-  } 
-} 
- 
-// Helper constexpr tests 
- 
-TEST(CivilTime, WeekDay) { 
-  constexpr civil_day cd(2016, 1, 28); 
-  constexpr weekday wd = get_weekday(cd); 
-  static_assert(wd == weekday::thursday, "Weekday"); 
-} 
- 
-TEST(CivilTime, NextWeekDay) { 
-  constexpr civil_day cd(2016, 1, 28); 
-  constexpr civil_day next = next_weekday(cd, weekday::thursday); 
-  static_assert(next.year() == 2016, "NextWeekDay.year"); 
-  static_assert(next.month() == 2, "NextWeekDay.month"); 
-  static_assert(next.day() == 4, "NextWeekDay.day"); 
-} 
- 
-TEST(CivilTime, PrevWeekDay) { 
-  constexpr civil_day cd(2016, 1, 28); 
-  constexpr civil_day prev = prev_weekday(cd, weekday::thursday); 
-  static_assert(prev.year() == 2016, "PrevWeekDay.year"); 
-  static_assert(prev.month() == 1, "PrevWeekDay.month"); 
-  static_assert(prev.day() == 21, "PrevWeekDay.day"); 
-} 
- 
-TEST(CivilTime, YearDay) { 
-  constexpr civil_day cd(2016, 1, 28); 
-  constexpr int yd = get_yearday(cd); 
-  static_assert(yd == 28, "YearDay"); 
-} 
+TEST(CivilTime, DifferenceWithHugeYear) {
+  {
+    constexpr civil_day d1(9223372036854775807, 1, 1);
+    constexpr civil_day d2(9223372036854775807, 12, 31);
+    static_assert(d2 - d1 == 364, "DifferenceWithHugeYear");
+  }
+  {
+    constexpr civil_day d1(-9223372036854775807 - 1, 1, 1);
+    constexpr civil_day d2(-9223372036854775807 - 1, 12, 31);
+    static_assert(d2 - d1 == 365, "DifferenceWithHugeYear");
+  }
+  {
+    // Check the limits of the return value at the end of the year range.
+    constexpr civil_day d1(9223372036854775807, 1, 1);
+    constexpr civil_day d2(9198119301927009252, 6, 6);
+    static_assert(d1 - d2 == 9223372036854775807, "DifferenceWithHugeYear");
+    static_assert((d2 - 1) - d1 == -9223372036854775807 - 1,
+                  "DifferenceWithHugeYear");
+  }
+  {
+    // Check the limits of the return value at the start of the year range.
+    constexpr civil_day d1(-9223372036854775807 - 1, 1, 1);
+    constexpr civil_day d2(-9198119301927009254, 7, 28);
+    static_assert(d2 - d1 == 9223372036854775807, "DifferenceWithHugeYear");
+    static_assert(d1 - (d2 + 1) == -9223372036854775807 - 1,
+                  "DifferenceWithHugeYear");
+  }
+  {
+    // Check the limits of the return value from either side of year 0.
+    constexpr civil_day d1(-12626367463883278, 9, 3);
+    constexpr civil_day d2(12626367463883277, 3, 28);
+    static_assert(d2 - d1 == 9223372036854775807, "DifferenceWithHugeYear");
+    static_assert(d1 - (d2 + 1) == -9223372036854775807 - 1,
+                  "DifferenceWithHugeYear");
+  }
+}
+
+// NOTE: Run this with --copt=-ftrapv to detect overflow problems.
+TEST(CivilTime, DifferenceNoIntermediateOverflow) {
+  {
+    // The difference up to the minute field would be below the minimum
+    // diff_t, but the 52 extra seconds brings us back to the minimum.
+    constexpr civil_second s1(-292277022657, 1, 27, 8, 29 - 1, 52);
+    constexpr civil_second s2(1970, 1, 1, 0, 0 - 1, 0);
+    static_assert(s1 - s2 == -9223372036854775807 - 1,
+                  "DifferenceNoIntermediateOverflow");
+  }
+  {
+    // The difference up to the minute field would be above the maximum
+    // diff_t, but the -53 extra seconds brings us back to the maximum.
+    constexpr civil_second s1(292277026596, 12, 4, 15, 30, 7 - 7);
+    constexpr civil_second s2(1970, 1, 1, 0, 0, 0 - 7);
+    static_assert(s1 - s2 == 9223372036854775807,
+                  "DifferenceNoIntermediateOverflow");
+  }
+}
+
+// Helper constexpr tests
+
+TEST(CivilTime, WeekDay) {
+  constexpr civil_day cd(2016, 1, 28);
+  constexpr weekday wd = get_weekday(cd);
+  static_assert(wd == weekday::thursday, "Weekday");
+}
+
+TEST(CivilTime, NextWeekDay) {
+  constexpr civil_day cd(2016, 1, 28);
+  constexpr civil_day next = next_weekday(cd, weekday::thursday);
+  static_assert(next.year() == 2016, "NextWeekDay.year");
+  static_assert(next.month() == 2, "NextWeekDay.month");
+  static_assert(next.day() == 4, "NextWeekDay.day");
+}
+
+TEST(CivilTime, PrevWeekDay) {
+  constexpr civil_day cd(2016, 1, 28);
+  constexpr civil_day prev = prev_weekday(cd, weekday::thursday);
+  static_assert(prev.year() == 2016, "PrevWeekDay.year");
+  static_assert(prev.month() == 1, "PrevWeekDay.month");
+  static_assert(prev.day() == 21, "PrevWeekDay.day");
+}
+
+TEST(CivilTime, YearDay) {
+  constexpr civil_day cd(2016, 1, 28);
+  constexpr int yd = get_yearday(cd);
+  static_assert(yd == 28, "YearDay");
+}
 #endif  // __cpp_constexpr >= 201304 || (defined(_MSC_VER) && _MSC_VER >= 1910)
- 
-// The remaining tests do not use constexpr. 
- 
-TEST(CivilTime, DefaultConstruction) { 
-  civil_second ss; 
-  EXPECT_EQ("1970-01-01T00:00:00", Format(ss)); 
- 
-  civil_minute mm; 
-  EXPECT_EQ("1970-01-01T00:00", Format(mm)); 
- 
-  civil_hour hh; 
-  EXPECT_EQ("1970-01-01T00", Format(hh)); 
- 
-  civil_day d; 
-  EXPECT_EQ("1970-01-01", Format(d)); 
- 
-  civil_month m; 
-  EXPECT_EQ("1970-01", Format(m)); 
- 
-  civil_year y; 
-  EXPECT_EQ("1970", Format(y)); 
-} 
- 
-TEST(CivilTime, StructMember) { 
-  struct S { 
-    civil_day day; 
-  }; 
-  S s = {}; 
-  EXPECT_EQ(civil_day{}, s.day); 
-} 
- 
-TEST(CivilTime, FieldsConstruction) { 
-  EXPECT_EQ("2015-01-02T03:04:05", Format(civil_second(2015, 1, 2, 3, 4, 5))); 
-  EXPECT_EQ("2015-01-02T03:04:00", Format(civil_second(2015, 1, 2, 3, 4))); 
-  EXPECT_EQ("2015-01-02T03:00:00", Format(civil_second(2015, 1, 2, 3))); 
-  EXPECT_EQ("2015-01-02T00:00:00", Format(civil_second(2015, 1, 2))); 
-  EXPECT_EQ("2015-01-01T00:00:00", Format(civil_second(2015, 1))); 
-  EXPECT_EQ("2015-01-01T00:00:00", Format(civil_second(2015))); 
- 
-  EXPECT_EQ("2015-01-02T03:04", Format(civil_minute(2015, 1, 2, 3, 4, 5))); 
-  EXPECT_EQ("2015-01-02T03:04", Format(civil_minute(2015, 1, 2, 3, 4))); 
-  EXPECT_EQ("2015-01-02T03:00", Format(civil_minute(2015, 1, 2, 3))); 
-  EXPECT_EQ("2015-01-02T00:00", Format(civil_minute(2015, 1, 2))); 
-  EXPECT_EQ("2015-01-01T00:00", Format(civil_minute(2015, 1))); 
-  EXPECT_EQ("2015-01-01T00:00", Format(civil_minute(2015))); 
- 
-  EXPECT_EQ("2015-01-02T03", Format(civil_hour(2015, 1, 2, 3, 4, 5))); 
-  EXPECT_EQ("2015-01-02T03", Format(civil_hour(2015, 1, 2, 3, 4))); 
-  EXPECT_EQ("2015-01-02T03", Format(civil_hour(2015, 1, 2, 3))); 
-  EXPECT_EQ("2015-01-02T00", Format(civil_hour(2015, 1, 2))); 
-  EXPECT_EQ("2015-01-01T00", Format(civil_hour(2015, 1))); 
-  EXPECT_EQ("2015-01-01T00", Format(civil_hour(2015))); 
- 
-  EXPECT_EQ("2015-01-02", Format(civil_day(2015, 1, 2, 3, 4, 5))); 
-  EXPECT_EQ("2015-01-02", Format(civil_day(2015, 1, 2, 3, 4))); 
-  EXPECT_EQ("2015-01-02", Format(civil_day(2015, 1, 2, 3))); 
-  EXPECT_EQ("2015-01-02", Format(civil_day(2015, 1, 2))); 
-  EXPECT_EQ("2015-01-01", Format(civil_day(2015, 1))); 
-  EXPECT_EQ("2015-01-01", Format(civil_day(2015))); 
- 
-  EXPECT_EQ("2015-01", Format(civil_month(2015, 1, 2, 3, 4, 5))); 
-  EXPECT_EQ("2015-01", Format(civil_month(2015, 1, 2, 3, 4))); 
-  EXPECT_EQ("2015-01", Format(civil_month(2015, 1, 2, 3))); 
-  EXPECT_EQ("2015-01", Format(civil_month(2015, 1, 2))); 
-  EXPECT_EQ("2015-01", Format(civil_month(2015, 1))); 
-  EXPECT_EQ("2015-01", Format(civil_month(2015))); 
- 
-  EXPECT_EQ("2015", Format(civil_year(2015, 1, 2, 3, 4, 5))); 
-  EXPECT_EQ("2015", Format(civil_year(2015, 1, 2, 3, 4))); 
-  EXPECT_EQ("2015", Format(civil_year(2015, 1, 2, 3))); 
-  EXPECT_EQ("2015", Format(civil_year(2015, 1, 2))); 
-  EXPECT_EQ("2015", Format(civil_year(2015, 1))); 
-  EXPECT_EQ("2015", Format(civil_year(2015))); 
-} 
- 
-TEST(CivilTime, FieldsConstructionLimits) { 
-  const int kIntMax = std::numeric_limits<int>::max(); 
-  EXPECT_EQ("2038-01-19T03:14:07", 
-            Format(civil_second(1970, 1, 1, 0, 0, kIntMax))); 
-  EXPECT_EQ("6121-02-11T05:21:07", 
-            Format(civil_second(1970, 1, 1, 0, kIntMax, kIntMax))); 
-  EXPECT_EQ("251104-11-20T12:21:07", 
-            Format(civil_second(1970, 1, 1, kIntMax, kIntMax, kIntMax))); 
-  EXPECT_EQ("6130715-05-30T12:21:07", 
-            Format(civil_second(1970, 1, kIntMax, kIntMax, kIntMax, kIntMax))); 
-  EXPECT_EQ( 
-      "185087685-11-26T12:21:07", 
-      Format(civil_second(1970, kIntMax, kIntMax, kIntMax, kIntMax, kIntMax))); 
- 
-  const int kIntMin = std::numeric_limits<int>::min(); 
-  EXPECT_EQ("1901-12-13T20:45:52", 
-            Format(civil_second(1970, 1, 1, 0, 0, kIntMin))); 
-  EXPECT_EQ("-2182-11-20T18:37:52", 
-            Format(civil_second(1970, 1, 1, 0, kIntMin, kIntMin))); 
-  EXPECT_EQ("-247165-02-11T10:37:52", 
-            Format(civil_second(1970, 1, 1, kIntMin, kIntMin, kIntMin))); 
-  EXPECT_EQ("-6126776-08-01T10:37:52", 
-            Format(civil_second(1970, 1, kIntMin, kIntMin, kIntMin, kIntMin))); 
-  EXPECT_EQ( 
-      "-185083747-10-31T10:37:52", 
-      Format(civil_second(1970, kIntMin, kIntMin, kIntMin, kIntMin, kIntMin))); 
-} 
- 
-TEST(CivilTime, ImplicitCrossAlignment) { 
-  civil_year year(2015); 
-  civil_month month = year; 
-  civil_day day = month; 
-  civil_hour hour = day; 
-  civil_minute minute = hour; 
-  civil_second second = minute; 
- 
-  second = year; 
-  EXPECT_EQ(second, year); 
-  second = month; 
-  EXPECT_EQ(second, month); 
-  second = day; 
-  EXPECT_EQ(second, day); 
-  second = hour; 
-  EXPECT_EQ(second, hour); 
-  second = minute; 
-  EXPECT_EQ(second, minute); 
- 
-  minute = year; 
-  EXPECT_EQ(minute, year); 
-  minute = month; 
-  EXPECT_EQ(minute, month); 
-  minute = day; 
-  EXPECT_EQ(minute, day); 
-  minute = hour; 
-  EXPECT_EQ(minute, hour); 
- 
-  hour = year; 
-  EXPECT_EQ(hour, year); 
-  hour = month; 
-  EXPECT_EQ(hour, month); 
-  hour = day; 
-  EXPECT_EQ(hour, day); 
- 
-  day = year; 
-  EXPECT_EQ(day, year); 
-  day = month; 
-  EXPECT_EQ(day, month); 
- 
-  month = year; 
-  EXPECT_EQ(month, year); 
- 
-  // Ensures unsafe conversions are not allowed. 
-  EXPECT_FALSE((std::is_convertible<civil_second, civil_minute>::value)); 
-  EXPECT_FALSE((std::is_convertible<civil_second, civil_hour>::value)); 
-  EXPECT_FALSE((std::is_convertible<civil_second, civil_day>::value)); 
-  EXPECT_FALSE((std::is_convertible<civil_second, civil_month>::value)); 
-  EXPECT_FALSE((std::is_convertible<civil_second, civil_year>::value)); 
- 
-  EXPECT_FALSE((std::is_convertible<civil_minute, civil_hour>::value)); 
-  EXPECT_FALSE((std::is_convertible<civil_minute, civil_day>::value)); 
-  EXPECT_FALSE((std::is_convertible<civil_minute, civil_month>::value)); 
-  EXPECT_FALSE((std::is_convertible<civil_minute, civil_year>::value)); 
- 
-  EXPECT_FALSE((std::is_convertible<civil_hour, civil_day>::value)); 
-  EXPECT_FALSE((std::is_convertible<civil_hour, civil_month>::value)); 
-  EXPECT_FALSE((std::is_convertible<civil_hour, civil_year>::value)); 
- 
-  EXPECT_FALSE((std::is_convertible<civil_day, civil_month>::value)); 
-  EXPECT_FALSE((std::is_convertible<civil_day, civil_year>::value)); 
- 
-  EXPECT_FALSE((std::is_convertible<civil_month, civil_year>::value)); 
-} 
- 
-TEST(CivilTime, ExplicitCrossAlignment) { 
-  // 
-  // Assign from smaller units -> larger units 
-  // 
- 
-  civil_second second(2015, 1, 2, 3, 4, 5); 
-  EXPECT_EQ("2015-01-02T03:04:05", Format(second)); 
- 
-  civil_minute minute(second); 
-  EXPECT_EQ("2015-01-02T03:04", Format(minute)); 
- 
-  civil_hour hour(minute); 
-  EXPECT_EQ("2015-01-02T03", Format(hour)); 
- 
-  civil_day day(hour); 
-  EXPECT_EQ("2015-01-02", Format(day)); 
- 
-  civil_month month(day); 
-  EXPECT_EQ("2015-01", Format(month)); 
- 
-  civil_year year(month); 
-  EXPECT_EQ("2015", Format(year)); 
- 
-  // 
-  // Now assign from larger units -> smaller units 
-  // 
- 
-  month = civil_month(year); 
-  EXPECT_EQ("2015-01", Format(month)); 
- 
-  day = civil_day(month); 
-  EXPECT_EQ("2015-01-01", Format(day)); 
- 
-  hour = civil_hour(day); 
-  EXPECT_EQ("2015-01-01T00", Format(hour)); 
- 
-  minute = civil_minute(hour); 
-  EXPECT_EQ("2015-01-01T00:00", Format(minute)); 
- 
-  second = civil_second(minute); 
-  EXPECT_EQ("2015-01-01T00:00:00", Format(second)); 
-} 
- 
-// Metafunction to test whether difference is allowed between two types. 
-template <typename T1, typename T2> 
-struct HasDifference { 
-  template <typename U1, typename U2> 
-  static std::false_type test(...); 
-  template <typename U1, typename U2> 
-  static std::true_type test(decltype(std::declval<U1>() - std::declval<U2>())); 
-  static constexpr bool value = decltype(test<T1, T2>(0))::value; 
-}; 
- 
-TEST(CivilTime, DisallowCrossAlignedDifference) { 
-  // Difference is allowed between types with the same alignment. 
-  static_assert(HasDifference<civil_second, civil_second>::value, ""); 
-  static_assert(HasDifference<civil_minute, civil_minute>::value, ""); 
-  static_assert(HasDifference<civil_hour, civil_hour>::value, ""); 
-  static_assert(HasDifference<civil_day, civil_day>::value, ""); 
-  static_assert(HasDifference<civil_month, civil_month>::value, ""); 
-  static_assert(HasDifference<civil_year, civil_year>::value, ""); 
- 
-  // Difference is disallowed between types with different alignments. 
-  static_assert(!HasDifference<civil_second, civil_minute>::value, ""); 
-  static_assert(!HasDifference<civil_second, civil_hour>::value, ""); 
-  static_assert(!HasDifference<civil_second, civil_day>::value, ""); 
-  static_assert(!HasDifference<civil_second, civil_month>::value, ""); 
-  static_assert(!HasDifference<civil_second, civil_year>::value, ""); 
- 
-  static_assert(!HasDifference<civil_minute, civil_hour>::value, ""); 
-  static_assert(!HasDifference<civil_minute, civil_day>::value, ""); 
-  static_assert(!HasDifference<civil_minute, civil_month>::value, ""); 
-  static_assert(!HasDifference<civil_minute, civil_year>::value, ""); 
- 
-  static_assert(!HasDifference<civil_hour, civil_day>::value, ""); 
-  static_assert(!HasDifference<civil_hour, civil_month>::value, ""); 
-  static_assert(!HasDifference<civil_hour, civil_year>::value, ""); 
- 
-  static_assert(!HasDifference<civil_day, civil_month>::value, ""); 
-  static_assert(!HasDifference<civil_day, civil_year>::value, ""); 
- 
-  static_assert(!HasDifference<civil_month, civil_year>::value, ""); 
-} 
- 
-TEST(CivilTime, ValueSemantics) { 
-  const civil_hour a(2015, 1, 2, 3); 
-  const civil_hour b = a; 
-  const civil_hour c(b); 
-  civil_hour d; 
-  d = c; 
-  EXPECT_EQ("2015-01-02T03", Format(d)); 
-} 
- 
-TEST(CivilTime, Relational) { 
-  // Tests that the alignment unit is ignored in comparison. 
-  const civil_year year(2014); 
-  const civil_month month(year); 
-  EXPECT_EQ(year, month); 
- 
-#define TEST_RELATIONAL(OLDER, YOUNGER) \ 
-  do {                                  \ 
-    EXPECT_FALSE(OLDER < OLDER);        \ 
-    EXPECT_FALSE(OLDER > OLDER);        \ 
-    EXPECT_TRUE(OLDER >= OLDER);        \ 
-    EXPECT_TRUE(OLDER <= OLDER);        \ 
-    EXPECT_FALSE(YOUNGER < YOUNGER);    \ 
-    EXPECT_FALSE(YOUNGER > YOUNGER);    \ 
-    EXPECT_TRUE(YOUNGER >= YOUNGER);    \ 
-    EXPECT_TRUE(YOUNGER <= YOUNGER);    \ 
-    EXPECT_EQ(OLDER, OLDER);            \ 
-    EXPECT_NE(OLDER, YOUNGER);          \ 
-    EXPECT_LT(OLDER, YOUNGER);          \ 
-    EXPECT_LE(OLDER, YOUNGER);          \ 
-    EXPECT_GT(YOUNGER, OLDER);          \ 
-    EXPECT_GE(YOUNGER, OLDER);          \ 
-  } while (0) 
- 
-  // Alignment is ignored in comparison (verified above), so kSecond is used 
-  // to test comparison in all field positions. 
-  TEST_RELATIONAL(civil_second(2014, 1, 1, 0, 0, 0), 
-                  civil_second(2015, 1, 1, 0, 0, 0)); 
-  TEST_RELATIONAL(civil_second(2014, 1, 1, 0, 0, 0), 
-                  civil_second(2014, 2, 1, 0, 0, 0)); 
-  TEST_RELATIONAL(civil_second(2014, 1, 1, 0, 0, 0), 
-                  civil_second(2014, 1, 2, 0, 0, 0)); 
-  TEST_RELATIONAL(civil_second(2014, 1, 1, 0, 0, 0), 
-                  civil_second(2014, 1, 1, 1, 0, 0)); 
-  TEST_RELATIONAL(civil_second(2014, 1, 1, 1, 0, 0), 
-                  civil_second(2014, 1, 1, 1, 1, 0)); 
-  TEST_RELATIONAL(civil_second(2014, 1, 1, 1, 1, 0), 
-                  civil_second(2014, 1, 1, 1, 1, 1)); 
- 
+
+// The remaining tests do not use constexpr.
+
+TEST(CivilTime, DefaultConstruction) {
+  civil_second ss;
+  EXPECT_EQ("1970-01-01T00:00:00", Format(ss));
+
+  civil_minute mm;
+  EXPECT_EQ("1970-01-01T00:00", Format(mm));
+
+  civil_hour hh;
+  EXPECT_EQ("1970-01-01T00", Format(hh));
+
+  civil_day d;
+  EXPECT_EQ("1970-01-01", Format(d));
+
+  civil_month m;
+  EXPECT_EQ("1970-01", Format(m));
+
+  civil_year y;
+  EXPECT_EQ("1970", Format(y));
+}
+
+TEST(CivilTime, StructMember) {
+  struct S {
+    civil_day day;
+  };
+  S s = {};
+  EXPECT_EQ(civil_day{}, s.day);
+}
+
+TEST(CivilTime, FieldsConstruction) {
+  EXPECT_EQ("2015-01-02T03:04:05", Format(civil_second(2015, 1, 2, 3, 4, 5)));
+  EXPECT_EQ("2015-01-02T03:04:00", Format(civil_second(2015, 1, 2, 3, 4)));
+  EXPECT_EQ("2015-01-02T03:00:00", Format(civil_second(2015, 1, 2, 3)));
+  EXPECT_EQ("2015-01-02T00:00:00", Format(civil_second(2015, 1, 2)));
+  EXPECT_EQ("2015-01-01T00:00:00", Format(civil_second(2015, 1)));
+  EXPECT_EQ("2015-01-01T00:00:00", Format(civil_second(2015)));
+
+  EXPECT_EQ("2015-01-02T03:04", Format(civil_minute(2015, 1, 2, 3, 4, 5)));
+  EXPECT_EQ("2015-01-02T03:04", Format(civil_minute(2015, 1, 2, 3, 4)));
+  EXPECT_EQ("2015-01-02T03:00", Format(civil_minute(2015, 1, 2, 3)));
+  EXPECT_EQ("2015-01-02T00:00", Format(civil_minute(2015, 1, 2)));
+  EXPECT_EQ("2015-01-01T00:00", Format(civil_minute(2015, 1)));
+  EXPECT_EQ("2015-01-01T00:00", Format(civil_minute(2015)));
+
+  EXPECT_EQ("2015-01-02T03", Format(civil_hour(2015, 1, 2, 3, 4, 5)));
+  EXPECT_EQ("2015-01-02T03", Format(civil_hour(2015, 1, 2, 3, 4)));
+  EXPECT_EQ("2015-01-02T03", Format(civil_hour(2015, 1, 2, 3)));
+  EXPECT_EQ("2015-01-02T00", Format(civil_hour(2015, 1, 2)));
+  EXPECT_EQ("2015-01-01T00", Format(civil_hour(2015, 1)));
+  EXPECT_EQ("2015-01-01T00", Format(civil_hour(2015)));
+
+  EXPECT_EQ("2015-01-02", Format(civil_day(2015, 1, 2, 3, 4, 5)));
+  EXPECT_EQ("2015-01-02", Format(civil_day(2015, 1, 2, 3, 4)));
+  EXPECT_EQ("2015-01-02", Format(civil_day(2015, 1, 2, 3)));
+  EXPECT_EQ("2015-01-02", Format(civil_day(2015, 1, 2)));
+  EXPECT_EQ("2015-01-01", Format(civil_day(2015, 1)));
+  EXPECT_EQ("2015-01-01", Format(civil_day(2015)));
+
+  EXPECT_EQ("2015-01", Format(civil_month(2015, 1, 2, 3, 4, 5)));
+  EXPECT_EQ("2015-01", Format(civil_month(2015, 1, 2, 3, 4)));
+  EXPECT_EQ("2015-01", Format(civil_month(2015, 1, 2, 3)));
+  EXPECT_EQ("2015-01", Format(civil_month(2015, 1, 2)));
+  EXPECT_EQ("2015-01", Format(civil_month(2015, 1)));
+  EXPECT_EQ("2015-01", Format(civil_month(2015)));
+
+  EXPECT_EQ("2015", Format(civil_year(2015, 1, 2, 3, 4, 5)));
+  EXPECT_EQ("2015", Format(civil_year(2015, 1, 2, 3, 4)));
+  EXPECT_EQ("2015", Format(civil_year(2015, 1, 2, 3)));
+  EXPECT_EQ("2015", Format(civil_year(2015, 1, 2)));
+  EXPECT_EQ("2015", Format(civil_year(2015, 1)));
+  EXPECT_EQ("2015", Format(civil_year(2015)));
+}
+
+TEST(CivilTime, FieldsConstructionLimits) {
+  const int kIntMax = std::numeric_limits<int>::max();
+  EXPECT_EQ("2038-01-19T03:14:07",
+            Format(civil_second(1970, 1, 1, 0, 0, kIntMax)));
+  EXPECT_EQ("6121-02-11T05:21:07",
+            Format(civil_second(1970, 1, 1, 0, kIntMax, kIntMax)));
+  EXPECT_EQ("251104-11-20T12:21:07",
+            Format(civil_second(1970, 1, 1, kIntMax, kIntMax, kIntMax)));
+  EXPECT_EQ("6130715-05-30T12:21:07",
+            Format(civil_second(1970, 1, kIntMax, kIntMax, kIntMax, kIntMax)));
+  EXPECT_EQ(
+      "185087685-11-26T12:21:07",
+      Format(civil_second(1970, kIntMax, kIntMax, kIntMax, kIntMax, kIntMax)));
+
+  const int kIntMin = std::numeric_limits<int>::min();
+  EXPECT_EQ("1901-12-13T20:45:52",
+            Format(civil_second(1970, 1, 1, 0, 0, kIntMin)));
+  EXPECT_EQ("-2182-11-20T18:37:52",
+            Format(civil_second(1970, 1, 1, 0, kIntMin, kIntMin)));
+  EXPECT_EQ("-247165-02-11T10:37:52",
+            Format(civil_second(1970, 1, 1, kIntMin, kIntMin, kIntMin)));
+  EXPECT_EQ("-6126776-08-01T10:37:52",
+            Format(civil_second(1970, 1, kIntMin, kIntMin, kIntMin, kIntMin)));
+  EXPECT_EQ(
+      "-185083747-10-31T10:37:52",
+      Format(civil_second(1970, kIntMin, kIntMin, kIntMin, kIntMin, kIntMin)));
+}
+
+TEST(CivilTime, ImplicitCrossAlignment) {
+  civil_year year(2015);
+  civil_month month = year;
+  civil_day day = month;
+  civil_hour hour = day;
+  civil_minute minute = hour;
+  civil_second second = minute;
+
+  second = year;
+  EXPECT_EQ(second, year);
+  second = month;
+  EXPECT_EQ(second, month);
+  second = day;
+  EXPECT_EQ(second, day);
+  second = hour;
+  EXPECT_EQ(second, hour);
+  second = minute;
+  EXPECT_EQ(second, minute);
+
+  minute = year;
+  EXPECT_EQ(minute, year);
+  minute = month;
+  EXPECT_EQ(minute, month);
+  minute = day;
+  EXPECT_EQ(minute, day);
+  minute = hour;
+  EXPECT_EQ(minute, hour);
+
+  hour = year;
+  EXPECT_EQ(hour, year);
+  hour = month;
+  EXPECT_EQ(hour, month);
+  hour = day;
+  EXPECT_EQ(hour, day);
+
+  day = year;
+  EXPECT_EQ(day, year);
+  day = month;
+  EXPECT_EQ(day, month);
+
+  month = year;
+  EXPECT_EQ(month, year);
+
+  // Ensures unsafe conversions are not allowed.
+  EXPECT_FALSE((std::is_convertible<civil_second, civil_minute>::value));
+  EXPECT_FALSE((std::is_convertible<civil_second, civil_hour>::value));
+  EXPECT_FALSE((std::is_convertible<civil_second, civil_day>::value));
+  EXPECT_FALSE((std::is_convertible<civil_second, civil_month>::value));
+  EXPECT_FALSE((std::is_convertible<civil_second, civil_year>::value));
+
+  EXPECT_FALSE((std::is_convertible<civil_minute, civil_hour>::value));
+  EXPECT_FALSE((std::is_convertible<civil_minute, civil_day>::value));
+  EXPECT_FALSE((std::is_convertible<civil_minute, civil_month>::value));
+  EXPECT_FALSE((std::is_convertible<civil_minute, civil_year>::value));
+
+  EXPECT_FALSE((std::is_convertible<civil_hour, civil_day>::value));
+  EXPECT_FALSE((std::is_convertible<civil_hour, civil_month>::value));
+  EXPECT_FALSE((std::is_convertible<civil_hour, civil_year>::value));
+
+  EXPECT_FALSE((std::is_convertible<civil_day, civil_month>::value));
+  EXPECT_FALSE((std::is_convertible<civil_day, civil_year>::value));
+
+  EXPECT_FALSE((std::is_convertible<civil_month, civil_year>::value));
+}
+
+TEST(CivilTime, ExplicitCrossAlignment) {
+  //
+  // Assign from smaller units -> larger units
+  //
+
+  civil_second second(2015, 1, 2, 3, 4, 5);
+  EXPECT_EQ("2015-01-02T03:04:05", Format(second));
+
+  civil_minute minute(second);
+  EXPECT_EQ("2015-01-02T03:04", Format(minute));
+
+  civil_hour hour(minute);
+  EXPECT_EQ("2015-01-02T03", Format(hour));
+
+  civil_day day(hour);
+  EXPECT_EQ("2015-01-02", Format(day));
+
+  civil_month month(day);
+  EXPECT_EQ("2015-01", Format(month));
+
+  civil_year year(month);
+  EXPECT_EQ("2015", Format(year));
+
+  //
+  // Now assign from larger units -> smaller units
+  //
+
+  month = civil_month(year);
+  EXPECT_EQ("2015-01", Format(month));
+
+  day = civil_day(month);
+  EXPECT_EQ("2015-01-01", Format(day));
+
+  hour = civil_hour(day);
+  EXPECT_EQ("2015-01-01T00", Format(hour));
+
+  minute = civil_minute(hour);
+  EXPECT_EQ("2015-01-01T00:00", Format(minute));
+
+  second = civil_second(minute);
+  EXPECT_EQ("2015-01-01T00:00:00", Format(second));
+}
+
+// Metafunction to test whether difference is allowed between two types.
+template <typename T1, typename T2>
+struct HasDifference {
+  template <typename U1, typename U2>
+  static std::false_type test(...);
+  template <typename U1, typename U2>
+  static std::true_type test(decltype(std::declval<U1>() - std::declval<U2>()));
+  static constexpr bool value = decltype(test<T1, T2>(0))::value;
+};
+
+TEST(CivilTime, DisallowCrossAlignedDifference) {
+  // Difference is allowed between types with the same alignment.
+  static_assert(HasDifference<civil_second, civil_second>::value, "");
+  static_assert(HasDifference<civil_minute, civil_minute>::value, "");
+  static_assert(HasDifference<civil_hour, civil_hour>::value, "");
+  static_assert(HasDifference<civil_day, civil_day>::value, "");
+  static_assert(HasDifference<civil_month, civil_month>::value, "");
+  static_assert(HasDifference<civil_year, civil_year>::value, "");
+
+  // Difference is disallowed between types with different alignments.
+  static_assert(!HasDifference<civil_second, civil_minute>::value, "");
+  static_assert(!HasDifference<civil_second, civil_hour>::value, "");
+  static_assert(!HasDifference<civil_second, civil_day>::value, "");
+  static_assert(!HasDifference<civil_second, civil_month>::value, "");
+  static_assert(!HasDifference<civil_second, civil_year>::value, "");
+
+  static_assert(!HasDifference<civil_minute, civil_hour>::value, "");
+  static_assert(!HasDifference<civil_minute, civil_day>::value, "");
+  static_assert(!HasDifference<civil_minute, civil_month>::value, "");
+  static_assert(!HasDifference<civil_minute, civil_year>::value, "");
+
+  static_assert(!HasDifference<civil_hour, civil_day>::value, "");
+  static_assert(!HasDifference<civil_hour, civil_month>::value, "");
+  static_assert(!HasDifference<civil_hour, civil_year>::value, "");
+
+  static_assert(!HasDifference<civil_day, civil_month>::value, "");
+  static_assert(!HasDifference<civil_day, civil_year>::value, "");
+
+  static_assert(!HasDifference<civil_month, civil_year>::value, "");
+}
+
+TEST(CivilTime, ValueSemantics) {
+  const civil_hour a(2015, 1, 2, 3);
+  const civil_hour b = a;
+  const civil_hour c(b);
+  civil_hour d;
+  d = c;
+  EXPECT_EQ("2015-01-02T03", Format(d));
+}
+
+TEST(CivilTime, Relational) {
+  // Tests that the alignment unit is ignored in comparison.
+  const civil_year year(2014);
+  const civil_month month(year);
+  EXPECT_EQ(year, month);
+
+#define TEST_RELATIONAL(OLDER, YOUNGER) \
+  do {                                  \
+    EXPECT_FALSE(OLDER < OLDER);        \
+    EXPECT_FALSE(OLDER > OLDER);        \
+    EXPECT_TRUE(OLDER >= OLDER);        \
+    EXPECT_TRUE(OLDER <= OLDER);        \
+    EXPECT_FALSE(YOUNGER < YOUNGER);    \
+    EXPECT_FALSE(YOUNGER > YOUNGER);    \
+    EXPECT_TRUE(YOUNGER >= YOUNGER);    \
+    EXPECT_TRUE(YOUNGER <= YOUNGER);    \
+    EXPECT_EQ(OLDER, OLDER);            \
+    EXPECT_NE(OLDER, YOUNGER);          \
+    EXPECT_LT(OLDER, YOUNGER);          \
+    EXPECT_LE(OLDER, YOUNGER);          \
+    EXPECT_GT(YOUNGER, OLDER);          \
+    EXPECT_GE(YOUNGER, OLDER);          \
+  } while (0)
+
+  // Alignment is ignored in comparison (verified above), so kSecond is used
+  // to test comparison in all field positions.
+  TEST_RELATIONAL(civil_second(2014, 1, 1, 0, 0, 0),
+                  civil_second(2015, 1, 1, 0, 0, 0));
+  TEST_RELATIONAL(civil_second(2014, 1, 1, 0, 0, 0),
+                  civil_second(2014, 2, 1, 0, 0, 0));
+  TEST_RELATIONAL(civil_second(2014, 1, 1, 0, 0, 0),
+                  civil_second(2014, 1, 2, 0, 0, 0));
+  TEST_RELATIONAL(civil_second(2014, 1, 1, 0, 0, 0),
+                  civil_second(2014, 1, 1, 1, 0, 0));
+  TEST_RELATIONAL(civil_second(2014, 1, 1, 1, 0, 0),
+                  civil_second(2014, 1, 1, 1, 1, 0));
+  TEST_RELATIONAL(civil_second(2014, 1, 1, 1, 1, 0),
+                  civil_second(2014, 1, 1, 1, 1, 1));
+
   // Tests the relational operators of two different civil-time types.
-  TEST_RELATIONAL(civil_day(2014, 1, 1), civil_minute(2014, 1, 1, 1, 1)); 
-  TEST_RELATIONAL(civil_day(2014, 1, 1), civil_month(2014, 2)); 
- 
-#undef TEST_RELATIONAL 
-} 
- 
-TEST(CivilTime, Arithmetic) { 
-  civil_second second(2015, 1, 2, 3, 4, 5); 
-  EXPECT_EQ("2015-01-02T03:04:06", Format(second += 1)); 
-  EXPECT_EQ("2015-01-02T03:04:07", Format(second + 1)); 
-  EXPECT_EQ("2015-01-02T03:04:08", Format(2 + second)); 
-  EXPECT_EQ("2015-01-02T03:04:05", Format(second - 1)); 
-  EXPECT_EQ("2015-01-02T03:04:05", Format(second -= 1)); 
-  EXPECT_EQ("2015-01-02T03:04:05", Format(second++)); 
-  EXPECT_EQ("2015-01-02T03:04:07", Format(++second)); 
-  EXPECT_EQ("2015-01-02T03:04:07", Format(second--)); 
-  EXPECT_EQ("2015-01-02T03:04:05", Format(--second)); 
- 
-  civil_minute minute(2015, 1, 2, 3, 4); 
-  EXPECT_EQ("2015-01-02T03:05", Format(minute += 1)); 
-  EXPECT_EQ("2015-01-02T03:06", Format(minute + 1)); 
-  EXPECT_EQ("2015-01-02T03:07", Format(2 + minute)); 
-  EXPECT_EQ("2015-01-02T03:04", Format(minute - 1)); 
-  EXPECT_EQ("2015-01-02T03:04", Format(minute -= 1)); 
-  EXPECT_EQ("2015-01-02T03:04", Format(minute++)); 
-  EXPECT_EQ("2015-01-02T03:06", Format(++minute)); 
-  EXPECT_EQ("2015-01-02T03:06", Format(minute--)); 
-  EXPECT_EQ("2015-01-02T03:04", Format(--minute)); 
- 
-  civil_hour hour(2015, 1, 2, 3); 
-  EXPECT_EQ("2015-01-02T04", Format(hour += 1)); 
-  EXPECT_EQ("2015-01-02T05", Format(hour + 1)); 
-  EXPECT_EQ("2015-01-02T06", Format(2 + hour)); 
-  EXPECT_EQ("2015-01-02T03", Format(hour - 1)); 
-  EXPECT_EQ("2015-01-02T03", Format(hour -= 1)); 
-  EXPECT_EQ("2015-01-02T03", Format(hour++)); 
-  EXPECT_EQ("2015-01-02T05", Format(++hour)); 
-  EXPECT_EQ("2015-01-02T05", Format(hour--)); 
-  EXPECT_EQ("2015-01-02T03", Format(--hour)); 
- 
-  civil_day day(2015, 1, 2); 
-  EXPECT_EQ("2015-01-03", Format(day += 1)); 
-  EXPECT_EQ("2015-01-04", Format(day + 1)); 
-  EXPECT_EQ("2015-01-05", Format(2 + day)); 
-  EXPECT_EQ("2015-01-02", Format(day - 1)); 
-  EXPECT_EQ("2015-01-02", Format(day -= 1)); 
-  EXPECT_EQ("2015-01-02", Format(day++)); 
-  EXPECT_EQ("2015-01-04", Format(++day)); 
-  EXPECT_EQ("2015-01-04", Format(day--)); 
-  EXPECT_EQ("2015-01-02", Format(--day)); 
- 
-  civil_month month(2015, 1); 
-  EXPECT_EQ("2015-02", Format(month += 1)); 
-  EXPECT_EQ("2015-03", Format(month + 1)); 
-  EXPECT_EQ("2015-04", Format(2 + month)); 
-  EXPECT_EQ("2015-01", Format(month - 1)); 
-  EXPECT_EQ("2015-01", Format(month -= 1)); 
-  EXPECT_EQ("2015-01", Format(month++)); 
-  EXPECT_EQ("2015-03", Format(++month)); 
-  EXPECT_EQ("2015-03", Format(month--)); 
-  EXPECT_EQ("2015-01", Format(--month)); 
- 
-  civil_year year(2015); 
-  EXPECT_EQ("2016", Format(year += 1)); 
-  EXPECT_EQ("2017", Format(year + 1)); 
-  EXPECT_EQ("2018", Format(2 + year)); 
-  EXPECT_EQ("2015", Format(year - 1)); 
-  EXPECT_EQ("2015", Format(year -= 1)); 
-  EXPECT_EQ("2015", Format(year++)); 
-  EXPECT_EQ("2017", Format(++year)); 
-  EXPECT_EQ("2017", Format(year--)); 
-  EXPECT_EQ("2015", Format(--year)); 
-} 
- 
-TEST(CivilTime, ArithmeticLimits) { 
-  const int kIntMax = std::numeric_limits<int>::max(); 
-  const int kIntMin = std::numeric_limits<int>::min(); 
- 
-  civil_second second(1970, 1, 1, 0, 0, 0); 
-  second += kIntMax; 
-  EXPECT_EQ("2038-01-19T03:14:07", Format(second)); 
-  second -= kIntMax; 
-  EXPECT_EQ("1970-01-01T00:00:00", Format(second)); 
-  second += kIntMin; 
-  EXPECT_EQ("1901-12-13T20:45:52", Format(second)); 
-  second -= kIntMin; 
-  EXPECT_EQ("1970-01-01T00:00:00", Format(second)); 
- 
-  civil_minute minute(1970, 1, 1, 0, 0); 
-  minute += kIntMax; 
-  EXPECT_EQ("6053-01-23T02:07", Format(minute)); 
-  minute -= kIntMax; 
-  EXPECT_EQ("1970-01-01T00:00", Format(minute)); 
-  minute += kIntMin; 
-  EXPECT_EQ("-2114-12-08T21:52", Format(minute)); 
-  minute -= kIntMin; 
-  EXPECT_EQ("1970-01-01T00:00", Format(minute)); 
- 
-  civil_hour hour(1970, 1, 1, 0); 
-  hour += kIntMax; 
-  EXPECT_EQ("246953-10-09T07", Format(hour)); 
-  hour -= kIntMax; 
-  EXPECT_EQ("1970-01-01T00", Format(hour)); 
-  hour += kIntMin; 
-  EXPECT_EQ("-243014-03-24T16", Format(hour)); 
-  hour -= kIntMin; 
-  EXPECT_EQ("1970-01-01T00", Format(hour)); 
- 
-  civil_day day(1970, 1, 1); 
-  day += kIntMax; 
-  EXPECT_EQ("5881580-07-11", Format(day)); 
-  day -= kIntMax; 
-  EXPECT_EQ("1970-01-01", Format(day)); 
-  day += kIntMin; 
-  EXPECT_EQ("-5877641-06-23", Format(day)); 
-  day -= kIntMin; 
-  EXPECT_EQ("1970-01-01", Format(day)); 
- 
-  civil_month month(1970, 1); 
-  month += kIntMax; 
-  EXPECT_EQ("178958940-08", Format(month)); 
-  month -= kIntMax; 
-  EXPECT_EQ("1970-01", Format(month)); 
-  month += kIntMin; 
-  EXPECT_EQ("-178955001-05", Format(month)); 
-  month -= kIntMin; 
-  EXPECT_EQ("1970-01", Format(month)); 
- 
-  civil_year year(0); 
-  year += kIntMax; 
-  EXPECT_EQ("2147483647", Format(year)); 
-  year -= kIntMax; 
-  EXPECT_EQ("0", Format(year)); 
-  year += kIntMin; 
-  EXPECT_EQ("-2147483648", Format(year)); 
-  year -= kIntMin; 
-  EXPECT_EQ("0", Format(year)); 
-} 
- 
+  TEST_RELATIONAL(civil_day(2014, 1, 1), civil_minute(2014, 1, 1, 1, 1));
+  TEST_RELATIONAL(civil_day(2014, 1, 1), civil_month(2014, 2));
+
+#undef TEST_RELATIONAL
+}
+
+TEST(CivilTime, Arithmetic) {
+  civil_second second(2015, 1, 2, 3, 4, 5);
+  EXPECT_EQ("2015-01-02T03:04:06", Format(second += 1));
+  EXPECT_EQ("2015-01-02T03:04:07", Format(second + 1));
+  EXPECT_EQ("2015-01-02T03:04:08", Format(2 + second));
+  EXPECT_EQ("2015-01-02T03:04:05", Format(second - 1));
+  EXPECT_EQ("2015-01-02T03:04:05", Format(second -= 1));
+  EXPECT_EQ("2015-01-02T03:04:05", Format(second++));
+  EXPECT_EQ("2015-01-02T03:04:07", Format(++second));
+  EXPECT_EQ("2015-01-02T03:04:07", Format(second--));
+  EXPECT_EQ("2015-01-02T03:04:05", Format(--second));
+
+  civil_minute minute(2015, 1, 2, 3, 4);
+  EXPECT_EQ("2015-01-02T03:05", Format(minute += 1));
+  EXPECT_EQ("2015-01-02T03:06", Format(minute + 1));
+  EXPECT_EQ("2015-01-02T03:07", Format(2 + minute));
+  EXPECT_EQ("2015-01-02T03:04", Format(minute - 1));
+  EXPECT_EQ("2015-01-02T03:04", Format(minute -= 1));
+  EXPECT_EQ("2015-01-02T03:04", Format(minute++));
+  EXPECT_EQ("2015-01-02T03:06", Format(++minute));
+  EXPECT_EQ("2015-01-02T03:06", Format(minute--));
+  EXPECT_EQ("2015-01-02T03:04", Format(--minute));
+
+  civil_hour hour(2015, 1, 2, 3);
+  EXPECT_EQ("2015-01-02T04", Format(hour += 1));
+  EXPECT_EQ("2015-01-02T05", Format(hour + 1));
+  EXPECT_EQ("2015-01-02T06", Format(2 + hour));
+  EXPECT_EQ("2015-01-02T03", Format(hour - 1));
+  EXPECT_EQ("2015-01-02T03", Format(hour -= 1));
+  EXPECT_EQ("2015-01-02T03", Format(hour++));
+  EXPECT_EQ("2015-01-02T05", Format(++hour));
+  EXPECT_EQ("2015-01-02T05", Format(hour--));
+  EXPECT_EQ("2015-01-02T03", Format(--hour));
+
+  civil_day day(2015, 1, 2);
+  EXPECT_EQ("2015-01-03", Format(day += 1));
+  EXPECT_EQ("2015-01-04", Format(day + 1));
+  EXPECT_EQ("2015-01-05", Format(2 + day));
+  EXPECT_EQ("2015-01-02", Format(day - 1));
+  EXPECT_EQ("2015-01-02", Format(day -= 1));
+  EXPECT_EQ("2015-01-02", Format(day++));
+  EXPECT_EQ("2015-01-04", Format(++day));
+  EXPECT_EQ("2015-01-04", Format(day--));
+  EXPECT_EQ("2015-01-02", Format(--day));
+
+  civil_month month(2015, 1);
+  EXPECT_EQ("2015-02", Format(month += 1));
+  EXPECT_EQ("2015-03", Format(month + 1));
+  EXPECT_EQ("2015-04", Format(2 + month));
+  EXPECT_EQ("2015-01", Format(month - 1));
+  EXPECT_EQ("2015-01", Format(month -= 1));
+  EXPECT_EQ("2015-01", Format(month++));
+  EXPECT_EQ("2015-03", Format(++month));
+  EXPECT_EQ("2015-03", Format(month--));
+  EXPECT_EQ("2015-01", Format(--month));
+
+  civil_year year(2015);
+  EXPECT_EQ("2016", Format(year += 1));
+  EXPECT_EQ("2017", Format(year + 1));
+  EXPECT_EQ("2018", Format(2 + year));
+  EXPECT_EQ("2015", Format(year - 1));
+  EXPECT_EQ("2015", Format(year -= 1));
+  EXPECT_EQ("2015", Format(year++));
+  EXPECT_EQ("2017", Format(++year));
+  EXPECT_EQ("2017", Format(year--));
+  EXPECT_EQ("2015", Format(--year));
+}
+
+TEST(CivilTime, ArithmeticLimits) {
+  const int kIntMax = std::numeric_limits<int>::max();
+  const int kIntMin = std::numeric_limits<int>::min();
+
+  civil_second second(1970, 1, 1, 0, 0, 0);
+  second += kIntMax;
+  EXPECT_EQ("2038-01-19T03:14:07", Format(second));
+  second -= kIntMax;
+  EXPECT_EQ("1970-01-01T00:00:00", Format(second));
+  second += kIntMin;
+  EXPECT_EQ("1901-12-13T20:45:52", Format(second));
+  second -= kIntMin;
+  EXPECT_EQ("1970-01-01T00:00:00", Format(second));
+
+  civil_minute minute(1970, 1, 1, 0, 0);
+  minute += kIntMax;
+  EXPECT_EQ("6053-01-23T02:07", Format(minute));
+  minute -= kIntMax;
+  EXPECT_EQ("1970-01-01T00:00", Format(minute));
+  minute += kIntMin;
+  EXPECT_EQ("-2114-12-08T21:52", Format(minute));
+  minute -= kIntMin;
+  EXPECT_EQ("1970-01-01T00:00", Format(minute));
+
+  civil_hour hour(1970, 1, 1, 0);
+  hour += kIntMax;
+  EXPECT_EQ("246953-10-09T07", Format(hour));
+  hour -= kIntMax;
+  EXPECT_EQ("1970-01-01T00", Format(hour));
+  hour += kIntMin;
+  EXPECT_EQ("-243014-03-24T16", Format(hour));
+  hour -= kIntMin;
+  EXPECT_EQ("1970-01-01T00", Format(hour));
+
+  civil_day day(1970, 1, 1);
+  day += kIntMax;
+  EXPECT_EQ("5881580-07-11", Format(day));
+  day -= kIntMax;
+  EXPECT_EQ("1970-01-01", Format(day));
+  day += kIntMin;
+  EXPECT_EQ("-5877641-06-23", Format(day));
+  day -= kIntMin;
+  EXPECT_EQ("1970-01-01", Format(day));
+
+  civil_month month(1970, 1);
+  month += kIntMax;
+  EXPECT_EQ("178958940-08", Format(month));
+  month -= kIntMax;
+  EXPECT_EQ("1970-01", Format(month));
+  month += kIntMin;
+  EXPECT_EQ("-178955001-05", Format(month));
+  month -= kIntMin;
+  EXPECT_EQ("1970-01", Format(month));
+
+  civil_year year(0);
+  year += kIntMax;
+  EXPECT_EQ("2147483647", Format(year));
+  year -= kIntMax;
+  EXPECT_EQ("0", Format(year));
+  year += kIntMin;
+  EXPECT_EQ("-2147483648", Format(year));
+  year -= kIntMin;
+  EXPECT_EQ("0", Format(year));
+}
+
 TEST(CivilTime, ArithmeticDifference) {
-  civil_second second(2015, 1, 2, 3, 4, 5); 
-  EXPECT_EQ(0, second - second); 
-  EXPECT_EQ(10, (second + 10) - second); 
-  EXPECT_EQ(-10, (second - 10) - second); 
- 
-  civil_minute minute(2015, 1, 2, 3, 4); 
-  EXPECT_EQ(0, minute - minute); 
-  EXPECT_EQ(10, (minute + 10) - minute); 
-  EXPECT_EQ(-10, (minute - 10) - minute); 
- 
-  civil_hour hour(2015, 1, 2, 3); 
-  EXPECT_EQ(0, hour - hour); 
-  EXPECT_EQ(10, (hour + 10) - hour); 
-  EXPECT_EQ(-10, (hour - 10) - hour); 
- 
-  civil_day day(2015, 1, 2); 
-  EXPECT_EQ(0, day - day); 
-  EXPECT_EQ(10, (day + 10) - day); 
-  EXPECT_EQ(-10, (day - 10) - day); 
- 
-  civil_month month(2015, 1); 
-  EXPECT_EQ(0, month - month); 
-  EXPECT_EQ(10, (month + 10) - month); 
-  EXPECT_EQ(-10, (month - 10) - month); 
- 
-  civil_year year(2015); 
-  EXPECT_EQ(0, year - year); 
-  EXPECT_EQ(10, (year + 10) - year); 
-  EXPECT_EQ(-10, (year - 10) - year); 
-} 
- 
-TEST(CivilTime, DifferenceLimits) { 
-  const int kIntMax = std::numeric_limits<int>::max(); 
-  const int kIntMin = std::numeric_limits<int>::min(); 
- 
-  // Check day arithmetic at the end of the year range. 
-  const civil_day max_day(kIntMax, 12, 31); 
-  EXPECT_EQ(1, max_day - (max_day - 1)); 
-  EXPECT_EQ(-1, (max_day - 1) - max_day); 
- 
-  // Check day arithmetic at the end of the year range. 
-  const civil_day min_day(kIntMin, 1, 1); 
-  EXPECT_EQ(1, (min_day + 1) - min_day); 
-  EXPECT_EQ(-1, min_day - (min_day + 1)); 
- 
-  // Check the limits of the return value. 
-  const civil_day d1(1970, 1, 1); 
-  const civil_day d2(5881580, 7, 11); 
-  EXPECT_EQ(kIntMax, d2 - d1); 
-  EXPECT_EQ(kIntMin, d1 - (d2 + 1)); 
-} 
- 
-TEST(CivilTime, Properties) { 
-  civil_second ss(2015, 2, 3, 4, 5, 6); 
-  EXPECT_EQ(2015, ss.year()); 
-  EXPECT_EQ(2, ss.month()); 
-  EXPECT_EQ(3, ss.day()); 
-  EXPECT_EQ(4, ss.hour()); 
-  EXPECT_EQ(5, ss.minute()); 
-  EXPECT_EQ(6, ss.second()); 
+  civil_second second(2015, 1, 2, 3, 4, 5);
+  EXPECT_EQ(0, second - second);
+  EXPECT_EQ(10, (second + 10) - second);
+  EXPECT_EQ(-10, (second - 10) - second);
+
+  civil_minute minute(2015, 1, 2, 3, 4);
+  EXPECT_EQ(0, minute - minute);
+  EXPECT_EQ(10, (minute + 10) - minute);
+  EXPECT_EQ(-10, (minute - 10) - minute);
+
+  civil_hour hour(2015, 1, 2, 3);
+  EXPECT_EQ(0, hour - hour);
+  EXPECT_EQ(10, (hour + 10) - hour);
+  EXPECT_EQ(-10, (hour - 10) - hour);
+
+  civil_day day(2015, 1, 2);
+  EXPECT_EQ(0, day - day);
+  EXPECT_EQ(10, (day + 10) - day);
+  EXPECT_EQ(-10, (day - 10) - day);
+
+  civil_month month(2015, 1);
+  EXPECT_EQ(0, month - month);
+  EXPECT_EQ(10, (month + 10) - month);
+  EXPECT_EQ(-10, (month - 10) - month);
+
+  civil_year year(2015);
+  EXPECT_EQ(0, year - year);
+  EXPECT_EQ(10, (year + 10) - year);
+  EXPECT_EQ(-10, (year - 10) - year);
+}
+
+TEST(CivilTime, DifferenceLimits) {
+  const int kIntMax = std::numeric_limits<int>::max();
+  const int kIntMin = std::numeric_limits<int>::min();
+
+  // Check day arithmetic at the end of the year range.
+  const civil_day max_day(kIntMax, 12, 31);
+  EXPECT_EQ(1, max_day - (max_day - 1));
+  EXPECT_EQ(-1, (max_day - 1) - max_day);
+
+  // Check day arithmetic at the end of the year range.
+  const civil_day min_day(kIntMin, 1, 1);
+  EXPECT_EQ(1, (min_day + 1) - min_day);
+  EXPECT_EQ(-1, min_day - (min_day + 1));
+
+  // Check the limits of the return value.
+  const civil_day d1(1970, 1, 1);
+  const civil_day d2(5881580, 7, 11);
+  EXPECT_EQ(kIntMax, d2 - d1);
+  EXPECT_EQ(kIntMin, d1 - (d2 + 1));
+}
+
+TEST(CivilTime, Properties) {
+  civil_second ss(2015, 2, 3, 4, 5, 6);
+  EXPECT_EQ(2015, ss.year());
+  EXPECT_EQ(2, ss.month());
+  EXPECT_EQ(3, ss.day());
+  EXPECT_EQ(4, ss.hour());
+  EXPECT_EQ(5, ss.minute());
+  EXPECT_EQ(6, ss.second());
   EXPECT_EQ(weekday::tuesday, get_weekday(ss));
   EXPECT_EQ(34, get_yearday(ss));
- 
-  civil_minute mm(2015, 2, 3, 4, 5, 6); 
-  EXPECT_EQ(2015, mm.year()); 
-  EXPECT_EQ(2, mm.month()); 
-  EXPECT_EQ(3, mm.day()); 
-  EXPECT_EQ(4, mm.hour()); 
-  EXPECT_EQ(5, mm.minute()); 
-  EXPECT_EQ(0, mm.second()); 
+
+  civil_minute mm(2015, 2, 3, 4, 5, 6);
+  EXPECT_EQ(2015, mm.year());
+  EXPECT_EQ(2, mm.month());
+  EXPECT_EQ(3, mm.day());
+  EXPECT_EQ(4, mm.hour());
+  EXPECT_EQ(5, mm.minute());
+  EXPECT_EQ(0, mm.second());
   EXPECT_EQ(weekday::tuesday, get_weekday(mm));
   EXPECT_EQ(34, get_yearday(mm));
- 
-  civil_hour hh(2015, 2, 3, 4, 5, 6); 
-  EXPECT_EQ(2015, hh.year()); 
-  EXPECT_EQ(2, hh.month()); 
-  EXPECT_EQ(3, hh.day()); 
-  EXPECT_EQ(4, hh.hour()); 
-  EXPECT_EQ(0, hh.minute()); 
-  EXPECT_EQ(0, hh.second()); 
+
+  civil_hour hh(2015, 2, 3, 4, 5, 6);
+  EXPECT_EQ(2015, hh.year());
+  EXPECT_EQ(2, hh.month());
+  EXPECT_EQ(3, hh.day());
+  EXPECT_EQ(4, hh.hour());
+  EXPECT_EQ(0, hh.minute());
+  EXPECT_EQ(0, hh.second());
   EXPECT_EQ(weekday::tuesday, get_weekday(hh));
   EXPECT_EQ(34, get_yearday(hh));
- 
-  civil_day d(2015, 2, 3, 4, 5, 6); 
-  EXPECT_EQ(2015, d.year()); 
-  EXPECT_EQ(2, d.month()); 
-  EXPECT_EQ(3, d.day()); 
-  EXPECT_EQ(0, d.hour()); 
-  EXPECT_EQ(0, d.minute()); 
-  EXPECT_EQ(0, d.second()); 
-  EXPECT_EQ(weekday::tuesday, get_weekday(d)); 
-  EXPECT_EQ(34, get_yearday(d)); 
- 
-  civil_month m(2015, 2, 3, 4, 5, 6); 
-  EXPECT_EQ(2015, m.year()); 
-  EXPECT_EQ(2, m.month()); 
-  EXPECT_EQ(1, m.day()); 
-  EXPECT_EQ(0, m.hour()); 
-  EXPECT_EQ(0, m.minute()); 
-  EXPECT_EQ(0, m.second()); 
+
+  civil_day d(2015, 2, 3, 4, 5, 6);
+  EXPECT_EQ(2015, d.year());
+  EXPECT_EQ(2, d.month());
+  EXPECT_EQ(3, d.day());
+  EXPECT_EQ(0, d.hour());
+  EXPECT_EQ(0, d.minute());
+  EXPECT_EQ(0, d.second());
+  EXPECT_EQ(weekday::tuesday, get_weekday(d));
+  EXPECT_EQ(34, get_yearday(d));
+
+  civil_month m(2015, 2, 3, 4, 5, 6);
+  EXPECT_EQ(2015, m.year());
+  EXPECT_EQ(2, m.month());
+  EXPECT_EQ(1, m.day());
+  EXPECT_EQ(0, m.hour());
+  EXPECT_EQ(0, m.minute());
+  EXPECT_EQ(0, m.second());
   EXPECT_EQ(weekday::sunday, get_weekday(m));
   EXPECT_EQ(32, get_yearday(m));
- 
-  civil_year y(2015, 2, 3, 4, 5, 6); 
-  EXPECT_EQ(2015, y.year()); 
-  EXPECT_EQ(1, y.month()); 
-  EXPECT_EQ(1, y.day()); 
-  EXPECT_EQ(0, y.hour()); 
-  EXPECT_EQ(0, y.minute()); 
-  EXPECT_EQ(0, y.second()); 
+
+  civil_year y(2015, 2, 3, 4, 5, 6);
+  EXPECT_EQ(2015, y.year());
+  EXPECT_EQ(1, y.month());
+  EXPECT_EQ(1, y.day());
+  EXPECT_EQ(0, y.hour());
+  EXPECT_EQ(0, y.minute());
+  EXPECT_EQ(0, y.second());
   EXPECT_EQ(weekday::thursday, get_weekday(y));
   EXPECT_EQ(1, get_yearday(y));
-} 
- 
-TEST(CivilTime, OutputStream) { 
-  // Tests formatting of civil_year, which does not pad. 
-  EXPECT_EQ("2016", Format(civil_year(2016))); 
-  EXPECT_EQ("123", Format(civil_year(123))); 
-  EXPECT_EQ("0", Format(civil_year(0))); 
-  EXPECT_EQ("-1", Format(civil_year(-1))); 
- 
-  // Tests formatting of sub-year types, which pad to 2 digits 
-  EXPECT_EQ("2016-02", Format(civil_month(2016, 2))); 
-  EXPECT_EQ("2016-02-03", Format(civil_day(2016, 2, 3))); 
-  EXPECT_EQ("2016-02-03T04", Format(civil_hour(2016, 2, 3, 4))); 
-  EXPECT_EQ("2016-02-03T04:05", Format(civil_minute(2016, 2, 3, 4, 5))); 
-  EXPECT_EQ("2016-02-03T04:05:06", Format(civil_second(2016, 2, 3, 4, 5, 6))); 
- 
-  // Tests formatting of weekday. 
-  EXPECT_EQ("Monday", Format(weekday::monday)); 
-  EXPECT_EQ("Tuesday", Format(weekday::tuesday)); 
-  EXPECT_EQ("Wednesday", Format(weekday::wednesday)); 
-  EXPECT_EQ("Thursday", Format(weekday::thursday)); 
-  EXPECT_EQ("Friday", Format(weekday::friday)); 
-  EXPECT_EQ("Saturday", Format(weekday::saturday)); 
-  EXPECT_EQ("Sunday", Format(weekday::sunday)); 
-} 
- 
-TEST(CivilTime, OutputStreamLeftFillWidth) { 
-  civil_second cs(2016, 2, 3, 4, 5, 6); 
-  { 
-    std::stringstream ss; 
-    ss << std::left << std::setfill('.'); 
-    ss << std::setw(3) << 'X'; 
-    ss << std::setw(21) << civil_year(cs); 
-    ss << std::setw(3) << 'X'; 
-    EXPECT_EQ("X..2016.................X..", ss.str()); 
-  } 
-  { 
-    std::stringstream ss; 
-    ss << std::left << std::setfill('.'); 
-    ss << std::setw(3) << 'X'; 
-    ss << std::setw(21) << civil_month(cs); 
-    ss << std::setw(3) << 'X'; 
-    EXPECT_EQ("X..2016-02..............X..", ss.str()); 
-  } 
-  { 
-    std::stringstream ss; 
-    ss << std::left << std::setfill('.'); 
-    ss << std::setw(3) << 'X'; 
-    ss << std::setw(21) << civil_day(cs); 
-    ss << std::setw(3) << 'X'; 
-    EXPECT_EQ("X..2016-02-03...........X..", ss.str()); 
-  } 
-  { 
-    std::stringstream ss; 
-    ss << std::left << std::setfill('.'); 
-    ss << std::setw(3) << 'X'; 
-    ss << std::setw(21) << civil_hour(cs); 
-    ss << std::setw(3) << 'X'; 
-    EXPECT_EQ("X..2016-02-03T04........X..", ss.str()); 
-  } 
-  { 
-    std::stringstream ss; 
-    ss << std::left << std::setfill('.'); 
-    ss << std::setw(3) << 'X'; 
-    ss << std::setw(21) << civil_minute(cs); 
-    ss << std::setw(3) << 'X'; 
-    EXPECT_EQ("X..2016-02-03T04:05.....X..", ss.str()); 
-  } 
-  { 
-    std::stringstream ss; 
-    ss << std::left << std::setfill('.'); 
-    ss << std::setw(3) << 'X'; 
-    ss << std::setw(21) << civil_second(cs); 
-    ss << std::setw(3) << 'X'; 
-    EXPECT_EQ("X..2016-02-03T04:05:06..X..", ss.str()); 
-  } 
-} 
- 
-TEST(CivilTime, NextPrevWeekday) { 
-  // Jan 1, 1970 was a Thursday. 
-  const civil_day thursday(1970, 1, 1); 
-  EXPECT_EQ(weekday::thursday, get_weekday(thursday)); 
- 
-  // Thursday -> Thursday 
-  civil_day d = next_weekday(thursday, weekday::thursday); 
+}
+
+TEST(CivilTime, OutputStream) {
+  // Tests formatting of civil_year, which does not pad.
+  EXPECT_EQ("2016", Format(civil_year(2016)));
+  EXPECT_EQ("123", Format(civil_year(123)));
+  EXPECT_EQ("0", Format(civil_year(0)));
+  EXPECT_EQ("-1", Format(civil_year(-1)));
+
+  // Tests formatting of sub-year types, which pad to 2 digits
+  EXPECT_EQ("2016-02", Format(civil_month(2016, 2)));
+  EXPECT_EQ("2016-02-03", Format(civil_day(2016, 2, 3)));
+  EXPECT_EQ("2016-02-03T04", Format(civil_hour(2016, 2, 3, 4)));
+  EXPECT_EQ("2016-02-03T04:05", Format(civil_minute(2016, 2, 3, 4, 5)));
+  EXPECT_EQ("2016-02-03T04:05:06", Format(civil_second(2016, 2, 3, 4, 5, 6)));
+
+  // Tests formatting of weekday.
+  EXPECT_EQ("Monday", Format(weekday::monday));
+  EXPECT_EQ("Tuesday", Format(weekday::tuesday));
+  EXPECT_EQ("Wednesday", Format(weekday::wednesday));
+  EXPECT_EQ("Thursday", Format(weekday::thursday));
+  EXPECT_EQ("Friday", Format(weekday::friday));
+  EXPECT_EQ("Saturday", Format(weekday::saturday));
+  EXPECT_EQ("Sunday", Format(weekday::sunday));
+}
+
+TEST(CivilTime, OutputStreamLeftFillWidth) {
+  civil_second cs(2016, 2, 3, 4, 5, 6);
+  {
+    std::stringstream ss;
+    ss << std::left << std::setfill('.');
+    ss << std::setw(3) << 'X';
+    ss << std::setw(21) << civil_year(cs);
+    ss << std::setw(3) << 'X';
+    EXPECT_EQ("X..2016.................X..", ss.str());
+  }
+  {
+    std::stringstream ss;
+    ss << std::left << std::setfill('.');
+    ss << std::setw(3) << 'X';
+    ss << std::setw(21) << civil_month(cs);
+    ss << std::setw(3) << 'X';
+    EXPECT_EQ("X..2016-02..............X..", ss.str());
+  }
+  {
+    std::stringstream ss;
+    ss << std::left << std::setfill('.');
+    ss << std::setw(3) << 'X';
+    ss << std::setw(21) << civil_day(cs);
+    ss << std::setw(3) << 'X';
+    EXPECT_EQ("X..2016-02-03...........X..", ss.str());
+  }
+  {
+    std::stringstream ss;
+    ss << std::left << std::setfill('.');
+    ss << std::setw(3) << 'X';
+    ss << std::setw(21) << civil_hour(cs);
+    ss << std::setw(3) << 'X';
+    EXPECT_EQ("X..2016-02-03T04........X..", ss.str());
+  }
+  {
+    std::stringstream ss;
+    ss << std::left << std::setfill('.');
+    ss << std::setw(3) << 'X';
+    ss << std::setw(21) << civil_minute(cs);
+    ss << std::setw(3) << 'X';
+    EXPECT_EQ("X..2016-02-03T04:05.....X..", ss.str());
+  }
+  {
+    std::stringstream ss;
+    ss << std::left << std::setfill('.');
+    ss << std::setw(3) << 'X';
+    ss << std::setw(21) << civil_second(cs);
+    ss << std::setw(3) << 'X';
+    EXPECT_EQ("X..2016-02-03T04:05:06..X..", ss.str());
+  }
+}
+
+TEST(CivilTime, NextPrevWeekday) {
+  // Jan 1, 1970 was a Thursday.
+  const civil_day thursday(1970, 1, 1);
+  EXPECT_EQ(weekday::thursday, get_weekday(thursday));
+
+  // Thursday -> Thursday
+  civil_day d = next_weekday(thursday, weekday::thursday);
   EXPECT_EQ(7, d - thursday) << Format(d);
-  EXPECT_EQ(d - 14, prev_weekday(thursday, weekday::thursday)); 
- 
-  // Thursday -> Friday 
-  d = next_weekday(thursday, weekday::friday); 
+  EXPECT_EQ(d - 14, prev_weekday(thursday, weekday::thursday));
+
+  // Thursday -> Friday
+  d = next_weekday(thursday, weekday::friday);
   EXPECT_EQ(1, d - thursday) << Format(d);
-  EXPECT_EQ(d - 7, prev_weekday(thursday, weekday::friday)); 
- 
-  // Thursday -> Saturday 
-  d = next_weekday(thursday, weekday::saturday); 
+  EXPECT_EQ(d - 7, prev_weekday(thursday, weekday::friday));
+
+  // Thursday -> Saturday
+  d = next_weekday(thursday, weekday::saturday);
   EXPECT_EQ(2, d - thursday) << Format(d);
-  EXPECT_EQ(d - 7, prev_weekday(thursday, weekday::saturday)); 
- 
-  // Thursday -> Sunday 
-  d = next_weekday(thursday, weekday::sunday); 
+  EXPECT_EQ(d - 7, prev_weekday(thursday, weekday::saturday));
+
+  // Thursday -> Sunday
+  d = next_weekday(thursday, weekday::sunday);
   EXPECT_EQ(3, d - thursday) << Format(d);
-  EXPECT_EQ(d - 7, prev_weekday(thursday, weekday::sunday)); 
- 
-  // Thursday -> Monday 
-  d = next_weekday(thursday, weekday::monday); 
+  EXPECT_EQ(d - 7, prev_weekday(thursday, weekday::sunday));
+
+  // Thursday -> Monday
+  d = next_weekday(thursday, weekday::monday);
   EXPECT_EQ(4, d - thursday) << Format(d);
-  EXPECT_EQ(d - 7, prev_weekday(thursday, weekday::monday)); 
- 
-  // Thursday -> Tuesday 
-  d = next_weekday(thursday, weekday::tuesday); 
+  EXPECT_EQ(d - 7, prev_weekday(thursday, weekday::monday));
+
+  // Thursday -> Tuesday
+  d = next_weekday(thursday, weekday::tuesday);
   EXPECT_EQ(5, d - thursday) << Format(d);
-  EXPECT_EQ(d - 7, prev_weekday(thursday, weekday::tuesday)); 
- 
-  // Thursday -> Wednesday 
-  d = next_weekday(thursday, weekday::wednesday); 
+  EXPECT_EQ(d - 7, prev_weekday(thursday, weekday::tuesday));
+
+  // Thursday -> Wednesday
+  d = next_weekday(thursday, weekday::wednesday);
   EXPECT_EQ(6, d - thursday) << Format(d);
-  EXPECT_EQ(d - 7, prev_weekday(thursday, weekday::wednesday)); 
-} 
- 
-TEST(CivilTime, NormalizeWithHugeYear) { 
-  civil_month c(9223372036854775807, 1); 
-  EXPECT_EQ("9223372036854775807-01", Format(c)); 
-  c = c - 1;  // Causes normalization 
-  EXPECT_EQ("9223372036854775806-12", Format(c)); 
- 
-  c = civil_month(-9223372036854775807 - 1, 1); 
-  EXPECT_EQ("-9223372036854775808-01", Format(c)); 
-  c = c + 12;  // Causes normalization 
-  EXPECT_EQ("-9223372036854775807-01", Format(c)); 
-} 
- 
-TEST(CivilTime, LeapYears) { 
-  // Test data for leap years. 
-  const struct { 
-    int year; 
-    int days; 
-    struct { 
-      int month; 
-      int day; 
-    } leap_day;  // The date of the day after Feb 28. 
-  } kLeapYearTable[]{ 
-      {1900, 365, {3, 1}}, 
-      {1999, 365, {3, 1}}, 
-      {2000, 366, {2, 29}},  // leap year 
-      {2001, 365, {3, 1}}, 
-      {2002, 365, {3, 1}}, 
-      {2003, 365, {3, 1}}, 
-      {2004, 366, {2, 29}},  // leap year 
-      {2005, 365, {3, 1}}, 
-      {2006, 365, {3, 1}}, 
-      {2007, 365, {3, 1}}, 
-      {2008, 366, {2, 29}},  // leap year 
-      {2009, 365, {3, 1}}, 
-      {2100, 365, {3, 1}}, 
-  }; 
- 
-  for (const auto& e : kLeapYearTable) { 
-    // Tests incrementing through the leap day. 
-    const civil_day feb28(e.year, 2, 28); 
-    const civil_day next_day = feb28 + 1; 
-    EXPECT_EQ(e.leap_day.month, next_day.month()); 
-    EXPECT_EQ(e.leap_day.day, next_day.day()); 
- 
-    // Tests difference in days of leap years. 
-    const civil_year year(feb28); 
-    const civil_year next_year = year + 1; 
-    EXPECT_EQ(e.days, civil_day(next_year) - civil_day(year)); 
-  } 
-} 
- 
-TEST(CivilTime, FirstThursdayInMonth) { 
-  const civil_day nov1(2014, 11, 1); 
+  EXPECT_EQ(d - 7, prev_weekday(thursday, weekday::wednesday));
+}
+
+TEST(CivilTime, NormalizeWithHugeYear) {
+  civil_month c(9223372036854775807, 1);
+  EXPECT_EQ("9223372036854775807-01", Format(c));
+  c = c - 1;  // Causes normalization
+  EXPECT_EQ("9223372036854775806-12", Format(c));
+
+  c = civil_month(-9223372036854775807 - 1, 1);
+  EXPECT_EQ("-9223372036854775808-01", Format(c));
+  c = c + 12;  // Causes normalization
+  EXPECT_EQ("-9223372036854775807-01", Format(c));
+}
+
+TEST(CivilTime, LeapYears) {
+  // Test data for leap years.
+  const struct {
+    int year;
+    int days;
+    struct {
+      int month;
+      int day;
+    } leap_day;  // The date of the day after Feb 28.
+  } kLeapYearTable[]{
+      {1900, 365, {3, 1}},
+      {1999, 365, {3, 1}},
+      {2000, 366, {2, 29}},  // leap year
+      {2001, 365, {3, 1}},
+      {2002, 365, {3, 1}},
+      {2003, 365, {3, 1}},
+      {2004, 366, {2, 29}},  // leap year
+      {2005, 365, {3, 1}},
+      {2006, 365, {3, 1}},
+      {2007, 365, {3, 1}},
+      {2008, 366, {2, 29}},  // leap year
+      {2009, 365, {3, 1}},
+      {2100, 365, {3, 1}},
+  };
+
+  for (const auto& e : kLeapYearTable) {
+    // Tests incrementing through the leap day.
+    const civil_day feb28(e.year, 2, 28);
+    const civil_day next_day = feb28 + 1;
+    EXPECT_EQ(e.leap_day.month, next_day.month());
+    EXPECT_EQ(e.leap_day.day, next_day.day());
+
+    // Tests difference in days of leap years.
+    const civil_year year(feb28);
+    const civil_year next_year = year + 1;
+    EXPECT_EQ(e.days, civil_day(next_year) - civil_day(year));
+  }
+}
+
+TEST(CivilTime, FirstThursdayInMonth) {
+  const civil_day nov1(2014, 11, 1);
   const civil_day thursday = next_weekday(nov1 - 1, weekday::thursday);
-  EXPECT_EQ("2014-11-06", Format(thursday)); 
- 
-  // Bonus: Date of Thanksgiving in the United States 
-  // Rule: Fourth Thursday of November 
-  const civil_day thanksgiving = thursday + 7 * 3; 
-  EXPECT_EQ("2014-11-27", Format(thanksgiving)); 
-} 
- 
-}  // namespace cctz 
+  EXPECT_EQ("2014-11-06", Format(thursday));
+
+  // Bonus: Date of Thanksgiving in the United States
+  // Rule: Fourth Thursday of November
+  const civil_day thanksgiving = thursday + 7 * 3;
+  EXPECT_EQ("2014-11-27", Format(thanksgiving));
+}
+
+}  // namespace cctz
diff --git a/contrib/libs/cctz/test/time_zone_lookup_test.cc b/contrib/libs/cctz/test/time_zone_lookup_test.cc
index b013e1e90c..991d7af1c8 100644
--- a/contrib/libs/cctz/test/time_zone_lookup_test.cc
+++ b/contrib/libs/cctz/test/time_zone_lookup_test.cc
@@ -1,658 +1,658 @@
-// Copyright 2016 Google Inc. All Rights Reserved. 
-// 
-// Licensed under the Apache License, Version 2.0 (the "License"); 
-// you may not use this file except in compliance with the License. 
-// You may obtain a copy of the License at 
-// 
+// Copyright 2016 Google Inc. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
 //   https://www.apache.org/licenses/LICENSE-2.0
-// 
-//   Unless required by applicable law or agreed to in writing, software 
-//   distributed under the License is distributed on an "AS IS" BASIS, 
-//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-//   See the License for the specific language governing permissions and 
-//   limitations under the License. 
- 
+//
+//   Unless required by applicable law or agreed to in writing, software
+//   distributed under the License is distributed on an "AS IS" BASIS,
+//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//   See the License for the specific language governing permissions and
+//   limitations under the License.
+
 #include "cctz/time_zone.h"
- 
-#include <chrono> 
-#include <cstddef> 
+
+#include <chrono>
+#include <cstddef>
 #include <cstdlib>
-#include <future> 
+#include <future>
 #include <limits>
-#include <string> 
-#include <thread> 
-#include <vector> 
- 
+#include <string>
+#include <thread>
+#include <vector>
+
 #include "cctz/civil_time.h"
 #include "gtest/gtest.h"
- 
+
 namespace chrono = std::chrono;
- 
-namespace cctz { 
- 
-namespace { 
- 
-// A list of known time-zone names. 
-const char* const kTimeZoneNames[] = { 
-  "Africa/Abidjan", 
-  "Africa/Accra", 
-  "Africa/Addis_Ababa", 
-  "Africa/Algiers", 
-  "Africa/Asmara", 
-  "Africa/Asmera", 
-  "Africa/Bamako", 
-  "Africa/Bangui", 
-  "Africa/Banjul", 
-  "Africa/Bissau", 
-  "Africa/Blantyre", 
-  "Africa/Brazzaville", 
-  "Africa/Bujumbura", 
-  "Africa/Cairo", 
-  "Africa/Casablanca", 
-  "Africa/Ceuta", 
-  "Africa/Conakry", 
-  "Africa/Dakar", 
-  "Africa/Dar_es_Salaam", 
-  "Africa/Djibouti", 
-  "Africa/Douala", 
-  "Africa/El_Aaiun", 
-  "Africa/Freetown", 
-  "Africa/Gaborone", 
-  "Africa/Harare", 
-  "Africa/Johannesburg", 
-  "Africa/Juba", 
-  "Africa/Kampala", 
-  "Africa/Khartoum", 
-  "Africa/Kigali", 
-  "Africa/Kinshasa", 
-  "Africa/Lagos", 
-  "Africa/Libreville", 
-  "Africa/Lome", 
-  "Africa/Luanda", 
-  "Africa/Lubumbashi", 
-  "Africa/Lusaka", 
-  "Africa/Malabo", 
-  "Africa/Maputo", 
-  "Africa/Maseru", 
-  "Africa/Mbabane", 
-  "Africa/Mogadishu", 
-  "Africa/Monrovia", 
-  "Africa/Nairobi", 
-  "Africa/Ndjamena", 
-  "Africa/Niamey", 
-  "Africa/Nouakchott", 
-  "Africa/Ouagadougou", 
-  "Africa/Porto-Novo", 
-  "Africa/Sao_Tome", 
-  "Africa/Timbuktu", 
-  "Africa/Tripoli", 
-  "Africa/Tunis", 
-  "Africa/Windhoek", 
-  "America/Adak", 
-  "America/Anchorage", 
-  "America/Anguilla", 
-  "America/Antigua", 
-  "America/Araguaina", 
-  "America/Argentina/Buenos_Aires", 
-  "America/Argentina/Catamarca", 
-  "America/Argentina/ComodRivadavia", 
-  "America/Argentina/Cordoba", 
-  "America/Argentina/Jujuy", 
-  "America/Argentina/La_Rioja", 
-  "America/Argentina/Mendoza", 
-  "America/Argentina/Rio_Gallegos", 
-  "America/Argentina/Salta", 
-  "America/Argentina/San_Juan", 
-  "America/Argentina/San_Luis", 
-  "America/Argentina/Tucuman", 
-  "America/Argentina/Ushuaia", 
-  "America/Aruba", 
-  "America/Asuncion", 
-  "America/Atikokan", 
-  "America/Atka", 
-  "America/Bahia", 
-  "America/Bahia_Banderas", 
-  "America/Barbados", 
-  "America/Belem", 
-  "America/Belize", 
-  "America/Blanc-Sablon", 
-  "America/Boa_Vista", 
-  "America/Bogota", 
-  "America/Boise", 
-  "America/Buenos_Aires", 
-  "America/Cambridge_Bay", 
-  "America/Campo_Grande", 
-  "America/Cancun", 
-  "America/Caracas", 
-  "America/Catamarca", 
-  "America/Cayenne", 
-  "America/Cayman", 
-  "America/Chicago", 
-  "America/Chihuahua", 
-  "America/Coral_Harbour", 
-  "America/Cordoba", 
-  "America/Costa_Rica", 
-  "America/Creston", 
-  "America/Cuiaba", 
-  "America/Curacao", 
-  "America/Danmarkshavn", 
-  "America/Dawson", 
-  "America/Dawson_Creek", 
-  "America/Denver", 
-  "America/Detroit", 
-  "America/Dominica", 
-  "America/Edmonton", 
-  "America/Eirunepe", 
-  "America/El_Salvador", 
-  "America/Ensenada", 
-  "America/Fort_Nelson", 
-  "America/Fort_Wayne", 
-  "America/Fortaleza", 
-  "America/Glace_Bay", 
-  "America/Godthab", 
-  "America/Goose_Bay", 
-  "America/Grand_Turk", 
-  "America/Grenada", 
-  "America/Guadeloupe", 
-  "America/Guatemala", 
-  "America/Guayaquil", 
-  "America/Guyana", 
-  "America/Halifax", 
-  "America/Havana", 
-  "America/Hermosillo", 
-  "America/Indiana/Indianapolis", 
-  "America/Indiana/Knox", 
-  "America/Indiana/Marengo", 
-  "America/Indiana/Petersburg", 
-  "America/Indiana/Tell_City", 
-  "America/Indiana/Vevay", 
-  "America/Indiana/Vincennes", 
-  "America/Indiana/Winamac", 
-  "America/Indianapolis", 
-  "America/Inuvik", 
-  "America/Iqaluit", 
-  "America/Jamaica", 
-  "America/Jujuy", 
-  "America/Juneau", 
-  "America/Kentucky/Louisville", 
-  "America/Kentucky/Monticello", 
-  "America/Knox_IN", 
-  "America/Kralendijk", 
-  "America/La_Paz", 
-  "America/Lima", 
-  "America/Los_Angeles", 
-  "America/Louisville", 
-  "America/Lower_Princes", 
-  "America/Maceio", 
-  "America/Managua", 
-  "America/Manaus", 
-  "America/Marigot", 
-  "America/Martinique", 
-  "America/Matamoros", 
-  "America/Mazatlan", 
-  "America/Mendoza", 
-  "America/Menominee", 
-  "America/Merida", 
-  "America/Metlakatla", 
-  "America/Mexico_City", 
-  "America/Miquelon", 
-  "America/Moncton", 
-  "America/Monterrey", 
-  "America/Montevideo", 
-  "America/Montreal", 
-  "America/Montserrat", 
-  "America/Nassau", 
-  "America/New_York", 
-  "America/Nipigon", 
-  "America/Nome", 
-  "America/Noronha", 
-  "America/North_Dakota/Beulah", 
-  "America/North_Dakota/Center", 
-  "America/North_Dakota/New_Salem", 
+
+namespace cctz {
+
+namespace {
+
+// A list of known time-zone names.
+const char* const kTimeZoneNames[] = {
+  "Africa/Abidjan",
+  "Africa/Accra",
+  "Africa/Addis_Ababa",
+  "Africa/Algiers",
+  "Africa/Asmara",
+  "Africa/Asmera",
+  "Africa/Bamako",
+  "Africa/Bangui",
+  "Africa/Banjul",
+  "Africa/Bissau",
+  "Africa/Blantyre",
+  "Africa/Brazzaville",
+  "Africa/Bujumbura",
+  "Africa/Cairo",
+  "Africa/Casablanca",
+  "Africa/Ceuta",
+  "Africa/Conakry",
+  "Africa/Dakar",
+  "Africa/Dar_es_Salaam",
+  "Africa/Djibouti",
+  "Africa/Douala",
+  "Africa/El_Aaiun",
+  "Africa/Freetown",
+  "Africa/Gaborone",
+  "Africa/Harare",
+  "Africa/Johannesburg",
+  "Africa/Juba",
+  "Africa/Kampala",
+  "Africa/Khartoum",
+  "Africa/Kigali",
+  "Africa/Kinshasa",
+  "Africa/Lagos",
+  "Africa/Libreville",
+  "Africa/Lome",
+  "Africa/Luanda",
+  "Africa/Lubumbashi",
+  "Africa/Lusaka",
+  "Africa/Malabo",
+  "Africa/Maputo",
+  "Africa/Maseru",
+  "Africa/Mbabane",
+  "Africa/Mogadishu",
+  "Africa/Monrovia",
+  "Africa/Nairobi",
+  "Africa/Ndjamena",
+  "Africa/Niamey",
+  "Africa/Nouakchott",
+  "Africa/Ouagadougou",
+  "Africa/Porto-Novo",
+  "Africa/Sao_Tome",
+  "Africa/Timbuktu",
+  "Africa/Tripoli",
+  "Africa/Tunis",
+  "Africa/Windhoek",
+  "America/Adak",
+  "America/Anchorage",
+  "America/Anguilla",
+  "America/Antigua",
+  "America/Araguaina",
+  "America/Argentina/Buenos_Aires",
+  "America/Argentina/Catamarca",
+  "America/Argentina/ComodRivadavia",
+  "America/Argentina/Cordoba",
+  "America/Argentina/Jujuy",
+  "America/Argentina/La_Rioja",
+  "America/Argentina/Mendoza",
+  "America/Argentina/Rio_Gallegos",
+  "America/Argentina/Salta",
+  "America/Argentina/San_Juan",
+  "America/Argentina/San_Luis",
+  "America/Argentina/Tucuman",
+  "America/Argentina/Ushuaia",
+  "America/Aruba",
+  "America/Asuncion",
+  "America/Atikokan",
+  "America/Atka",
+  "America/Bahia",
+  "America/Bahia_Banderas",
+  "America/Barbados",
+  "America/Belem",
+  "America/Belize",
+  "America/Blanc-Sablon",
+  "America/Boa_Vista",
+  "America/Bogota",
+  "America/Boise",
+  "America/Buenos_Aires",
+  "America/Cambridge_Bay",
+  "America/Campo_Grande",
+  "America/Cancun",
+  "America/Caracas",
+  "America/Catamarca",
+  "America/Cayenne",
+  "America/Cayman",
+  "America/Chicago",
+  "America/Chihuahua",
+  "America/Coral_Harbour",
+  "America/Cordoba",
+  "America/Costa_Rica",
+  "America/Creston",
+  "America/Cuiaba",
+  "America/Curacao",
+  "America/Danmarkshavn",
+  "America/Dawson",
+  "America/Dawson_Creek",
+  "America/Denver",
+  "America/Detroit",
+  "America/Dominica",
+  "America/Edmonton",
+  "America/Eirunepe",
+  "America/El_Salvador",
+  "America/Ensenada",
+  "America/Fort_Nelson",
+  "America/Fort_Wayne",
+  "America/Fortaleza",
+  "America/Glace_Bay",
+  "America/Godthab",
+  "America/Goose_Bay",
+  "America/Grand_Turk",
+  "America/Grenada",
+  "America/Guadeloupe",
+  "America/Guatemala",
+  "America/Guayaquil",
+  "America/Guyana",
+  "America/Halifax",
+  "America/Havana",
+  "America/Hermosillo",
+  "America/Indiana/Indianapolis",
+  "America/Indiana/Knox",
+  "America/Indiana/Marengo",
+  "America/Indiana/Petersburg",
+  "America/Indiana/Tell_City",
+  "America/Indiana/Vevay",
+  "America/Indiana/Vincennes",
+  "America/Indiana/Winamac",
+  "America/Indianapolis",
+  "America/Inuvik",
+  "America/Iqaluit",
+  "America/Jamaica",
+  "America/Jujuy",
+  "America/Juneau",
+  "America/Kentucky/Louisville",
+  "America/Kentucky/Monticello",
+  "America/Knox_IN",
+  "America/Kralendijk",
+  "America/La_Paz",
+  "America/Lima",
+  "America/Los_Angeles",
+  "America/Louisville",
+  "America/Lower_Princes",
+  "America/Maceio",
+  "America/Managua",
+  "America/Manaus",
+  "America/Marigot",
+  "America/Martinique",
+  "America/Matamoros",
+  "America/Mazatlan",
+  "America/Mendoza",
+  "America/Menominee",
+  "America/Merida",
+  "America/Metlakatla",
+  "America/Mexico_City",
+  "America/Miquelon",
+  "America/Moncton",
+  "America/Monterrey",
+  "America/Montevideo",
+  "America/Montreal",
+  "America/Montserrat",
+  "America/Nassau",
+  "America/New_York",
+  "America/Nipigon",
+  "America/Nome",
+  "America/Noronha",
+  "America/North_Dakota/Beulah",
+  "America/North_Dakota/Center",
+  "America/North_Dakota/New_Salem",
   "America/Nuuk",
-  "America/Ojinaga", 
-  "America/Panama", 
-  "America/Pangnirtung", 
-  "America/Paramaribo", 
-  "America/Phoenix", 
-  "America/Port-au-Prince", 
-  "America/Port_of_Spain", 
-  "America/Porto_Acre", 
-  "America/Porto_Velho", 
-  "America/Puerto_Rico", 
-  "America/Punta_Arenas", 
-  "America/Rainy_River", 
-  "America/Rankin_Inlet", 
-  "America/Recife", 
-  "America/Regina", 
-  "America/Resolute", 
-  "America/Rio_Branco", 
-  "America/Rosario", 
-  "America/Santa_Isabel", 
-  "America/Santarem", 
-  "America/Santiago", 
-  "America/Santo_Domingo", 
-  "America/Sao_Paulo", 
-  "America/Scoresbysund", 
-  "America/Shiprock", 
-  "America/Sitka", 
-  "America/St_Barthelemy", 
-  "America/St_Johns", 
-  "America/St_Kitts", 
-  "America/St_Lucia", 
-  "America/St_Thomas", 
-  "America/St_Vincent", 
-  "America/Swift_Current", 
-  "America/Tegucigalpa", 
-  "America/Thule", 
-  "America/Thunder_Bay", 
-  "America/Tijuana", 
-  "America/Toronto", 
-  "America/Tortola", 
-  "America/Vancouver", 
-  "America/Virgin", 
-  "America/Whitehorse", 
-  "America/Winnipeg", 
-  "America/Yakutat", 
-  "America/Yellowknife", 
-  "Antarctica/Casey", 
-  "Antarctica/Davis", 
-  "Antarctica/DumontDUrville", 
-  "Antarctica/Macquarie", 
-  "Antarctica/Mawson", 
-  "Antarctica/McMurdo", 
-  "Antarctica/Palmer", 
-  "Antarctica/Rothera", 
-  "Antarctica/South_Pole", 
-  "Antarctica/Syowa", 
-  "Antarctica/Troll", 
-  "Antarctica/Vostok", 
-  "Arctic/Longyearbyen", 
-  "Asia/Aden", 
-  "Asia/Almaty", 
-  "Asia/Amman", 
-  "Asia/Anadyr", 
-  "Asia/Aqtau", 
-  "Asia/Aqtobe", 
-  "Asia/Ashgabat", 
-  "Asia/Ashkhabad", 
-  "Asia/Atyrau", 
-  "Asia/Baghdad", 
-  "Asia/Bahrain", 
-  "Asia/Baku", 
-  "Asia/Bangkok", 
-  "Asia/Barnaul", 
-  "Asia/Beirut", 
-  "Asia/Bishkek", 
-  "Asia/Brunei", 
-  "Asia/Calcutta", 
-  "Asia/Chita", 
-  "Asia/Choibalsan", 
-  "Asia/Chongqing", 
-  "Asia/Chungking", 
-  "Asia/Colombo", 
-  "Asia/Dacca", 
-  "Asia/Damascus", 
-  "Asia/Dhaka", 
-  "Asia/Dili", 
-  "Asia/Dubai", 
-  "Asia/Dushanbe", 
-  "Asia/Famagusta", 
-  "Asia/Gaza", 
-  "Asia/Harbin", 
-  "Asia/Hebron", 
-  "Asia/Ho_Chi_Minh", 
-  "Asia/Hong_Kong", 
-  "Asia/Hovd", 
-  "Asia/Irkutsk", 
-  "Asia/Istanbul", 
-  "Asia/Jakarta", 
-  "Asia/Jayapura", 
-  "Asia/Jerusalem", 
-  "Asia/Kabul", 
-  "Asia/Kamchatka", 
-  "Asia/Karachi", 
-  "Asia/Kashgar", 
-  "Asia/Kathmandu", 
-  "Asia/Katmandu", 
-  "Asia/Khandyga", 
-  "Asia/Kolkata", 
-  "Asia/Krasnoyarsk", 
-  "Asia/Kuala_Lumpur", 
-  "Asia/Kuching", 
-  "Asia/Kuwait", 
-  "Asia/Macao", 
-  "Asia/Macau", 
-  "Asia/Magadan", 
-  "Asia/Makassar", 
-  "Asia/Manila", 
-  "Asia/Muscat", 
-  "Asia/Nicosia", 
-  "Asia/Novokuznetsk", 
-  "Asia/Novosibirsk", 
-  "Asia/Omsk", 
-  "Asia/Oral", 
-  "Asia/Phnom_Penh", 
-  "Asia/Pontianak", 
-  "Asia/Pyongyang", 
-  "Asia/Qatar", 
+  "America/Ojinaga",
+  "America/Panama",
+  "America/Pangnirtung",
+  "America/Paramaribo",
+  "America/Phoenix",
+  "America/Port-au-Prince",
+  "America/Port_of_Spain",
+  "America/Porto_Acre",
+  "America/Porto_Velho",
+  "America/Puerto_Rico",
+  "America/Punta_Arenas",
+  "America/Rainy_River",
+  "America/Rankin_Inlet",
+  "America/Recife",
+  "America/Regina",
+  "America/Resolute",
+  "America/Rio_Branco",
+  "America/Rosario",
+  "America/Santa_Isabel",
+  "America/Santarem",
+  "America/Santiago",
+  "America/Santo_Domingo",
+  "America/Sao_Paulo",
+  "America/Scoresbysund",
+  "America/Shiprock",
+  "America/Sitka",
+  "America/St_Barthelemy",
+  "America/St_Johns",
+  "America/St_Kitts",
+  "America/St_Lucia",
+  "America/St_Thomas",
+  "America/St_Vincent",
+  "America/Swift_Current",
+  "America/Tegucigalpa",
+  "America/Thule",
+  "America/Thunder_Bay",
+  "America/Tijuana",
+  "America/Toronto",
+  "America/Tortola",
+  "America/Vancouver",
+  "America/Virgin",
+  "America/Whitehorse",
+  "America/Winnipeg",
+  "America/Yakutat",
+  "America/Yellowknife",
+  "Antarctica/Casey",
+  "Antarctica/Davis",
+  "Antarctica/DumontDUrville",
+  "Antarctica/Macquarie",
+  "Antarctica/Mawson",
+  "Antarctica/McMurdo",
+  "Antarctica/Palmer",
+  "Antarctica/Rothera",
+  "Antarctica/South_Pole",
+  "Antarctica/Syowa",
+  "Antarctica/Troll",
+  "Antarctica/Vostok",
+  "Arctic/Longyearbyen",
+  "Asia/Aden",
+  "Asia/Almaty",
+  "Asia/Amman",
+  "Asia/Anadyr",
+  "Asia/Aqtau",
+  "Asia/Aqtobe",
+  "Asia/Ashgabat",
+  "Asia/Ashkhabad",
+  "Asia/Atyrau",
+  "Asia/Baghdad",
+  "Asia/Bahrain",
+  "Asia/Baku",
+  "Asia/Bangkok",
+  "Asia/Barnaul",
+  "Asia/Beirut",
+  "Asia/Bishkek",
+  "Asia/Brunei",
+  "Asia/Calcutta",
+  "Asia/Chita",
+  "Asia/Choibalsan",
+  "Asia/Chongqing",
+  "Asia/Chungking",
+  "Asia/Colombo",
+  "Asia/Dacca",
+  "Asia/Damascus",
+  "Asia/Dhaka",
+  "Asia/Dili",
+  "Asia/Dubai",
+  "Asia/Dushanbe",
+  "Asia/Famagusta",
+  "Asia/Gaza",
+  "Asia/Harbin",
+  "Asia/Hebron",
+  "Asia/Ho_Chi_Minh",
+  "Asia/Hong_Kong",
+  "Asia/Hovd",
+  "Asia/Irkutsk",
+  "Asia/Istanbul",
+  "Asia/Jakarta",
+  "Asia/Jayapura",
+  "Asia/Jerusalem",
+  "Asia/Kabul",
+  "Asia/Kamchatka",
+  "Asia/Karachi",
+  "Asia/Kashgar",
+  "Asia/Kathmandu",
+  "Asia/Katmandu",
+  "Asia/Khandyga",
+  "Asia/Kolkata",
+  "Asia/Krasnoyarsk",
+  "Asia/Kuala_Lumpur",
+  "Asia/Kuching",
+  "Asia/Kuwait",
+  "Asia/Macao",
+  "Asia/Macau",
+  "Asia/Magadan",
+  "Asia/Makassar",
+  "Asia/Manila",
+  "Asia/Muscat",
+  "Asia/Nicosia",
+  "Asia/Novokuznetsk",
+  "Asia/Novosibirsk",
+  "Asia/Omsk",
+  "Asia/Oral",
+  "Asia/Phnom_Penh",
+  "Asia/Pontianak",
+  "Asia/Pyongyang",
+  "Asia/Qatar",
   "Asia/Qostanay",
-  "Asia/Qyzylorda", 
-  "Asia/Rangoon", 
-  "Asia/Riyadh", 
-  "Asia/Saigon", 
-  "Asia/Sakhalin", 
-  "Asia/Samarkand", 
-  "Asia/Seoul", 
-  "Asia/Shanghai", 
-  "Asia/Singapore", 
-  "Asia/Srednekolymsk", 
-  "Asia/Taipei", 
-  "Asia/Tashkent", 
-  "Asia/Tbilisi", 
-  "Asia/Tehran", 
-  "Asia/Tel_Aviv", 
-  "Asia/Thimbu", 
-  "Asia/Thimphu", 
-  "Asia/Tokyo", 
-  "Asia/Tomsk", 
-  "Asia/Ujung_Pandang", 
-  "Asia/Ulaanbaatar", 
-  "Asia/Ulan_Bator", 
-  "Asia/Urumqi", 
-  "Asia/Ust-Nera", 
-  "Asia/Vientiane", 
-  "Asia/Vladivostok", 
-  "Asia/Yakutsk", 
-  "Asia/Yangon", 
-  "Asia/Yekaterinburg", 
-  "Asia/Yerevan", 
-  "Atlantic/Azores", 
-  "Atlantic/Bermuda", 
-  "Atlantic/Canary", 
-  "Atlantic/Cape_Verde", 
-  "Atlantic/Faeroe", 
-  "Atlantic/Faroe", 
-  "Atlantic/Jan_Mayen", 
-  "Atlantic/Madeira", 
-  "Atlantic/Reykjavik", 
-  "Atlantic/South_Georgia", 
-  "Atlantic/St_Helena", 
-  "Atlantic/Stanley", 
-  "Australia/ACT", 
-  "Australia/Adelaide", 
-  "Australia/Brisbane", 
-  "Australia/Broken_Hill", 
-  "Australia/Canberra", 
-  "Australia/Currie", 
-  "Australia/Darwin", 
-  "Australia/Eucla", 
-  "Australia/Hobart", 
-  "Australia/LHI", 
-  "Australia/Lindeman", 
-  "Australia/Lord_Howe", 
-  "Australia/Melbourne", 
-  "Australia/NSW", 
-  "Australia/North", 
-  "Australia/Perth", 
-  "Australia/Queensland", 
-  "Australia/South", 
-  "Australia/Sydney", 
-  "Australia/Tasmania", 
-  "Australia/Victoria", 
-  "Australia/West", 
-  "Australia/Yancowinna", 
-  "Brazil/Acre", 
-  "Brazil/DeNoronha", 
-  "Brazil/East", 
-  "Brazil/West", 
-  "CET", 
-  "CST6CDT", 
-  "Canada/Atlantic", 
-  "Canada/Central", 
-  "Canada/Eastern", 
-  "Canada/Mountain", 
-  "Canada/Newfoundland", 
-  "Canada/Pacific", 
-  "Canada/Saskatchewan", 
-  "Canada/Yukon", 
-  "Chile/Continental", 
-  "Chile/EasterIsland", 
-  "Cuba", 
-  "EET", 
-  "EST", 
-  "EST5EDT", 
-  "Egypt", 
-  "Eire", 
-  "Etc/GMT", 
-  "Etc/GMT+0", 
-  "Etc/GMT+1", 
-  "Etc/GMT+10", 
-  "Etc/GMT+11", 
-  "Etc/GMT+12", 
-  "Etc/GMT+2", 
-  "Etc/GMT+3", 
-  "Etc/GMT+4", 
-  "Etc/GMT+5", 
-  "Etc/GMT+6", 
-  "Etc/GMT+7", 
-  "Etc/GMT+8", 
-  "Etc/GMT+9", 
-  "Etc/GMT-0", 
-  "Etc/GMT-1", 
-  "Etc/GMT-10", 
-  "Etc/GMT-11", 
-  "Etc/GMT-12", 
-  "Etc/GMT-13", 
-  "Etc/GMT-14", 
-  "Etc/GMT-2", 
-  "Etc/GMT-3", 
-  "Etc/GMT-4", 
-  "Etc/GMT-5", 
-  "Etc/GMT-6", 
-  "Etc/GMT-7", 
-  "Etc/GMT-8", 
-  "Etc/GMT-9", 
-  "Etc/GMT0", 
-  "Etc/Greenwich", 
-  "Etc/UCT", 
-  "Etc/UTC", 
-  "Etc/Universal", 
-  "Etc/Zulu", 
-  "Europe/Amsterdam", 
-  "Europe/Andorra", 
-  "Europe/Astrakhan", 
-  "Europe/Athens", 
-  "Europe/Belfast", 
-  "Europe/Belgrade", 
-  "Europe/Berlin", 
-  "Europe/Bratislava", 
-  "Europe/Brussels", 
-  "Europe/Bucharest", 
-  "Europe/Budapest", 
-  "Europe/Busingen", 
-  "Europe/Chisinau", 
-  "Europe/Copenhagen", 
-  "Europe/Dublin", 
-  "Europe/Gibraltar", 
-  "Europe/Guernsey", 
-  "Europe/Helsinki", 
-  "Europe/Isle_of_Man", 
-  "Europe/Istanbul", 
-  "Europe/Jersey", 
-  "Europe/Kaliningrad", 
-  "Europe/Kiev", 
-  "Europe/Kirov", 
-  "Europe/Lisbon", 
-  "Europe/Ljubljana", 
-  "Europe/London", 
-  "Europe/Luxembourg", 
-  "Europe/Madrid", 
-  "Europe/Malta", 
-  "Europe/Mariehamn", 
-  "Europe/Minsk", 
-  "Europe/Monaco", 
-  "Europe/Moscow", 
-  "Europe/Nicosia", 
-  "Europe/Oslo", 
-  "Europe/Paris", 
-  "Europe/Podgorica", 
-  "Europe/Prague", 
-  "Europe/Riga", 
-  "Europe/Rome", 
-  "Europe/Samara", 
-  "Europe/San_Marino", 
-  "Europe/Sarajevo", 
-  "Europe/Saratov", 
-  "Europe/Simferopol", 
-  "Europe/Skopje", 
-  "Europe/Sofia", 
-  "Europe/Stockholm", 
-  "Europe/Tallinn", 
-  "Europe/Tirane", 
-  "Europe/Tiraspol", 
-  "Europe/Ulyanovsk", 
-  "Europe/Uzhgorod", 
-  "Europe/Vaduz", 
-  "Europe/Vatican", 
-  "Europe/Vienna", 
-  "Europe/Vilnius", 
-  "Europe/Volgograd", 
-  "Europe/Warsaw", 
-  "Europe/Zagreb", 
-  "Europe/Zaporozhye", 
-  "Europe/Zurich", 
-  "GB", 
-  "GB-Eire", 
-  "GMT", 
-  "GMT+0", 
-  "GMT-0", 
-  "GMT0", 
-  "Greenwich", 
-  "HST", 
-  "Hongkong", 
-  "Iceland", 
-  "Indian/Antananarivo", 
-  "Indian/Chagos", 
-  "Indian/Christmas", 
-  "Indian/Cocos", 
-  "Indian/Comoro", 
-  "Indian/Kerguelen", 
-  "Indian/Mahe", 
-  "Indian/Maldives", 
-  "Indian/Mauritius", 
-  "Indian/Mayotte", 
-  "Indian/Reunion", 
-  "Iran", 
-  "Israel", 
-  "Jamaica", 
-  "Japan", 
-  "Kwajalein", 
-  "Libya", 
-  "MET", 
-  "MST", 
-  "MST7MDT", 
-  "Mexico/BajaNorte", 
-  "Mexico/BajaSur", 
-  "Mexico/General", 
-  "NZ", 
-  "NZ-CHAT", 
-  "Navajo", 
-  "PRC", 
-  "PST8PDT", 
-  "Pacific/Apia", 
-  "Pacific/Auckland", 
-  "Pacific/Bougainville", 
-  "Pacific/Chatham", 
-  "Pacific/Chuuk", 
-  "Pacific/Easter", 
-  "Pacific/Efate", 
-  "Pacific/Enderbury", 
-  "Pacific/Fakaofo", 
-  "Pacific/Fiji", 
-  "Pacific/Funafuti", 
-  "Pacific/Galapagos", 
-  "Pacific/Gambier", 
-  "Pacific/Guadalcanal", 
-  "Pacific/Guam", 
-  "Pacific/Honolulu", 
-  "Pacific/Johnston", 
-  "Pacific/Kiritimati", 
-  "Pacific/Kosrae", 
-  "Pacific/Kwajalein", 
-  "Pacific/Majuro", 
-  "Pacific/Marquesas", 
-  "Pacific/Midway", 
-  "Pacific/Nauru", 
-  "Pacific/Niue", 
-  "Pacific/Norfolk", 
-  "Pacific/Noumea", 
-  "Pacific/Pago_Pago", 
-  "Pacific/Palau", 
-  "Pacific/Pitcairn", 
-  "Pacific/Pohnpei", 
-  "Pacific/Ponape", 
-  "Pacific/Port_Moresby", 
-  "Pacific/Rarotonga", 
-  "Pacific/Saipan", 
-  "Pacific/Samoa", 
-  "Pacific/Tahiti", 
-  "Pacific/Tarawa", 
-  "Pacific/Tongatapu", 
-  "Pacific/Truk", 
-  "Pacific/Wake", 
-  "Pacific/Wallis", 
-  "Pacific/Yap", 
-  "Poland", 
-  "Portugal", 
-  "ROC", 
-  "ROK", 
-  "Singapore", 
-  "Turkey", 
-  "UCT", 
-  "US/Alaska", 
-  "US/Aleutian", 
-  "US/Arizona", 
-  "US/Central", 
-  "US/East-Indiana", 
-  "US/Eastern", 
-  "US/Hawaii", 
-  "US/Indiana-Starke", 
-  "US/Michigan", 
-  "US/Mountain", 
-  "US/Pacific", 
-  "US/Samoa", 
-  "UTC", 
-  "Universal", 
-  "W-SU", 
-  "WET", 
-  "Zulu", 
-  nullptr 
-}; 
- 
-// Helper to return a loaded time zone by value (UTC on error). 
-time_zone LoadZone(const std::string& name) { 
-  time_zone tz; 
-  load_time_zone(name, &tz); 
-  return tz; 
-} 
- 
-// This helper is a macro so that failed expectations show up with the 
-// correct line numbers. 
-#define ExpectTime(tp, tz, y, m, d, hh, mm, ss, off, isdst, zone) \ 
-  do {                                                            \ 
-    time_zone::absolute_lookup al = tz.lookup(tp);                \ 
-    EXPECT_EQ(y, al.cs.year());                                   \ 
-    EXPECT_EQ(m, al.cs.month());                                  \ 
-    EXPECT_EQ(d, al.cs.day());                                    \ 
-    EXPECT_EQ(hh, al.cs.hour());                                  \ 
-    EXPECT_EQ(mm, al.cs.minute());                                \ 
-    EXPECT_EQ(ss, al.cs.second());                                \ 
-    EXPECT_EQ(off, al.offset);                                    \ 
-    EXPECT_TRUE(isdst == al.is_dst);                              \ 
-    /* EXPECT_STREQ(zone, al.abbr); */                            \ 
-  } while (0) 
- 
+  "Asia/Qyzylorda",
+  "Asia/Rangoon",
+  "Asia/Riyadh",
+  "Asia/Saigon",
+  "Asia/Sakhalin",
+  "Asia/Samarkand",
+  "Asia/Seoul",
+  "Asia/Shanghai",
+  "Asia/Singapore",
+  "Asia/Srednekolymsk",
+  "Asia/Taipei",
+  "Asia/Tashkent",
+  "Asia/Tbilisi",
+  "Asia/Tehran",
+  "Asia/Tel_Aviv",
+  "Asia/Thimbu",
+  "Asia/Thimphu",
+  "Asia/Tokyo",
+  "Asia/Tomsk",
+  "Asia/Ujung_Pandang",
+  "Asia/Ulaanbaatar",
+  "Asia/Ulan_Bator",
+  "Asia/Urumqi",
+  "Asia/Ust-Nera",
+  "Asia/Vientiane",
+  "Asia/Vladivostok",
+  "Asia/Yakutsk",
+  "Asia/Yangon",
+  "Asia/Yekaterinburg",
+  "Asia/Yerevan",
+  "Atlantic/Azores",
+  "Atlantic/Bermuda",
+  "Atlantic/Canary",
+  "Atlantic/Cape_Verde",
+  "Atlantic/Faeroe",
+  "Atlantic/Faroe",
+  "Atlantic/Jan_Mayen",
+  "Atlantic/Madeira",
+  "Atlantic/Reykjavik",
+  "Atlantic/South_Georgia",
+  "Atlantic/St_Helena",
+  "Atlantic/Stanley",
+  "Australia/ACT",
+  "Australia/Adelaide",
+  "Australia/Brisbane",
+  "Australia/Broken_Hill",
+  "Australia/Canberra",
+  "Australia/Currie",
+  "Australia/Darwin",
+  "Australia/Eucla",
+  "Australia/Hobart",
+  "Australia/LHI",
+  "Australia/Lindeman",
+  "Australia/Lord_Howe",
+  "Australia/Melbourne",
+  "Australia/NSW",
+  "Australia/North",
+  "Australia/Perth",
+  "Australia/Queensland",
+  "Australia/South",
+  "Australia/Sydney",
+  "Australia/Tasmania",
+  "Australia/Victoria",
+  "Australia/West",
+  "Australia/Yancowinna",
+  "Brazil/Acre",
+  "Brazil/DeNoronha",
+  "Brazil/East",
+  "Brazil/West",
+  "CET",
+  "CST6CDT",
+  "Canada/Atlantic",
+  "Canada/Central",
+  "Canada/Eastern",
+  "Canada/Mountain",
+  "Canada/Newfoundland",
+  "Canada/Pacific",
+  "Canada/Saskatchewan",
+  "Canada/Yukon",
+  "Chile/Continental",
+  "Chile/EasterIsland",
+  "Cuba",
+  "EET",
+  "EST",
+  "EST5EDT",
+  "Egypt",
+  "Eire",
+  "Etc/GMT",
+  "Etc/GMT+0",
+  "Etc/GMT+1",
+  "Etc/GMT+10",
+  "Etc/GMT+11",
+  "Etc/GMT+12",
+  "Etc/GMT+2",
+  "Etc/GMT+3",
+  "Etc/GMT+4",
+  "Etc/GMT+5",
+  "Etc/GMT+6",
+  "Etc/GMT+7",
+  "Etc/GMT+8",
+  "Etc/GMT+9",
+  "Etc/GMT-0",
+  "Etc/GMT-1",
+  "Etc/GMT-10",
+  "Etc/GMT-11",
+  "Etc/GMT-12",
+  "Etc/GMT-13",
+  "Etc/GMT-14",
+  "Etc/GMT-2",
+  "Etc/GMT-3",
+  "Etc/GMT-4",
+  "Etc/GMT-5",
+  "Etc/GMT-6",
+  "Etc/GMT-7",
+  "Etc/GMT-8",
+  "Etc/GMT-9",
+  "Etc/GMT0",
+  "Etc/Greenwich",
+  "Etc/UCT",
+  "Etc/UTC",
+  "Etc/Universal",
+  "Etc/Zulu",
+  "Europe/Amsterdam",
+  "Europe/Andorra",
+  "Europe/Astrakhan",
+  "Europe/Athens",
+  "Europe/Belfast",
+  "Europe/Belgrade",
+  "Europe/Berlin",
+  "Europe/Bratislava",
+  "Europe/Brussels",
+  "Europe/Bucharest",
+  "Europe/Budapest",
+  "Europe/Busingen",
+  "Europe/Chisinau",
+  "Europe/Copenhagen",
+  "Europe/Dublin",
+  "Europe/Gibraltar",
+  "Europe/Guernsey",
+  "Europe/Helsinki",
+  "Europe/Isle_of_Man",
+  "Europe/Istanbul",
+  "Europe/Jersey",
+  "Europe/Kaliningrad",
+  "Europe/Kiev",
+  "Europe/Kirov",
+  "Europe/Lisbon",
+  "Europe/Ljubljana",
+  "Europe/London",
+  "Europe/Luxembourg",
+  "Europe/Madrid",
+  "Europe/Malta",
+  "Europe/Mariehamn",
+  "Europe/Minsk",
+  "Europe/Monaco",
+  "Europe/Moscow",
+  "Europe/Nicosia",
+  "Europe/Oslo",
+  "Europe/Paris",
+  "Europe/Podgorica",
+  "Europe/Prague",
+  "Europe/Riga",
+  "Europe/Rome",
+  "Europe/Samara",
+  "Europe/San_Marino",
+  "Europe/Sarajevo",
+  "Europe/Saratov",
+  "Europe/Simferopol",
+  "Europe/Skopje",
+  "Europe/Sofia",
+  "Europe/Stockholm",
+  "Europe/Tallinn",
+  "Europe/Tirane",
+  "Europe/Tiraspol",
+  "Europe/Ulyanovsk",
+  "Europe/Uzhgorod",
+  "Europe/Vaduz",
+  "Europe/Vatican",
+  "Europe/Vienna",
+  "Europe/Vilnius",
+  "Europe/Volgograd",
+  "Europe/Warsaw",
+  "Europe/Zagreb",
+  "Europe/Zaporozhye",
+  "Europe/Zurich",
+  "GB",
+  "GB-Eire",
+  "GMT",
+  "GMT+0",
+  "GMT-0",
+  "GMT0",
+  "Greenwich",
+  "HST",
+  "Hongkong",
+  "Iceland",
+  "Indian/Antananarivo",
+  "Indian/Chagos",
+  "Indian/Christmas",
+  "Indian/Cocos",
+  "Indian/Comoro",
+  "Indian/Kerguelen",
+  "Indian/Mahe",
+  "Indian/Maldives",
+  "Indian/Mauritius",
+  "Indian/Mayotte",
+  "Indian/Reunion",
+  "Iran",
+  "Israel",
+  "Jamaica",
+  "Japan",
+  "Kwajalein",
+  "Libya",
+  "MET",
+  "MST",
+  "MST7MDT",
+  "Mexico/BajaNorte",
+  "Mexico/BajaSur",
+  "Mexico/General",
+  "NZ",
+  "NZ-CHAT",
+  "Navajo",
+  "PRC",
+  "PST8PDT",
+  "Pacific/Apia",
+  "Pacific/Auckland",
+  "Pacific/Bougainville",
+  "Pacific/Chatham",
+  "Pacific/Chuuk",
+  "Pacific/Easter",
+  "Pacific/Efate",
+  "Pacific/Enderbury",
+  "Pacific/Fakaofo",
+  "Pacific/Fiji",
+  "Pacific/Funafuti",
+  "Pacific/Galapagos",
+  "Pacific/Gambier",
+  "Pacific/Guadalcanal",
+  "Pacific/Guam",
+  "Pacific/Honolulu",
+  "Pacific/Johnston",
+  "Pacific/Kiritimati",
+  "Pacific/Kosrae",
+  "Pacific/Kwajalein",
+  "Pacific/Majuro",
+  "Pacific/Marquesas",
+  "Pacific/Midway",
+  "Pacific/Nauru",
+  "Pacific/Niue",
+  "Pacific/Norfolk",
+  "Pacific/Noumea",
+  "Pacific/Pago_Pago",
+  "Pacific/Palau",
+  "Pacific/Pitcairn",
+  "Pacific/Pohnpei",
+  "Pacific/Ponape",
+  "Pacific/Port_Moresby",
+  "Pacific/Rarotonga",
+  "Pacific/Saipan",
+  "Pacific/Samoa",
+  "Pacific/Tahiti",
+  "Pacific/Tarawa",
+  "Pacific/Tongatapu",
+  "Pacific/Truk",
+  "Pacific/Wake",
+  "Pacific/Wallis",
+  "Pacific/Yap",
+  "Poland",
+  "Portugal",
+  "ROC",
+  "ROK",
+  "Singapore",
+  "Turkey",
+  "UCT",
+  "US/Alaska",
+  "US/Aleutian",
+  "US/Arizona",
+  "US/Central",
+  "US/East-Indiana",
+  "US/Eastern",
+  "US/Hawaii",
+  "US/Indiana-Starke",
+  "US/Michigan",
+  "US/Mountain",
+  "US/Pacific",
+  "US/Samoa",
+  "UTC",
+  "Universal",
+  "W-SU",
+  "WET",
+  "Zulu",
+  nullptr
+};
+
+// Helper to return a loaded time zone by value (UTC on error).
+time_zone LoadZone(const std::string& name) {
+  time_zone tz;
+  load_time_zone(name, &tz);
+  return tz;
+}
+
+// This helper is a macro so that failed expectations show up with the
+// correct line numbers.
+#define ExpectTime(tp, tz, y, m, d, hh, mm, ss, off, isdst, zone) \
+  do {                                                            \
+    time_zone::absolute_lookup al = tz.lookup(tp);                \
+    EXPECT_EQ(y, al.cs.year());                                   \
+    EXPECT_EQ(m, al.cs.month());                                  \
+    EXPECT_EQ(d, al.cs.day());                                    \
+    EXPECT_EQ(hh, al.cs.hour());                                  \
+    EXPECT_EQ(mm, al.cs.minute());                                \
+    EXPECT_EQ(ss, al.cs.second());                                \
+    EXPECT_EQ(off, al.offset);                                    \
+    EXPECT_TRUE(isdst == al.is_dst);                              \
+    /* EXPECT_STREQ(zone, al.abbr); */                            \
+  } while (0)
+
 // These tests sometimes run on platforms that have zoneinfo data so old
 // that the transition we are attempting to check does not exist, most
 // notably Android emulators.  Fortunately, AndroidZoneInfoSource supports
@@ -664,333 +664,333 @@ int VersionCmp(time_zone tz, const std::string& target) {
   return version.compare(target);
 }
 
-}  // namespace 
- 
-TEST(TimeZones, LoadZonesConcurrently) { 
-  std::promise<void> ready_promise; 
-  std::shared_future<void> ready_future(ready_promise.get_future()); 
-  auto load_zones = [ready_future](std::promise<void>* started, 
-                                   std::set<std::string>* failures) { 
-    started->set_value(); 
-    ready_future.wait(); 
-    for (const char* const* np = kTimeZoneNames; *np != nullptr; ++np) { 
-      std::string zone = *np; 
-      time_zone tz; 
-      if (load_time_zone(zone, &tz)) { 
-        EXPECT_EQ(zone, tz.name()); 
-      } else { 
-        failures->insert(zone); 
-      } 
-    } 
-  }; 
- 
+}  // namespace
+
+TEST(TimeZones, LoadZonesConcurrently) {
+  std::promise<void> ready_promise;
+  std::shared_future<void> ready_future(ready_promise.get_future());
+  auto load_zones = [ready_future](std::promise<void>* started,
+                                   std::set<std::string>* failures) {
+    started->set_value();
+    ready_future.wait();
+    for (const char* const* np = kTimeZoneNames; *np != nullptr; ++np) {
+      std::string zone = *np;
+      time_zone tz;
+      if (load_time_zone(zone, &tz)) {
+        EXPECT_EQ(zone, tz.name());
+      } else {
+        failures->insert(zone);
+      }
+    }
+  };
+
   const std::size_t n_threads = 128;
-  std::vector<std::thread> threads; 
-  std::vector<std::set<std::string>> thread_failures(n_threads); 
-  for (std::size_t i = 0; i != n_threads; ++i) { 
-    std::promise<void> started; 
-    threads.emplace_back(load_zones, &started, &thread_failures[i]); 
-    started.get_future().wait(); 
-  } 
-  ready_promise.set_value(); 
-  for (auto& thread : threads) { 
-    thread.join(); 
-  } 
- 
-  // Allow a small number of failures to account for skew between 
-  // the contents of kTimeZoneNames and the zoneinfo data source. 
+  std::vector<std::thread> threads;
+  std::vector<std::set<std::string>> thread_failures(n_threads);
+  for (std::size_t i = 0; i != n_threads; ++i) {
+    std::promise<void> started;
+    threads.emplace_back(load_zones, &started, &thread_failures[i]);
+    started.get_future().wait();
+  }
+  ready_promise.set_value();
+  for (auto& thread : threads) {
+    thread.join();
+  }
+
+  // Allow a small number of failures to account for skew between
+  // the contents of kTimeZoneNames and the zoneinfo data source.
 #if defined(__ANDROID__)
   // Cater to the possibility of using an even older zoneinfo data
   // source when running on Android, where it is difficult to override
   // the bionic tzdata provided by the test environment.
   const std::size_t max_failures = 20;
 #else
-  const std::size_t max_failures = 3; 
+  const std::size_t max_failures = 3;
 #endif
-  std::set<std::string> failures; 
-  for (const auto& thread_failure : thread_failures) { 
-    failures.insert(thread_failure.begin(), thread_failure.end()); 
-  } 
+  std::set<std::string> failures;
+  for (const auto& thread_failure : thread_failures) {
+    failures.insert(thread_failure.begin(), thread_failure.end());
+  }
   EXPECT_LE(failures.size(), max_failures) << testing::PrintToString(failures);
-} 
- 
-TEST(TimeZone, NamedTimeZones) { 
-  const time_zone utc = utc_time_zone(); 
-  EXPECT_EQ("UTC", utc.name()); 
-  const time_zone nyc = LoadZone("America/New_York"); 
-  EXPECT_EQ("America/New_York", nyc.name()); 
-  const time_zone syd = LoadZone("Australia/Sydney"); 
-  EXPECT_EQ("Australia/Sydney", syd.name()); 
+}
+
+TEST(TimeZone, NamedTimeZones) {
+  const time_zone utc = utc_time_zone();
+  EXPECT_EQ("UTC", utc.name());
+  const time_zone nyc = LoadZone("America/New_York");
+  EXPECT_EQ("America/New_York", nyc.name());
+  const time_zone syd = LoadZone("Australia/Sydney");
+  EXPECT_EQ("Australia/Sydney", syd.name());
   const time_zone fixed0 = fixed_time_zone(cctz::seconds::zero());
-  EXPECT_EQ("UTC", fixed0.name()); 
+  EXPECT_EQ("UTC", fixed0.name());
   const time_zone fixed_pos = fixed_time_zone(
       chrono::hours(3) + chrono::minutes(25) + chrono::seconds(45));
-  EXPECT_EQ("Fixed/UTC+03:25:45", fixed_pos.name()); 
+  EXPECT_EQ("Fixed/UTC+03:25:45", fixed_pos.name());
   const time_zone fixed_neg = fixed_time_zone(
       -(chrono::hours(12) + chrono::minutes(34) + chrono::seconds(56)));
-  EXPECT_EQ("Fixed/UTC-12:34:56", fixed_neg.name()); 
-} 
- 
-TEST(TimeZone, Failures) { 
-  time_zone tz; 
-  EXPECT_FALSE(load_time_zone(":America/Los_Angeles", &tz)); 
- 
-  tz = LoadZone("America/Los_Angeles"); 
-  EXPECT_FALSE(load_time_zone("Invalid/TimeZone", &tz)); 
+  EXPECT_EQ("Fixed/UTC-12:34:56", fixed_neg.name());
+}
+
+TEST(TimeZone, Failures) {
+  time_zone tz;
+  EXPECT_FALSE(load_time_zone(":America/Los_Angeles", &tz));
+
+  tz = LoadZone("America/Los_Angeles");
+  EXPECT_FALSE(load_time_zone("Invalid/TimeZone", &tz));
   EXPECT_EQ(chrono::system_clock::from_time_t(0),
-            convert(civil_second(1970, 1, 1, 0, 0, 0), tz));  // UTC 
- 
-  // Ensures that the load still fails on a subsequent attempt. 
-  tz = LoadZone("America/Los_Angeles"); 
-  EXPECT_FALSE(load_time_zone("Invalid/TimeZone", &tz)); 
+            convert(civil_second(1970, 1, 1, 0, 0, 0), tz));  // UTC
+
+  // Ensures that the load still fails on a subsequent attempt.
+  tz = LoadZone("America/Los_Angeles");
+  EXPECT_FALSE(load_time_zone("Invalid/TimeZone", &tz));
   EXPECT_EQ(chrono::system_clock::from_time_t(0),
-            convert(civil_second(1970, 1, 1, 0, 0, 0), tz));  // UTC 
- 
-  // Loading an empty string timezone should fail. 
-  tz = LoadZone("America/Los_Angeles"); 
-  EXPECT_FALSE(load_time_zone("", &tz)); 
+            convert(civil_second(1970, 1, 1, 0, 0, 0), tz));  // UTC
+
+  // Loading an empty string timezone should fail.
+  tz = LoadZone("America/Los_Angeles");
+  EXPECT_FALSE(load_time_zone("", &tz));
   EXPECT_EQ(chrono::system_clock::from_time_t(0),
-            convert(civil_second(1970, 1, 1, 0, 0, 0), tz));  // UTC 
-} 
- 
-TEST(TimeZone, Equality) { 
+            convert(civil_second(1970, 1, 1, 0, 0, 0), tz));  // UTC
+}
+
+TEST(TimeZone, Equality) {
   const time_zone a;
   const time_zone b;
-  EXPECT_EQ(a, b); 
-  EXPECT_EQ(a.name(), b.name()); 
- 
+  EXPECT_EQ(a, b);
+  EXPECT_EQ(a.name(), b.name());
+
   const time_zone implicit_utc;
-  const time_zone explicit_utc = utc_time_zone(); 
-  EXPECT_EQ(implicit_utc, explicit_utc); 
-  EXPECT_EQ(implicit_utc.name(), explicit_utc.name()); 
- 
+  const time_zone explicit_utc = utc_time_zone();
+  EXPECT_EQ(implicit_utc, explicit_utc);
+  EXPECT_EQ(implicit_utc.name(), explicit_utc.name());
+
   const time_zone fixed_zero = fixed_time_zone(cctz::seconds::zero());
-  EXPECT_EQ(fixed_zero, LoadZone(fixed_zero.name())); 
-  EXPECT_EQ(fixed_zero, explicit_utc); 
- 
-  const time_zone fixed_utc = LoadZone("Fixed/UTC+00:00:00"); 
-  EXPECT_EQ(fixed_utc, LoadZone(fixed_utc.name())); 
-  EXPECT_EQ(fixed_utc, explicit_utc); 
- 
+  EXPECT_EQ(fixed_zero, LoadZone(fixed_zero.name()));
+  EXPECT_EQ(fixed_zero, explicit_utc);
+
+  const time_zone fixed_utc = LoadZone("Fixed/UTC+00:00:00");
+  EXPECT_EQ(fixed_utc, LoadZone(fixed_utc.name()));
+  EXPECT_EQ(fixed_utc, explicit_utc);
+
   const time_zone fixed_pos = fixed_time_zone(
       chrono::hours(3) + chrono::minutes(25) + chrono::seconds(45));
-  EXPECT_EQ(fixed_pos, LoadZone(fixed_pos.name())); 
-  EXPECT_NE(fixed_pos, explicit_utc); 
+  EXPECT_EQ(fixed_pos, LoadZone(fixed_pos.name()));
+  EXPECT_NE(fixed_pos, explicit_utc);
   const time_zone fixed_neg = fixed_time_zone(
       -(chrono::hours(12) + chrono::minutes(34) + chrono::seconds(56)));
-  EXPECT_EQ(fixed_neg, LoadZone(fixed_neg.name())); 
-  EXPECT_NE(fixed_neg, explicit_utc); 
- 
+  EXPECT_EQ(fixed_neg, LoadZone(fixed_neg.name()));
+  EXPECT_NE(fixed_neg, explicit_utc);
+
   const time_zone fixed_lim = fixed_time_zone(chrono::hours(24));
-  EXPECT_EQ(fixed_lim, LoadZone(fixed_lim.name())); 
-  EXPECT_NE(fixed_lim, explicit_utc); 
+  EXPECT_EQ(fixed_lim, LoadZone(fixed_lim.name()));
+  EXPECT_NE(fixed_lim, explicit_utc);
   const time_zone fixed_ovfl =
       fixed_time_zone(chrono::hours(24) + chrono::seconds(1));
-  EXPECT_EQ(fixed_ovfl, LoadZone(fixed_ovfl.name())); 
-  EXPECT_EQ(fixed_ovfl, explicit_utc); 
- 
+  EXPECT_EQ(fixed_ovfl, LoadZone(fixed_ovfl.name()));
+  EXPECT_EQ(fixed_ovfl, explicit_utc);
+
   EXPECT_EQ(fixed_time_zone(chrono::seconds(1)),
             fixed_time_zone(chrono::seconds(1)));
- 
-  const time_zone local = local_time_zone(); 
-  EXPECT_EQ(local, LoadZone(local.name())); 
- 
-  time_zone la = LoadZone("America/Los_Angeles"); 
-  time_zone nyc = LoadZone("America/New_York"); 
-  EXPECT_NE(la, nyc); 
-} 
- 
-TEST(StdChronoTimePoint, TimeTAlignment) { 
-  // Ensures that the Unix epoch and the system clock epoch are an integral 
-  // number of seconds apart. This simplifies conversions to/from time_t. 
+
+  const time_zone local = local_time_zone();
+  EXPECT_EQ(local, LoadZone(local.name()));
+
+  time_zone la = LoadZone("America/Los_Angeles");
+  time_zone nyc = LoadZone("America/New_York");
+  EXPECT_NE(la, nyc);
+}
+
+TEST(StdChronoTimePoint, TimeTAlignment) {
+  // Ensures that the Unix epoch and the system clock epoch are an integral
+  // number of seconds apart. This simplifies conversions to/from time_t.
   auto diff = chrono::system_clock::time_point() -
               chrono::system_clock::from_time_t(0);
   EXPECT_EQ(chrono::system_clock::time_point::duration::zero(),
             diff % chrono::seconds(1));
-} 
- 
-TEST(BreakTime, TimePointResolution) { 
-  const time_zone utc = utc_time_zone(); 
+}
+
+TEST(BreakTime, TimePointResolution) {
+  const time_zone utc = utc_time_zone();
   const auto t0 = chrono::system_clock::from_time_t(0);
- 
+
   ExpectTime(chrono::time_point_cast<chrono::nanoseconds>(t0), utc,
-             1970, 1, 1, 0, 0, 0, 0, false, "UTC"); 
+             1970, 1, 1, 0, 0, 0, 0, false, "UTC");
   ExpectTime(chrono::time_point_cast<chrono::microseconds>(t0), utc,
-             1970, 1, 1, 0, 0, 0, 0, false, "UTC"); 
+             1970, 1, 1, 0, 0, 0, 0, false, "UTC");
   ExpectTime(chrono::time_point_cast<chrono::milliseconds>(t0), utc,
-             1970, 1, 1, 0, 0, 0, 0, false, "UTC"); 
+             1970, 1, 1, 0, 0, 0, 0, false, "UTC");
   ExpectTime(chrono::time_point_cast<chrono::seconds>(t0), utc,
-             1970, 1, 1, 0, 0, 0, 0, false, "UTC"); 
+             1970, 1, 1, 0, 0, 0, 0, false, "UTC");
   ExpectTime(chrono::time_point_cast<cctz::seconds>(t0), utc,
-             1970, 1, 1, 0, 0, 0, 0, false, "UTC"); 
+             1970, 1, 1, 0, 0, 0, 0, false, "UTC");
   ExpectTime(chrono::time_point_cast<chrono::minutes>(t0), utc,
-             1970, 1, 1, 0, 0, 0, 0, false, "UTC"); 
+             1970, 1, 1, 0, 0, 0, 0, false, "UTC");
   ExpectTime(chrono::time_point_cast<chrono::hours>(t0), utc,
-             1970, 1, 1, 0, 0, 0, 0, false, "UTC"); 
-} 
- 
-TEST(BreakTime, LocalTimeInUTC) { 
-  const time_zone tz = utc_time_zone(); 
+             1970, 1, 1, 0, 0, 0, 0, false, "UTC");
+}
+
+TEST(BreakTime, LocalTimeInUTC) {
+  const time_zone tz = utc_time_zone();
   const auto tp = chrono::system_clock::from_time_t(0);
-  ExpectTime(tp, tz, 1970, 1, 1, 0, 0, 0, 0, false, "UTC"); 
+  ExpectTime(tp, tz, 1970, 1, 1, 0, 0, 0, 0, false, "UTC");
   EXPECT_EQ(weekday::thursday, get_weekday(convert(tp, tz)));
-} 
- 
-TEST(BreakTime, LocalTimeInUTCUnaligned) { 
-  const time_zone tz = utc_time_zone(); 
+}
+
+TEST(BreakTime, LocalTimeInUTCUnaligned) {
+  const time_zone tz = utc_time_zone();
   const auto tp =
       chrono::system_clock::from_time_t(0) - chrono::milliseconds(500);
-  ExpectTime(tp, tz, 1969, 12, 31, 23, 59, 59, 0, false, "UTC"); 
+  ExpectTime(tp, tz, 1969, 12, 31, 23, 59, 59, 0, false, "UTC");
   EXPECT_EQ(weekday::wednesday, get_weekday(convert(tp, tz)));
-} 
- 
-TEST(BreakTime, LocalTimePosix) { 
-  // See IEEE Std 1003.1-1988 B.2.3 General Terms, Epoch. 
-  const time_zone tz = utc_time_zone(); 
+}
+
+TEST(BreakTime, LocalTimePosix) {
+  // See IEEE Std 1003.1-1988 B.2.3 General Terms, Epoch.
+  const time_zone tz = utc_time_zone();
   const auto tp = chrono::system_clock::from_time_t(536457599);
-  ExpectTime(tp, tz, 1986, 12, 31, 23, 59, 59, 0, false, "UTC"); 
+  ExpectTime(tp, tz, 1986, 12, 31, 23, 59, 59, 0, false, "UTC");
   EXPECT_EQ(weekday::wednesday, get_weekday(convert(tp, tz)));
-} 
- 
-TEST(TimeZoneImpl, LocalTimeInFixed) { 
+}
+
+TEST(TimeZoneImpl, LocalTimeInFixed) {
   const cctz::seconds offset =
       -(chrono::hours(8) + chrono::minutes(33) + chrono::seconds(47));
-  const time_zone tz = fixed_time_zone(offset); 
+  const time_zone tz = fixed_time_zone(offset);
   const auto tp = chrono::system_clock::from_time_t(0);
-  ExpectTime(tp, tz, 1969, 12, 31, 15, 26, 13, offset.count(), false, 
+  ExpectTime(tp, tz, 1969, 12, 31, 15, 26, 13, offset.count(), false,
              "-083347");
   EXPECT_EQ(weekday::wednesday, get_weekday(convert(tp, tz)));
-} 
- 
-TEST(BreakTime, LocalTimeInNewYork) { 
-  const time_zone tz = LoadZone("America/New_York"); 
+}
+
+TEST(BreakTime, LocalTimeInNewYork) {
+  const time_zone tz = LoadZone("America/New_York");
   const auto tp = chrono::system_clock::from_time_t(45);
-  ExpectTime(tp, tz, 1969, 12, 31, 19, 0, 45, -5 * 60 * 60, false, "EST"); 
+  ExpectTime(tp, tz, 1969, 12, 31, 19, 0, 45, -5 * 60 * 60, false, "EST");
   EXPECT_EQ(weekday::wednesday, get_weekday(convert(tp, tz)));
-} 
- 
-TEST(BreakTime, LocalTimeInMTV) { 
-  const time_zone tz = LoadZone("America/Los_Angeles"); 
+}
+
+TEST(BreakTime, LocalTimeInMTV) {
+  const time_zone tz = LoadZone("America/Los_Angeles");
   const auto tp = chrono::system_clock::from_time_t(1380855729);
-  ExpectTime(tp, tz, 2013, 10, 3, 20, 2, 9, -7 * 60 * 60, true, "PDT"); 
+  ExpectTime(tp, tz, 2013, 10, 3, 20, 2, 9, -7 * 60 * 60, true, "PDT");
   EXPECT_EQ(weekday::thursday, get_weekday(convert(tp, tz)));
-} 
- 
-TEST(BreakTime, LocalTimeInSydney) { 
-  const time_zone tz = LoadZone("Australia/Sydney"); 
+}
+
+TEST(BreakTime, LocalTimeInSydney) {
+  const time_zone tz = LoadZone("Australia/Sydney");
   const auto tp = chrono::system_clock::from_time_t(90);
-  ExpectTime(tp, tz, 1970, 1, 1, 10, 1, 30, 10 * 60 * 60, false, "AEST"); 
+  ExpectTime(tp, tz, 1970, 1, 1, 10, 1, 30, 10 * 60 * 60, false, "AEST");
   EXPECT_EQ(weekday::thursday, get_weekday(convert(tp, tz)));
-} 
- 
-TEST(MakeTime, TimePointResolution) { 
-  const time_zone utc = utc_time_zone(); 
+}
+
+TEST(MakeTime, TimePointResolution) {
+  const time_zone utc = utc_time_zone();
   const time_point<chrono::nanoseconds> tp_ns =
-      convert(civil_second(2015, 1, 2, 3, 4, 5), utc); 
-  EXPECT_EQ("04:05", format("%M:%E*S", tp_ns, utc)); 
+      convert(civil_second(2015, 1, 2, 3, 4, 5), utc);
+  EXPECT_EQ("04:05", format("%M:%E*S", tp_ns, utc));
   const time_point<chrono::microseconds> tp_us =
-      convert(civil_second(2015, 1, 2, 3, 4, 5), utc); 
-  EXPECT_EQ("04:05", format("%M:%E*S", tp_us, utc)); 
+      convert(civil_second(2015, 1, 2, 3, 4, 5), utc);
+  EXPECT_EQ("04:05", format("%M:%E*S", tp_us, utc));
   const time_point<chrono::milliseconds> tp_ms =
-      convert(civil_second(2015, 1, 2, 3, 4, 5), utc); 
-  EXPECT_EQ("04:05", format("%M:%E*S", tp_ms, utc)); 
+      convert(civil_second(2015, 1, 2, 3, 4, 5), utc);
+  EXPECT_EQ("04:05", format("%M:%E*S", tp_ms, utc));
   const time_point<chrono::seconds> tp_s =
-      convert(civil_second(2015, 1, 2, 3, 4, 5), utc); 
-  EXPECT_EQ("04:05", format("%M:%E*S", tp_s, utc)); 
+      convert(civil_second(2015, 1, 2, 3, 4, 5), utc);
+  EXPECT_EQ("04:05", format("%M:%E*S", tp_s, utc));
   const time_point<cctz::seconds> tp_s64 =
-      convert(civil_second(2015, 1, 2, 3, 4, 5), utc); 
-  EXPECT_EQ("04:05", format("%M:%E*S", tp_s64, utc)); 
- 
+      convert(civil_second(2015, 1, 2, 3, 4, 5), utc);
+  EXPECT_EQ("04:05", format("%M:%E*S", tp_s64, utc));
+
   // These next two require chrono::time_point_cast because the conversion
   // from a resolution of seconds (the return value of convert()) to a
   // coarser resolution requires an explicit cast.
   const time_point<chrono::minutes> tp_m =
       chrono::time_point_cast<chrono::minutes>(
-          convert(civil_second(2015, 1, 2, 3, 4, 5), utc)); 
-  EXPECT_EQ("04:00", format("%M:%E*S", tp_m, utc)); 
+          convert(civil_second(2015, 1, 2, 3, 4, 5), utc));
+  EXPECT_EQ("04:00", format("%M:%E*S", tp_m, utc));
   const time_point<chrono::hours> tp_h =
       chrono::time_point_cast<chrono::hours>(
-          convert(civil_second(2015, 1, 2, 3, 4, 5), utc)); 
-  EXPECT_EQ("00:00", format("%M:%E*S", tp_h, utc)); 
-} 
- 
-TEST(MakeTime, Normalization) { 
-  const time_zone tz = LoadZone("America/New_York"); 
-  const auto tp = convert(civil_second(2009, 2, 13, 18, 31, 30), tz); 
+          convert(civil_second(2015, 1, 2, 3, 4, 5), utc));
+  EXPECT_EQ("00:00", format("%M:%E*S", tp_h, utc));
+}
+
+TEST(MakeTime, Normalization) {
+  const time_zone tz = LoadZone("America/New_York");
+  const auto tp = convert(civil_second(2009, 2, 13, 18, 31, 30), tz);
   EXPECT_EQ(chrono::system_clock::from_time_t(1234567890), tp);
- 
-  // Now requests for the same time_point but with out-of-range fields. 
-  EXPECT_EQ(tp, convert(civil_second(2008, 14, 13, 18, 31, 30), tz));  // month 
-  EXPECT_EQ(tp, convert(civil_second(2009, 1, 44, 18, 31, 30), tz));   // day 
-  EXPECT_EQ(tp, convert(civil_second(2009, 2, 12, 42, 31, 30), tz));   // hour 
-  EXPECT_EQ(tp, convert(civil_second(2009, 2, 13, 17, 91, 30), tz));   // minute 
-  EXPECT_EQ(tp, convert(civil_second(2009, 2, 13, 18, 30, 90), tz));   // second 
-} 
- 
+
+  // Now requests for the same time_point but with out-of-range fields.
+  EXPECT_EQ(tp, convert(civil_second(2008, 14, 13, 18, 31, 30), tz));  // month
+  EXPECT_EQ(tp, convert(civil_second(2009, 1, 44, 18, 31, 30), tz));   // day
+  EXPECT_EQ(tp, convert(civil_second(2009, 2, 12, 42, 31, 30), tz));   // hour
+  EXPECT_EQ(tp, convert(civil_second(2009, 2, 13, 17, 91, 30), tz));   // minute
+  EXPECT_EQ(tp, convert(civil_second(2009, 2, 13, 18, 30, 90), tz));   // second
+}
+
 // NOTE: Run this with -ftrapv to detect overflow problems.
-TEST(MakeTime, SysSecondsLimits) { 
+TEST(MakeTime, SysSecondsLimits) {
   const char RFC3339[] =  "%Y-%m-%d%ET%H:%M:%S%Ez";
-  const time_zone utc = utc_time_zone(); 
+  const time_zone utc = utc_time_zone();
   const time_zone east = fixed_time_zone(chrono::hours(14));
   const time_zone west = fixed_time_zone(-chrono::hours(14));
   time_point<cctz::seconds> tp;
- 
+
   // Approach the maximal time_point<cctz::seconds> value from below.
-  tp = convert(civil_second(292277026596, 12, 4, 15, 30, 6), utc); 
-  EXPECT_EQ("292277026596-12-04T15:30:06+00:00", format(RFC3339, tp, utc)); 
-  tp = convert(civil_second(292277026596, 12, 4, 15, 30, 7), utc); 
-  EXPECT_EQ("292277026596-12-04T15:30:07+00:00", format(RFC3339, tp, utc)); 
+  tp = convert(civil_second(292277026596, 12, 4, 15, 30, 6), utc);
+  EXPECT_EQ("292277026596-12-04T15:30:06+00:00", format(RFC3339, tp, utc));
+  tp = convert(civil_second(292277026596, 12, 4, 15, 30, 7), utc);
+  EXPECT_EQ("292277026596-12-04T15:30:07+00:00", format(RFC3339, tp, utc));
   EXPECT_EQ(time_point<cctz::seconds>::max(), tp);
-  tp = convert(civil_second(292277026596, 12, 4, 15, 30, 8), utc); 
+  tp = convert(civil_second(292277026596, 12, 4, 15, 30, 8), utc);
   EXPECT_EQ(time_point<cctz::seconds>::max(), tp);
-  tp = convert(civil_second::max(), utc); 
+  tp = convert(civil_second::max(), utc);
   EXPECT_EQ(time_point<cctz::seconds>::max(), tp);
- 
-  // Checks that we can also get the maximal value for a far-east zone. 
-  tp = convert(civil_second(292277026596, 12, 5, 5, 30, 7), east); 
-  EXPECT_EQ("292277026596-12-05T05:30:07+14:00", format(RFC3339, tp, east)); 
+
+  // Checks that we can also get the maximal value for a far-east zone.
+  tp = convert(civil_second(292277026596, 12, 5, 5, 30, 7), east);
+  EXPECT_EQ("292277026596-12-05T05:30:07+14:00", format(RFC3339, tp, east));
   EXPECT_EQ(time_point<cctz::seconds>::max(), tp);
-  tp = convert(civil_second(292277026596, 12, 5, 5, 30, 8), east); 
+  tp = convert(civil_second(292277026596, 12, 5, 5, 30, 8), east);
   EXPECT_EQ(time_point<cctz::seconds>::max(), tp);
-  tp = convert(civil_second::max(), east); 
+  tp = convert(civil_second::max(), east);
   EXPECT_EQ(time_point<cctz::seconds>::max(), tp);
- 
-  // Checks that we can also get the maximal value for a far-west zone. 
-  tp = convert(civil_second(292277026596, 12, 4, 1, 30, 7), west); 
-  EXPECT_EQ("292277026596-12-04T01:30:07-14:00", format(RFC3339, tp, west)); 
+
+  // Checks that we can also get the maximal value for a far-west zone.
+  tp = convert(civil_second(292277026596, 12, 4, 1, 30, 7), west);
+  EXPECT_EQ("292277026596-12-04T01:30:07-14:00", format(RFC3339, tp, west));
   EXPECT_EQ(time_point<cctz::seconds>::max(), tp);
-  tp = convert(civil_second(292277026596, 12, 4, 7, 30, 8), west); 
+  tp = convert(civil_second(292277026596, 12, 4, 7, 30, 8), west);
   EXPECT_EQ(time_point<cctz::seconds>::max(), tp);
-  tp = convert(civil_second::max(), west); 
+  tp = convert(civil_second::max(), west);
   EXPECT_EQ(time_point<cctz::seconds>::max(), tp);
- 
+
   // Approach the minimal time_point<cctz::seconds> value from above.
-  tp = convert(civil_second(-292277022657, 1, 27, 8, 29, 53), utc); 
-  EXPECT_EQ("-292277022657-01-27T08:29:53+00:00", format(RFC3339, tp, utc)); 
-  tp = convert(civil_second(-292277022657, 1, 27, 8, 29, 52), utc); 
-  EXPECT_EQ("-292277022657-01-27T08:29:52+00:00", format(RFC3339, tp, utc)); 
+  tp = convert(civil_second(-292277022657, 1, 27, 8, 29, 53), utc);
+  EXPECT_EQ("-292277022657-01-27T08:29:53+00:00", format(RFC3339, tp, utc));
+  tp = convert(civil_second(-292277022657, 1, 27, 8, 29, 52), utc);
+  EXPECT_EQ("-292277022657-01-27T08:29:52+00:00", format(RFC3339, tp, utc));
   EXPECT_EQ(time_point<cctz::seconds>::min(), tp);
-  tp = convert(civil_second(-292277022657, 1, 27, 8, 29, 51), utc); 
+  tp = convert(civil_second(-292277022657, 1, 27, 8, 29, 51), utc);
   EXPECT_EQ(time_point<cctz::seconds>::min(), tp);
-  tp = convert(civil_second::min(), utc); 
+  tp = convert(civil_second::min(), utc);
   EXPECT_EQ(time_point<cctz::seconds>::min(), tp);
- 
-  // Checks that we can also get the minimal value for a far-east zone. 
-  tp = convert(civil_second(-292277022657, 1, 27, 22, 29, 52), east); 
-  EXPECT_EQ("-292277022657-01-27T22:29:52+14:00", format(RFC3339, tp, east)); 
+
+  // Checks that we can also get the minimal value for a far-east zone.
+  tp = convert(civil_second(-292277022657, 1, 27, 22, 29, 52), east);
+  EXPECT_EQ("-292277022657-01-27T22:29:52+14:00", format(RFC3339, tp, east));
   EXPECT_EQ(time_point<cctz::seconds>::min(), tp);
-  tp = convert(civil_second(-292277022657, 1, 27, 22, 29, 51), east); 
+  tp = convert(civil_second(-292277022657, 1, 27, 22, 29, 51), east);
   EXPECT_EQ(time_point<cctz::seconds>::min(), tp);
-  tp = convert(civil_second::min(), east); 
+  tp = convert(civil_second::min(), east);
   EXPECT_EQ(time_point<cctz::seconds>::min(), tp);
- 
-  // Checks that we can also get the minimal value for a far-west zone. 
-  tp = convert(civil_second(-292277022657, 1, 26, 18, 29, 52), west); 
-  EXPECT_EQ("-292277022657-01-26T18:29:52-14:00", format(RFC3339, tp, west)); 
+
+  // Checks that we can also get the minimal value for a far-west zone.
+  tp = convert(civil_second(-292277022657, 1, 26, 18, 29, 52), west);
+  EXPECT_EQ("-292277022657-01-26T18:29:52-14:00", format(RFC3339, tp, west));
   EXPECT_EQ(time_point<cctz::seconds>::min(), tp);
-  tp = convert(civil_second(-292277022657, 1, 26, 18, 29, 51), west); 
+  tp = convert(civil_second(-292277022657, 1, 26, 18, 29, 51), west);
   EXPECT_EQ(time_point<cctz::seconds>::min(), tp);
-  tp = convert(civil_second::min(), west); 
+  tp = convert(civil_second::min(), west);
   EXPECT_EQ(time_point<cctz::seconds>::min(), tp);
 
   // Some similar checks for the "libc" time-zone implementation.
@@ -1013,8 +1013,8 @@ TEST(MakeTime, SysSecondsLimits) {
     EXPECT_EQ("-2147481748-01-01T00:00:00+00:00", format(RFC3339, tp, cut));
 #endif
   }
-} 
- 
+}
+
 TEST(MakeTime, LocalTimeLibC) {
   // Checks that cctz and libc agree on transition points in [1970:2037].
   //
@@ -1161,129 +1161,129 @@ TEST(PrevTransition, AmericaNewYork) {
   // We have a transition but we don't know which one.
 }
 
-TEST(TimeZoneEdgeCase, AmericaNewYork) { 
-  const time_zone tz = LoadZone("America/New_York"); 
- 
-  // Spring 1:59:59 -> 3:00:00 
-  auto tp = convert(civil_second(2013, 3, 10, 1, 59, 59), tz); 
-  ExpectTime(tp, tz, 2013, 3, 10, 1, 59, 59, -5 * 3600, false, "EST"); 
+TEST(TimeZoneEdgeCase, AmericaNewYork) {
+  const time_zone tz = LoadZone("America/New_York");
+
+  // Spring 1:59:59 -> 3:00:00
+  auto tp = convert(civil_second(2013, 3, 10, 1, 59, 59), tz);
+  ExpectTime(tp, tz, 2013, 3, 10, 1, 59, 59, -5 * 3600, false, "EST");
   tp += cctz::seconds(1);
-  ExpectTime(tp, tz, 2013, 3, 10, 3, 0, 0, -4 * 3600, true, "EDT"); 
- 
-  // Fall 1:59:59 -> 1:00:00 
-  tp = convert(civil_second(2013, 11, 3, 1, 59, 59), tz); 
-  ExpectTime(tp, tz, 2013, 11, 3, 1, 59, 59, -4 * 3600, true, "EDT"); 
+  ExpectTime(tp, tz, 2013, 3, 10, 3, 0, 0, -4 * 3600, true, "EDT");
+
+  // Fall 1:59:59 -> 1:00:00
+  tp = convert(civil_second(2013, 11, 3, 1, 59, 59), tz);
+  ExpectTime(tp, tz, 2013, 11, 3, 1, 59, 59, -4 * 3600, true, "EDT");
   tp += cctz::seconds(1);
-  ExpectTime(tp, tz, 2013, 11, 3, 1, 0, 0, -5 * 3600, false, "EST"); 
-} 
- 
-TEST(TimeZoneEdgeCase, AmericaLosAngeles) { 
-  const time_zone tz = LoadZone("America/Los_Angeles"); 
- 
-  // Spring 1:59:59 -> 3:00:00 
-  auto tp = convert(civil_second(2013, 3, 10, 1, 59, 59), tz); 
-  ExpectTime(tp, tz, 2013, 3, 10, 1, 59, 59, -8 * 3600, false, "PST"); 
+  ExpectTime(tp, tz, 2013, 11, 3, 1, 0, 0, -5 * 3600, false, "EST");
+}
+
+TEST(TimeZoneEdgeCase, AmericaLosAngeles) {
+  const time_zone tz = LoadZone("America/Los_Angeles");
+
+  // Spring 1:59:59 -> 3:00:00
+  auto tp = convert(civil_second(2013, 3, 10, 1, 59, 59), tz);
+  ExpectTime(tp, tz, 2013, 3, 10, 1, 59, 59, -8 * 3600, false, "PST");
   tp += cctz::seconds(1);
-  ExpectTime(tp, tz, 2013, 3, 10, 3, 0, 0, -7 * 3600, true, "PDT"); 
- 
-  // Fall 1:59:59 -> 1:00:00 
-  tp = convert(civil_second(2013, 11, 3, 1, 59, 59), tz); 
-  ExpectTime(tp, tz, 2013, 11, 3, 1, 59, 59, -7 * 3600, true, "PDT"); 
+  ExpectTime(tp, tz, 2013, 3, 10, 3, 0, 0, -7 * 3600, true, "PDT");
+
+  // Fall 1:59:59 -> 1:00:00
+  tp = convert(civil_second(2013, 11, 3, 1, 59, 59), tz);
+  ExpectTime(tp, tz, 2013, 11, 3, 1, 59, 59, -7 * 3600, true, "PDT");
   tp += cctz::seconds(1);
-  ExpectTime(tp, tz, 2013, 11, 3, 1, 0, 0, -8 * 3600, false, "PST"); 
-} 
- 
-TEST(TimeZoneEdgeCase, ArizonaNoTransition) { 
-  const time_zone tz = LoadZone("America/Phoenix"); 
- 
-  // No transition in Spring. 
-  auto tp = convert(civil_second(2013, 3, 10, 1, 59, 59), tz); 
-  ExpectTime(tp, tz, 2013, 3, 10, 1, 59, 59, -7 * 3600, false, "MST"); 
+  ExpectTime(tp, tz, 2013, 11, 3, 1, 0, 0, -8 * 3600, false, "PST");
+}
+
+TEST(TimeZoneEdgeCase, ArizonaNoTransition) {
+  const time_zone tz = LoadZone("America/Phoenix");
+
+  // No transition in Spring.
+  auto tp = convert(civil_second(2013, 3, 10, 1, 59, 59), tz);
+  ExpectTime(tp, tz, 2013, 3, 10, 1, 59, 59, -7 * 3600, false, "MST");
   tp += cctz::seconds(1);
-  ExpectTime(tp, tz, 2013, 3, 10, 2, 0, 0, -7 * 3600, false, "MST"); 
- 
-  // No transition in Fall. 
-  tp = convert(civil_second(2013, 11, 3, 1, 59, 59), tz); 
-  ExpectTime(tp, tz, 2013, 11, 3, 1, 59, 59, -7 * 3600, false, "MST"); 
+  ExpectTime(tp, tz, 2013, 3, 10, 2, 0, 0, -7 * 3600, false, "MST");
+
+  // No transition in Fall.
+  tp = convert(civil_second(2013, 11, 3, 1, 59, 59), tz);
+  ExpectTime(tp, tz, 2013, 11, 3, 1, 59, 59, -7 * 3600, false, "MST");
   tp += cctz::seconds(1);
-  ExpectTime(tp, tz, 2013, 11, 3, 2, 0, 0, -7 * 3600, false, "MST"); 
-} 
- 
-TEST(TimeZoneEdgeCase, AsiaKathmandu) { 
-  const time_zone tz = LoadZone("Asia/Kathmandu"); 
- 
-  // A non-DST offset change from +0530 to +0545 
-  // 
-  //   504901799 == Tue, 31 Dec 1985 23:59:59 +0530 (+0530) 
-  //   504901800 == Wed,  1 Jan 1986 00:15:00 +0545 (+0545) 
-  auto tp = convert(civil_second(1985, 12, 31, 23, 59, 59), tz); 
-  ExpectTime(tp, tz, 1985, 12, 31, 23, 59, 59, 5.5 * 3600, false, "+0530"); 
+  ExpectTime(tp, tz, 2013, 11, 3, 2, 0, 0, -7 * 3600, false, "MST");
+}
+
+TEST(TimeZoneEdgeCase, AsiaKathmandu) {
+  const time_zone tz = LoadZone("Asia/Kathmandu");
+
+  // A non-DST offset change from +0530 to +0545
+  //
+  //   504901799 == Tue, 31 Dec 1985 23:59:59 +0530 (+0530)
+  //   504901800 == Wed,  1 Jan 1986 00:15:00 +0545 (+0545)
+  auto tp = convert(civil_second(1985, 12, 31, 23, 59, 59), tz);
+  ExpectTime(tp, tz, 1985, 12, 31, 23, 59, 59, 5.5 * 3600, false, "+0530");
   tp += cctz::seconds(1);
-  ExpectTime(tp, tz, 1986, 1, 1, 0, 15, 0, 5.75 * 3600, false, "+0545"); 
-} 
- 
-TEST(TimeZoneEdgeCase, PacificChatham) { 
-  const time_zone tz = LoadZone("Pacific/Chatham"); 
- 
-  // One-hour DST offset changes, but at atypical values 
-  // 
-  //   1365256799 == Sun,  7 Apr 2013 03:44:59 +1345 (+1345) 
-  //   1365256800 == Sun,  7 Apr 2013 02:45:00 +1245 (+1245) 
-  auto tp = convert(civil_second(2013, 4, 7, 3, 44, 59), tz); 
-  ExpectTime(tp, tz, 2013, 4, 7, 3, 44, 59, 13.75 * 3600, true, "+1345"); 
+  ExpectTime(tp, tz, 1986, 1, 1, 0, 15, 0, 5.75 * 3600, false, "+0545");
+}
+
+TEST(TimeZoneEdgeCase, PacificChatham) {
+  const time_zone tz = LoadZone("Pacific/Chatham");
+
+  // One-hour DST offset changes, but at atypical values
+  //
+  //   1365256799 == Sun,  7 Apr 2013 03:44:59 +1345 (+1345)
+  //   1365256800 == Sun,  7 Apr 2013 02:45:00 +1245 (+1245)
+  auto tp = convert(civil_second(2013, 4, 7, 3, 44, 59), tz);
+  ExpectTime(tp, tz, 2013, 4, 7, 3, 44, 59, 13.75 * 3600, true, "+1345");
   tp += cctz::seconds(1);
-  ExpectTime(tp, tz, 2013, 4, 7, 2, 45, 0, 12.75 * 3600, false, "+1245"); 
- 
-  //   1380376799 == Sun, 29 Sep 2013 02:44:59 +1245 (+1245) 
-  //   1380376800 == Sun, 29 Sep 2013 03:45:00 +1345 (+1345) 
-  tp = convert(civil_second(2013, 9, 29, 2, 44, 59), tz); 
-  ExpectTime(tp, tz, 2013, 9, 29, 2, 44, 59, 12.75 * 3600, false, "+1245"); 
+  ExpectTime(tp, tz, 2013, 4, 7, 2, 45, 0, 12.75 * 3600, false, "+1245");
+
+  //   1380376799 == Sun, 29 Sep 2013 02:44:59 +1245 (+1245)
+  //   1380376800 == Sun, 29 Sep 2013 03:45:00 +1345 (+1345)
+  tp = convert(civil_second(2013, 9, 29, 2, 44, 59), tz);
+  ExpectTime(tp, tz, 2013, 9, 29, 2, 44, 59, 12.75 * 3600, false, "+1245");
   tp += cctz::seconds(1);
-  ExpectTime(tp, tz, 2013, 9, 29, 3, 45, 0, 13.75 * 3600, true, "+1345"); 
-} 
- 
-TEST(TimeZoneEdgeCase, AustraliaLordHowe) { 
-  const time_zone tz = LoadZone("Australia/Lord_Howe"); 
- 
-  // Half-hour DST offset changes 
-  // 
-  //   1365260399 == Sun,  7 Apr 2013 01:59:59 +1100 (+11) 
-  //   1365260400 == Sun,  7 Apr 2013 01:30:00 +1030 (+1030) 
-  auto tp = convert(civil_second(2013, 4, 7, 1, 59, 59), tz); 
-  ExpectTime(tp, tz, 2013, 4, 7, 1, 59, 59, 11 * 3600, true, "+11"); 
+  ExpectTime(tp, tz, 2013, 9, 29, 3, 45, 0, 13.75 * 3600, true, "+1345");
+}
+
+TEST(TimeZoneEdgeCase, AustraliaLordHowe) {
+  const time_zone tz = LoadZone("Australia/Lord_Howe");
+
+  // Half-hour DST offset changes
+  //
+  //   1365260399 == Sun,  7 Apr 2013 01:59:59 +1100 (+11)
+  //   1365260400 == Sun,  7 Apr 2013 01:30:00 +1030 (+1030)
+  auto tp = convert(civil_second(2013, 4, 7, 1, 59, 59), tz);
+  ExpectTime(tp, tz, 2013, 4, 7, 1, 59, 59, 11 * 3600, true, "+11");
   tp += cctz::seconds(1);
-  ExpectTime(tp, tz, 2013, 4, 7, 1, 30, 0, 10.5 * 3600, false, "+1030"); 
- 
-  //   1380986999 == Sun,  6 Oct 2013 01:59:59 +1030 (+1030) 
-  //   1380987000 == Sun,  6 Oct 2013 02:30:00 +1100 (+11) 
-  tp = convert(civil_second(2013, 10, 6, 1, 59, 59), tz); 
-  ExpectTime(tp, tz, 2013, 10, 6, 1, 59, 59, 10.5 * 3600, false, "+1030"); 
+  ExpectTime(tp, tz, 2013, 4, 7, 1, 30, 0, 10.5 * 3600, false, "+1030");
+
+  //   1380986999 == Sun,  6 Oct 2013 01:59:59 +1030 (+1030)
+  //   1380987000 == Sun,  6 Oct 2013 02:30:00 +1100 (+11)
+  tp = convert(civil_second(2013, 10, 6, 1, 59, 59), tz);
+  ExpectTime(tp, tz, 2013, 10, 6, 1, 59, 59, 10.5 * 3600, false, "+1030");
   tp += cctz::seconds(1);
-  ExpectTime(tp, tz, 2013, 10, 6, 2, 30, 0, 11 * 3600, true, "+11"); 
-} 
- 
-TEST(TimeZoneEdgeCase, PacificApia) { 
-  const time_zone tz = LoadZone("Pacific/Apia"); 
- 
-  // At the end of December 2011, Samoa jumped forward by one day, 
-  // skipping 30 December from the local calendar, when the nation 
-  // moved to the west of the International Date Line. 
-  // 
-  // A one-day, non-DST offset change 
-  // 
-  //   1325239199 == Thu, 29 Dec 2011 23:59:59 -1000 (-10) 
-  //   1325239200 == Sat, 31 Dec 2011 00:00:00 +1400 (+14) 
-  auto tp = convert(civil_second(2011, 12, 29, 23, 59, 59), tz); 
-  ExpectTime(tp, tz, 2011, 12, 29, 23, 59, 59, -10 * 3600, true, "-10"); 
+  ExpectTime(tp, tz, 2013, 10, 6, 2, 30, 0, 11 * 3600, true, "+11");
+}
+
+TEST(TimeZoneEdgeCase, PacificApia) {
+  const time_zone tz = LoadZone("Pacific/Apia");
+
+  // At the end of December 2011, Samoa jumped forward by one day,
+  // skipping 30 December from the local calendar, when the nation
+  // moved to the west of the International Date Line.
+  //
+  // A one-day, non-DST offset change
+  //
+  //   1325239199 == Thu, 29 Dec 2011 23:59:59 -1000 (-10)
+  //   1325239200 == Sat, 31 Dec 2011 00:00:00 +1400 (+14)
+  auto tp = convert(civil_second(2011, 12, 29, 23, 59, 59), tz);
+  ExpectTime(tp, tz, 2011, 12, 29, 23, 59, 59, -10 * 3600, true, "-10");
   EXPECT_EQ(363, get_yearday(convert(tp, tz)));
   tp += cctz::seconds(1);
-  ExpectTime(tp, tz, 2011, 12, 31, 0, 0, 0, 14 * 3600, true, "+14"); 
+  ExpectTime(tp, tz, 2011, 12, 31, 0, 0, 0, 14 * 3600, true, "+14");
   EXPECT_EQ(365, get_yearday(convert(tp, tz)));
-} 
- 
-TEST(TimeZoneEdgeCase, AfricaCairo) { 
-  const time_zone tz = LoadZone("Africa/Cairo"); 
- 
+}
+
+TEST(TimeZoneEdgeCase, AfricaCairo) {
+  const time_zone tz = LoadZone("Africa/Cairo");
+
   if (VersionCmp(tz, "2014c") >= 0) {
     // An interesting case of midnight not existing.
     //
@@ -1294,11 +1294,11 @@ TEST(TimeZoneEdgeCase, AfricaCairo) {
     tp += cctz::seconds(1);
     ExpectTime(tp, tz, 2014, 5, 16, 1, 0, 0, 3 * 3600, true, "EEST");
   }
-} 
- 
-TEST(TimeZoneEdgeCase, AfricaMonrovia) { 
-  const time_zone tz = LoadZone("Africa/Monrovia"); 
- 
+}
+
+TEST(TimeZoneEdgeCase, AfricaMonrovia) {
+  const time_zone tz = LoadZone("Africa/Monrovia");
+
   if (VersionCmp(tz, "2017b") >= 0) {
     // Strange offset change -00:44:30 -> +00:00:00 (non-DST)
     //
@@ -1309,17 +1309,17 @@ TEST(TimeZoneEdgeCase, AfricaMonrovia) {
     tp += cctz::seconds(1);
     ExpectTime(tp, tz, 1972, 1, 7, 0, 44, 30, 0 * 60, false, "GMT");
   }
-} 
- 
-TEST(TimeZoneEdgeCase, AmericaJamaica) { 
-  // Jamaica discontinued DST transitions in 1983, and is now at a 
-  // constant -0500.  This makes it an interesting edge-case target. 
-  // Note that the 32-bit times used in a (tzh_version == 0) zoneinfo 
-  // file cannot represent the abbreviation-only transition of 1890, 
-  // so we ignore the abbreviation by expecting what we received. 
-  const time_zone tz = LoadZone("America/Jamaica"); 
- 
-  // Before the first transition. 
+}
+
+TEST(TimeZoneEdgeCase, AmericaJamaica) {
+  // Jamaica discontinued DST transitions in 1983, and is now at a
+  // constant -0500.  This makes it an interesting edge-case target.
+  // Note that the 32-bit times used in a (tzh_version == 0) zoneinfo
+  // file cannot represent the abbreviation-only transition of 1890,
+  // so we ignore the abbreviation by expecting what we received.
+  const time_zone tz = LoadZone("America/Jamaica");
+
+  // Before the first transition.
   if (!tz.version().empty() && VersionCmp(tz, "2018d") >= 0) {
     // We avoid the expectations on the -18430 offset below unless we are
     // certain we have commit 907241e (Fix off-by-1 error for Jamaica and
@@ -1328,7 +1328,7 @@ TEST(TimeZoneEdgeCase, AmericaJamaica) {
     auto tp = convert(civil_second(1889, 12, 31, 0, 0, 0), tz);
     ExpectTime(tp, tz, 1889, 12, 31, 0, 0, 0, -18430, false,
                tz.lookup(tp).abbr);
- 
+
     // Over the first (abbreviation-change only) transition.
     //   -2524503170 == Tue, 31 Dec 1889 23:59:59 -0507 (LMT)
     //   -2524503169 == Wed,  1 Jan 1890 00:00:00 -0507 (KMT)
@@ -1338,98 +1338,98 @@ TEST(TimeZoneEdgeCase, AmericaJamaica) {
     tp += cctz::seconds(1);
     ExpectTime(tp, tz, 1890, 1, 1, 0, 0, 0, -18430, false, "KMT");
   }
- 
-  // Over the last (DST) transition. 
-  //     436341599 == Sun, 30 Oct 1983 01:59:59 -0400 (EDT) 
-  //     436341600 == Sun, 30 Oct 1983 01:00:00 -0500 (EST) 
+
+  // Over the last (DST) transition.
+  //     436341599 == Sun, 30 Oct 1983 01:59:59 -0400 (EDT)
+  //     436341600 == Sun, 30 Oct 1983 01:00:00 -0500 (EST)
   auto tp = convert(civil_second(1983, 10, 30, 1, 59, 59), tz);
-  ExpectTime(tp, tz, 1983, 10, 30, 1, 59, 59, -4 * 3600, true, "EDT"); 
+  ExpectTime(tp, tz, 1983, 10, 30, 1, 59, 59, -4 * 3600, true, "EDT");
   tp += cctz::seconds(1);
-  ExpectTime(tp, tz, 1983, 10, 30, 1, 0, 0, -5 * 3600, false, "EST"); 
- 
-  // After the last transition. 
-  tp = convert(civil_second(1983, 12, 31, 23, 59, 59), tz); 
-  ExpectTime(tp, tz, 1983, 12, 31, 23, 59, 59, -5 * 3600, false, "EST"); 
-} 
- 
-TEST(TimeZoneEdgeCase, WET) { 
-  // Cover some non-existent times within forward transitions. 
-  const time_zone tz = LoadZone("WET"); 
- 
-  // Before the first transition. 
-  auto tp = convert(civil_second(1977, 1, 1, 0, 0, 0), tz); 
-  ExpectTime(tp, tz, 1977, 1, 1, 0, 0, 0, 0, false, "WET"); 
- 
-  // Over the first transition. 
-  //     228877199 == Sun,  3 Apr 1977 00:59:59 +0000 (WET) 
-  //     228877200 == Sun,  3 Apr 1977 02:00:00 +0100 (WEST) 
-  tp = convert(civil_second(1977, 4, 3, 0, 59, 59), tz); 
-  ExpectTime(tp, tz, 1977, 4, 3, 0, 59, 59, 0, false, "WET"); 
+  ExpectTime(tp, tz, 1983, 10, 30, 1, 0, 0, -5 * 3600, false, "EST");
+
+  // After the last transition.
+  tp = convert(civil_second(1983, 12, 31, 23, 59, 59), tz);
+  ExpectTime(tp, tz, 1983, 12, 31, 23, 59, 59, -5 * 3600, false, "EST");
+}
+
+TEST(TimeZoneEdgeCase, WET) {
+  // Cover some non-existent times within forward transitions.
+  const time_zone tz = LoadZone("WET");
+
+  // Before the first transition.
+  auto tp = convert(civil_second(1977, 1, 1, 0, 0, 0), tz);
+  ExpectTime(tp, tz, 1977, 1, 1, 0, 0, 0, 0, false, "WET");
+
+  // Over the first transition.
+  //     228877199 == Sun,  3 Apr 1977 00:59:59 +0000 (WET)
+  //     228877200 == Sun,  3 Apr 1977 02:00:00 +0100 (WEST)
+  tp = convert(civil_second(1977, 4, 3, 0, 59, 59), tz);
+  ExpectTime(tp, tz, 1977, 4, 3, 0, 59, 59, 0, false, "WET");
   tp += cctz::seconds(1);
-  ExpectTime(tp, tz, 1977, 4, 3, 2, 0, 0, 1 * 3600, true, "WEST"); 
- 
-  // A non-existent time within the first transition. 
-  time_zone::civil_lookup cl1 = tz.lookup(civil_second(1977, 4, 3, 1, 15, 0)); 
-  EXPECT_EQ(time_zone::civil_lookup::SKIPPED, cl1.kind); 
-  ExpectTime(cl1.pre, tz, 1977, 4, 3, 2, 15, 0, 1 * 3600, true, "WEST"); 
-  ExpectTime(cl1.trans, tz, 1977, 4, 3, 2, 0, 0, 1 * 3600, true, "WEST"); 
-  ExpectTime(cl1.post, tz, 1977, 4, 3, 0, 15, 0, 0 * 3600, false, "WET"); 
- 
-  // A non-existent time within the second forward transition. 
-  time_zone::civil_lookup cl2 = tz.lookup(civil_second(1978, 4, 2, 1, 15, 0)); 
-  EXPECT_EQ(time_zone::civil_lookup::SKIPPED, cl2.kind); 
-  ExpectTime(cl2.pre, tz, 1978, 4, 2, 2, 15, 0, 1 * 3600, true, "WEST"); 
-  ExpectTime(cl2.trans, tz, 1978, 4, 2, 2, 0, 0, 1 * 3600, true, "WEST"); 
-  ExpectTime(cl2.post, tz, 1978, 4, 2, 0, 15, 0, 0 * 3600, false, "WET"); 
-} 
- 
-TEST(TimeZoneEdgeCase, FixedOffsets) { 
-  const time_zone gmtm5 = LoadZone("Etc/GMT+5");  // -0500 
-  auto tp = convert(civil_second(1970, 1, 1, 0, 0, 0), gmtm5); 
-  ExpectTime(tp, gmtm5, 1970, 1, 1, 0, 0, 0, -5 * 3600, false, "-05"); 
+  ExpectTime(tp, tz, 1977, 4, 3, 2, 0, 0, 1 * 3600, true, "WEST");
+
+  // A non-existent time within the first transition.
+  time_zone::civil_lookup cl1 = tz.lookup(civil_second(1977, 4, 3, 1, 15, 0));
+  EXPECT_EQ(time_zone::civil_lookup::SKIPPED, cl1.kind);
+  ExpectTime(cl1.pre, tz, 1977, 4, 3, 2, 15, 0, 1 * 3600, true, "WEST");
+  ExpectTime(cl1.trans, tz, 1977, 4, 3, 2, 0, 0, 1 * 3600, true, "WEST");
+  ExpectTime(cl1.post, tz, 1977, 4, 3, 0, 15, 0, 0 * 3600, false, "WET");
+
+  // A non-existent time within the second forward transition.
+  time_zone::civil_lookup cl2 = tz.lookup(civil_second(1978, 4, 2, 1, 15, 0));
+  EXPECT_EQ(time_zone::civil_lookup::SKIPPED, cl2.kind);
+  ExpectTime(cl2.pre, tz, 1978, 4, 2, 2, 15, 0, 1 * 3600, true, "WEST");
+  ExpectTime(cl2.trans, tz, 1978, 4, 2, 2, 0, 0, 1 * 3600, true, "WEST");
+  ExpectTime(cl2.post, tz, 1978, 4, 2, 0, 15, 0, 0 * 3600, false, "WET");
+}
+
+TEST(TimeZoneEdgeCase, FixedOffsets) {
+  const time_zone gmtm5 = LoadZone("Etc/GMT+5");  // -0500
+  auto tp = convert(civil_second(1970, 1, 1, 0, 0, 0), gmtm5);
+  ExpectTime(tp, gmtm5, 1970, 1, 1, 0, 0, 0, -5 * 3600, false, "-05");
   EXPECT_EQ(chrono::system_clock::from_time_t(5 * 3600), tp);
- 
-  const time_zone gmtp5 = LoadZone("Etc/GMT-5");  // +0500 
-  tp = convert(civil_second(1970, 1, 1, 0, 0, 0), gmtp5); 
-  ExpectTime(tp, gmtp5, 1970, 1, 1, 0, 0, 0, 5 * 3600, false, "+05"); 
+
+  const time_zone gmtp5 = LoadZone("Etc/GMT-5");  // +0500
+  tp = convert(civil_second(1970, 1, 1, 0, 0, 0), gmtp5);
+  ExpectTime(tp, gmtp5, 1970, 1, 1, 0, 0, 0, 5 * 3600, false, "+05");
   EXPECT_EQ(chrono::system_clock::from_time_t(-5 * 3600), tp);
-} 
- 
-TEST(TimeZoneEdgeCase, NegativeYear) { 
-  // Tests transition from year 0 (aka 1BCE) to year -1. 
-  const time_zone tz = utc_time_zone(); 
-  auto tp = convert(civil_second(0, 1, 1, 0, 0, 0), tz); 
-  ExpectTime(tp, tz, 0, 1, 1, 0, 0, 0, 0 * 3600, false, "UTC"); 
+}
+
+TEST(TimeZoneEdgeCase, NegativeYear) {
+  // Tests transition from year 0 (aka 1BCE) to year -1.
+  const time_zone tz = utc_time_zone();
+  auto tp = convert(civil_second(0, 1, 1, 0, 0, 0), tz);
+  ExpectTime(tp, tz, 0, 1, 1, 0, 0, 0, 0 * 3600, false, "UTC");
   EXPECT_EQ(weekday::saturday, get_weekday(convert(tp, tz)));
   tp -= cctz::seconds(1);
-  ExpectTime(tp, tz, -1, 12, 31, 23, 59, 59, 0 * 3600, false, "UTC"); 
+  ExpectTime(tp, tz, -1, 12, 31, 23, 59, 59, 0 * 3600, false, "UTC");
   EXPECT_EQ(weekday::friday, get_weekday(convert(tp, tz)));
-} 
- 
-TEST(TimeZoneEdgeCase, UTC32bitLimit) { 
-  const time_zone tz = utc_time_zone(); 
- 
-  // Limits of signed 32-bit time_t 
-  // 
-  //   2147483647 == Tue, 19 Jan 2038 03:14:07 +0000 (UTC) 
-  //   2147483648 == Tue, 19 Jan 2038 03:14:08 +0000 (UTC) 
-  auto tp = convert(civil_second(2038, 1, 19, 3, 14, 7), tz); 
-  ExpectTime(tp, tz, 2038, 1, 19, 3, 14, 7, 0 * 3600, false, "UTC"); 
+}
+
+TEST(TimeZoneEdgeCase, UTC32bitLimit) {
+  const time_zone tz = utc_time_zone();
+
+  // Limits of signed 32-bit time_t
+  //
+  //   2147483647 == Tue, 19 Jan 2038 03:14:07 +0000 (UTC)
+  //   2147483648 == Tue, 19 Jan 2038 03:14:08 +0000 (UTC)
+  auto tp = convert(civil_second(2038, 1, 19, 3, 14, 7), tz);
+  ExpectTime(tp, tz, 2038, 1, 19, 3, 14, 7, 0 * 3600, false, "UTC");
   tp += cctz::seconds(1);
-  ExpectTime(tp, tz, 2038, 1, 19, 3, 14, 8, 0 * 3600, false, "UTC"); 
-} 
- 
-TEST(TimeZoneEdgeCase, UTC5DigitYear) { 
-  const time_zone tz = utc_time_zone(); 
- 
-  // Rollover to 5-digit year 
-  // 
-  //   253402300799 == Fri, 31 Dec 9999 23:59:59 +0000 (UTC) 
-  //   253402300800 == Sat,  1 Jan 1000 00:00:00 +0000 (UTC) 
-  auto tp = convert(civil_second(9999, 12, 31, 23, 59, 59), tz); 
-  ExpectTime(tp, tz, 9999, 12, 31, 23, 59, 59, 0 * 3600, false, "UTC"); 
+  ExpectTime(tp, tz, 2038, 1, 19, 3, 14, 8, 0 * 3600, false, "UTC");
+}
+
+TEST(TimeZoneEdgeCase, UTC5DigitYear) {
+  const time_zone tz = utc_time_zone();
+
+  // Rollover to 5-digit year
+  //
+  //   253402300799 == Fri, 31 Dec 9999 23:59:59 +0000 (UTC)
+  //   253402300800 == Sat,  1 Jan 1000 00:00:00 +0000 (UTC)
+  auto tp = convert(civil_second(9999, 12, 31, 23, 59, 59), tz);
+  ExpectTime(tp, tz, 9999, 12, 31, 23, 59, 59, 0 * 3600, false, "UTC");
   tp += cctz::seconds(1);
-  ExpectTime(tp, tz, 10000, 1, 1, 0, 0, 0, 0 * 3600, false, "UTC"); 
-} 
- 
-}  // namespace cctz 
+  ExpectTime(tp, tz, 10000, 1, 1, 0, 0, 0, 0 * 3600, false, "UTC");
+}
+
+}  // namespace cctz
diff --git a/contrib/libs/cctz/test/ya.make b/contrib/libs/cctz/test/ya.make
index de8eaed1fc..8815f9769d 100644
--- a/contrib/libs/cctz/test/ya.make
+++ b/contrib/libs/cctz/test/ya.make
@@ -1,5 +1,5 @@
 GTEST()
- 
+
 LICENSE(Apache-2.0)
 
 LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
@@ -8,12 +8,12 @@ OWNER(
     dfyz
     petrk
 )
- 
-PEERDIR( 
+
+PEERDIR(
     contrib/libs/cctz
-    contrib/libs/cctz/tzdata 
-) 
- 
+    contrib/libs/cctz/tzdata
+)
+
 ADDINCL(
     contrib/libs/cctz/include
 )
@@ -27,10 +27,10 @@ IF (NOT AUTOCHECK)
     )
 ENDIF()
 
-SRCS( 
-    civil_time_test.cc 
+SRCS(
+    civil_time_test.cc
     time_zone_format_test.cc
-    time_zone_lookup_test.cc 
-) 
- 
-END() 
+    time_zone_lookup_test.cc
+)
+
+END()