deps: bump re2 to 2023-07-01

google · Jul 5, 2023 · c5a2fa1 · c5a2fa1
1 parent bf9f9d7
commit c5a2fa1
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 57 deletions.
diff --git a/WORKSPACE b/WORKSPACE
@@ -77,7 +77,7 @@ new_git_repository(
 ## Re2
 git_repository(
     name = "com_google_re2",
-    tag = "2023-03-01",
+    tag = "2023-07-01",
     remote = "https://github.com/google/re2.git",
 )
 

diff --git a/cmake/dependencies/CMakeLists.txt b/cmake/dependencies/CMakeLists.txt
@@ -121,8 +121,8 @@ if(BUILD_re2)
   FetchContent_Declare(
     re2
     GIT_REPOSITORY "https://github.com/google/re2.git"
-    GIT_TAG "2023-03-01"
-    #PATCH_COMMAND git apply --ignore-whitespace "${CMAKE_CURRENT_LIST_DIR}/../../patches/re2-2023-03-01.patch"
+    GIT_TAG "2023-07-01"
+    #PATCH_COMMAND git apply --ignore-whitespace "${CMAKE_CURRENT_LIST_DIR}/../../patches/re2-2023-07-01.patch"
   )
   FetchContent_MakeAvailable(re2)
   list(POP_BACK CMAKE_MESSAGE_INDENT)

diff --git a/ortools/lp_data/lp_parser.cc b/ortools/lp_data/lp_parser.cc
@@ -185,7 +185,7 @@ bool LPParser::ParseIntegerVariablesList(StringPiece line) {
 
 bool LPParser::ParseConstraint(StringPiece constraint) {
   const StatusOr<ParsedConstraint> parsed_constraint_or_status =
-      ::operations_research::glop::ParseConstraint(constraint.as_string());
+      ::operations_research::glop::ParseConstraint(constraint);
   if (!parsed_constraint_or_status.ok()) return false;
   const ParsedConstraint& parsed_constraint =
       parsed_constraint_or_status.value();
@@ -342,10 +342,9 @@ TokenType LPParser::ConsumeToken(StringPiece* sp) {
 
 }  // namespace
 
-StatusOr<ParsedConstraint> ParseConstraint(absl::string_view constraint_view) {
+StatusOr<ParsedConstraint> ParseConstraint(absl::string_view constraint) {
   ParsedConstraint parsed_constraint;
   // Get the name, if present.
-  StringPiece constraint{constraint_view};
   StringPiece constraint_copy{constraint};
   std::string consumed_name;
   Fractional consumed_coeff;
@@ -413,8 +412,8 @@ StatusOr<ParsedConstraint> ParseConstraint(absl::string_view constraint_view) {
     right_bound = consumed_coeff;
     if (ConsumeToken(&constraint, &consumed_name, &consumed_coeff) !=
         TokenType::END) {
-      return absl::InvalidArgumentError(absl::StrCat(
-          "End of input was expected, found: ", constraint.as_string()));
+      return absl::InvalidArgumentError(
+          absl::StrCat("End of input was expected, found: ", constraint));
     }
   }
 

diff --git a/patches/BUILD.bazel b/patches/BUILD.bazel
@@ -12,7 +12,6 @@
 # limitations under the License.
 
 exports_files([
-    "re2-2023-03-01.patch",
     "protobuf-v23.3.patch",
     "pybind11_bazel.patch",
     "pybind11_protobuf.patch",

diff --git a/patches/re2-2023-03-01.patch b/patches/re2-2023-03-01.patch