Merge remote-tracking branch 'upstream/master' into invalidcolons

# Conflicts:
#	test/chrono-test.cc

test/chrono-test.cc

@@ -305,4 +305,5 @@ TEST(ChronoTest, InvalidColons) {
   EXPECT_THROW(fmt::format("{0}=:{0::", std::chrono::seconds(0)),
                fmt::format_error);
 }
+
 #endif  // FMT_STATIC_THOUSANDS_SEPARATOR

test/format-impl-test.cc

@@ -137,10 +137,10 @@ TEST(FPTest, FixedHandler) {
             digits::error);
 }
 
-TEST(FPTest, Grisu2FormatCompilesWithNonIEEEDouble) {
+TEST(FPTest, GrisuFormatCompilesWithNonIEEEDouble) {
   fmt::memory_buffer buf;
   int exp = 0;
-  grisu2_format(4.2f, buf, -1, false, exp);
+  grisu_format(4.2f, buf, -1, false, exp);
 }
 
 template <typename T> struct ValueExtractor : fmt::internal::function<T> {

test/format-test.cc

@@ -1488,6 +1488,7 @@ TEST(FormatterTest, PrecisionRounding) {
   EXPECT_EQ("0.002", format("{:.3f}", 0.0015));
   EXPECT_EQ("1.000", format("{:.3f}", 0.9999));
   EXPECT_EQ("0.00123", format("{:.3}", 0.00123));
+  EXPECT_EQ("0.1", format("{:.16g}", 0.1));
   // Trigger rounding error in Grisu by a carefully chosen number.
   auto n = 3788512123356.985352;
   char buffer[64];
@@ -2451,7 +2452,7 @@ TEST(FormatTest, FormatStringErrors) {
   EXPECT_ERROR("{:d}", "invalid type specifier", std::string);
   EXPECT_ERROR("{:s}", "invalid type specifier", void*);
 #  else
-  fmt::print("warning: constexpr is broken in this versio of MSVC\n");
+  fmt::print("warning: constexpr is broken in this version of MSVC\n");
 #  endif
   EXPECT_ERROR("{foo", "compile-time checks don't support named arguments",
                int);