Browse Source

Update contrib/libs/re2 to 2023-07-01

robot-contrib 1 year ago
parent
commit
ffa002e1be
2 changed files with 4 additions and 10 deletions
  1. 2 8
      contrib/libs/re2/re2/stringpiece.h
  2. 2 2
      contrib/libs/re2/ya.make

+ 2 - 8
contrib/libs/re2/re2/stringpiece.h

@@ -9,14 +9,8 @@
 
 namespace re2 {
 
-// RE2 has two versions: "sans Abseil" in the main branch; and "avec Abseil" in
-// the abseil branch. This has led to a diamond dependency problem for projects
-// like Envoy: as per https://github.com/google/re2/issues/388, GoogleTest took
-// a dependency on RE2 avec Abseil, but other things depend on RE2 sans Abseil.
-// To resolve this conflict until both versions can migrate to std::string_view
-// (C++17), those other things must be able to #include "re2/stringpiece.h" and
-// use re2::StringPiece. (This is a hack, obviously, but it beats telling every
-// project in this situation that they have to perform source transformations.)
+// Until RE2 requires C++17 and uses std::string_view, allow users to
+// continue to #include "re2/stringpiece.h" and use re2::StringPiece.
 using StringPiece = absl::string_view;
 
 }  // namespace re2

+ 2 - 2
contrib/libs/re2/ya.make

@@ -9,9 +9,9 @@ LICENSE(
 
 LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
 
-VERSION(2023-06-02)
+VERSION(2023-07-01)
 
-ORIGINAL_SOURCE(https://github.com/google/re2/archive/2023-06-02.tar.gz)
+ORIGINAL_SOURCE(https://github.com/google/re2/archive/2023-07-01.tar.gz)
 
 PEERDIR(
     contrib/restricted/abseil-cpp/absl/base