From 55a1ac503549805036c2375362cb28f3d5e1afcc Mon Sep 17 00:00:00 2001 From: Victor Zverovich Date: Mon, 7 Nov 2016 08:55:40 -0800 Subject: [PATCH] Fix test --- fmt/format.h | 3 ++- test/format-test.cc | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/fmt/format.h b/fmt/format.h index fb3beb4c..0c038a53 100644 --- a/fmt/format.h +++ b/fmt/format.h @@ -3631,7 +3631,8 @@ void vformat(BasicWriter &writer, BasicCStringRef format_str, FMT_THROW(format_error("unmatched '}' in format string")); internal::write(writer, start, s - 1); format_arg(writer, ctx.parse_arg_id(), ctx); - assert(*s == '}'); + if (*s != '}') + FMT_THROW(format_error(fmt::format("unknown format specifier"))); start = ++s; } internal::write(writer, start, s); diff --git a/test/format-test.cc b/test/format-test.cc index bb195a3c..e7e72a1d 100644 --- a/test/format-test.cc +++ b/test/format-test.cc @@ -1362,7 +1362,7 @@ void format_value(fmt::Writer &w, const Date &d, fmt::format_context &) { TEST(FormatterTest, FormatCustom) { Date date(2012, 12, 9); EXPECT_THROW_MSG(fmt::format("{:s}", date), format_error, - "unmatched '}' in format string"); + "unknown format specifier"); } class Answer {};