Export of internal Abseil changes
-- 44efc1bb0e0a47eabf0569eaab81c66710d5b9c3 by Mark Barolak <mbar@google.com>: Update "strings::Substitute" to "absl::Substitute" in the absl::Substitute error messages. PiperOrigin-RevId: 282388042 -- 9ec7e9385f5469473f76857dc5b067d869bbc65b by Abseil Team <absl-team@google.com>: Remove deprecated ExponentialBiased::Get() PiperOrigin-RevId: 282045123 GitOrigin-RevId: 44efc1bb0e0a47eabf0569eaab81c66710d5b9c3 Change-Id: I915bf0ff5fa7ac2bd5f9fb653d1fbd9ece6af9fc
This commit is contained in:
parent
16d9fd58a5
commit
7f4fe64af8
5 changed files with 18 additions and 58 deletions
|
|
@ -35,7 +35,7 @@ void SubstituteAndAppendArray(std::string* output, absl::string_view format,
|
|||
if (i + 1 >= format.size()) {
|
||||
#ifndef NDEBUG
|
||||
ABSL_RAW_LOG(FATAL,
|
||||
"Invalid strings::Substitute() format std::string: \"%s\".",
|
||||
"Invalid absl::Substitute() format std::string: \"%s\".",
|
||||
absl::CEscape(format).c_str());
|
||||
#endif
|
||||
return;
|
||||
|
|
@ -45,7 +45,7 @@ void SubstituteAndAppendArray(std::string* output, absl::string_view format,
|
|||
#ifndef NDEBUG
|
||||
ABSL_RAW_LOG(
|
||||
FATAL,
|
||||
"Invalid strings::Substitute() format std::string: asked for \"$"
|
||||
"Invalid absl::Substitute() format std::string: asked for \"$"
|
||||
"%d\", but only %d args were given. Full format std::string was: "
|
||||
"\"%s\".",
|
||||
index, static_cast<int>(num_args), absl::CEscape(format).c_str());
|
||||
|
|
@ -60,7 +60,7 @@ void SubstituteAndAppendArray(std::string* output, absl::string_view format,
|
|||
} else {
|
||||
#ifndef NDEBUG
|
||||
ABSL_RAW_LOG(FATAL,
|
||||
"Invalid strings::Substitute() format std::string: \"%s\".",
|
||||
"Invalid absl::Substitute() format std::string: \"%s\".",
|
||||
absl::CEscape(format).c_str());
|
||||
#endif
|
||||
return;
|
||||
|
|
|
|||
|
|
@ -189,14 +189,14 @@ TEST(SubstituteTest, VectorBoolRef) {
|
|||
TEST(SubstituteDeathTest, SubstituteDeath) {
|
||||
EXPECT_DEBUG_DEATH(
|
||||
static_cast<void>(absl::Substitute(absl::string_view("-$2"), "a", "b")),
|
||||
"Invalid strings::Substitute\\(\\) format std::string: asked for \"\\$2\", "
|
||||
"Invalid absl::Substitute\\(\\) format std::string: asked for \"\\$2\", "
|
||||
"but only 2 args were given.");
|
||||
EXPECT_DEBUG_DEATH(
|
||||
static_cast<void>(absl::Substitute("-$z-")),
|
||||
"Invalid strings::Substitute\\(\\) format std::string: \"-\\$z-\"");
|
||||
"Invalid absl::Substitute\\(\\) format std::string: \"-\\$z-\"");
|
||||
EXPECT_DEBUG_DEATH(
|
||||
static_cast<void>(absl::Substitute("-$")),
|
||||
"Invalid strings::Substitute\\(\\) format std::string: \"-\\$\"");
|
||||
"Invalid absl::Substitute\\(\\) format std::string: \"-\\$\"");
|
||||
}
|
||||
|
||||
#endif // GTEST_HAS_DEATH_TEST
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue