Projects
Eulaceura:Factory
re2-rust
_service:obs_scm:optimize-re2-rust.patch
Sign Up
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File _service:obs_scm:optimize-re2-rust.patch of Package re2-rust
From a43f0ccc9cf15fdbc30b6570f7e9b04c03e07181 Mon Sep 17 00:00:00 2001 From: eaglegai <eaglegai@163.com> Date: Sat, 15 Jul 2023 16:46:06 +0800 Subject: [PATCH] adjust re2 to re2-rust --- Cargo.toml | 2 +- Makefile | 120 +++++++++++++++---------------- libre2.symbols | 10 +-- libre2.symbols.darwin | 10 +-- re2/filtered_re2.cc | 6 +- re2/filtered_re2.h | 2 +- re2/re2.cc | 6 +- re2/re2.h | 4 +- re2/set.cc | 10 +-- re2/set.h | 4 +- re2/stringpiece.cc | 4 +- re2/testing/filtered_re2_test.cc | 8 +-- re2/testing/re2_arg_test.cc | 6 +- re2/testing/re2_test.cc | 8 +-- re2/testing/regexp_benchmark.cc | 10 +-- re2/testing/set_test.cc | 8 +-- re2/testing/util/benchmark.cc | 4 +- re2/testing/util/benchmark.h | 4 +- re2/testing/util/logging.h | 4 +- re2/testing/util/strutil.cc | 2 +- re2/testing/util/strutil.h | 6 +- re2/testing/util/test.cc | 2 +- re2/testing/util/test.h | 4 +- 23 files changed, 122 insertions(+), 122 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index e5c5ba0..91ffd2f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,5 @@ [workspace] members = [ - "re2", + "re2-rust", "regex-capi" ] diff --git a/Makefile b/Makefile index fa6d5ca..e35e149 100644 --- a/Makefile +++ b/Makefile @@ -56,49 +56,49 @@ ifeq ($(shell uname),Darwin) SOEXT=dylib SOEXTVER=$(SONAME).$(SOEXT) SOEXTVER00=$(SONAME).0.0.$(SOEXT) -MAKE_SHARED_LIBRARY=$(CXX) -dynamiclib -Wl,-compatibility_version,$(SONAME),-current_version,$(SONAME).0.0,-install_name,$(libdir)/libre2.$(SOEXTVER),-exported_symbols_list,libre2.symbols.darwin $(RE2_LDFLAGS) $(LDFLAGS) +MAKE_SHARED_LIBRARY=$(CXX) -dynamiclib -Wl,-compatibility_version,$(SONAME),-current_version,$(SONAME).0.0,-install_name,$(libdir)/libre2-rust.$(SOEXTVER),-exported_symbols_list,libre2.symbols.darwin $(RE2_LDFLAGS) $(LDFLAGS) else ifeq ($(shell uname),SunOS) SOEXT=so SOEXTVER=$(SOEXT).$(SONAME) SOEXTVER00=$(SOEXT).$(SONAME).0.0 -MAKE_SHARED_LIBRARY=$(CXX) -shared -Wl,-soname,libre2.$(SOEXTVER) $(RE2_LDFLAGS) $(LDFLAGS) +MAKE_SHARED_LIBRARY=$(CXX) -shared -Wl,-soname,libre2-rust.$(SOEXTVER) $(RE2_LDFLAGS) $(LDFLAGS) else SOEXT=so SOEXTVER=$(SOEXT).$(SONAME) SOEXTVER00=$(SOEXT).$(SONAME).0.0 -MAKE_SHARED_LIBRARY=$(CXX) -shared -Wl,-soname,libre2.$(SOEXTVER),--version-script,libre2.symbols $(RE2_LDFLAGS) $(LDFLAGS) +MAKE_SHARED_LIBRARY=$(CXX) -shared -Wl,-soname,libre2-rust.$(SOEXTVER),--version-script,libre2.symbols $(RE2_LDFLAGS) $(LDFLAGS) endif .PHONY: all -all: libcapi.a obj/libre2.a obj/so/libre2.$(SOEXT) +all: libcapi.a obj/libre2-rust.a obj/so/libre2-rust.$(SOEXT) INSTALL_HFILES=\ - re2/filtered_re2.h\ - re2/re2.h\ - re2/set.h\ - re2/stringpiece.h\ + re2-rust/filtered_re2.h\ + re2-rust/re2.h\ + re2-rust/set.h\ + re2-rust/stringpiece.h\ regex-capi/include/regex_capi.h\ HFILES=\ - re2/testing/util/benchmark.h\ - re2/testing/util/logging.h\ - re2/testing/util/test.h\ - re2/testing/util/strutil.h\ - re2/testing/util/util.h\ - re2/filtered_re2.h\ - re2/re2.h\ - re2/set.h\ - re2/stringpiece.h\ + re2-rust/testing/util/benchmark.h\ + re2-rust/testing/util/logging.h\ + re2-rust/testing/util/test.h\ + re2-rust/testing/util/strutil.h\ + re2-rust/testing/util/util.h\ + re2-rust/filtered_re2.h\ + re2-rust/re2.h\ + re2-rust/set.h\ + re2-rust/stringpiece.h\ regex-capi/include/regex_capi.h\ # 仅保留接口stub -OFILES=obj/re2/re2.o\ - obj/re2/stringpiece.o\ - obj/re2/set.o\ - obj/re2/filtered_re2.o\ +OFILES=obj/re2-rust/re2.o\ + obj/re2-rust/stringpiece.o\ + obj/re2-rust/set.o\ + obj/re2-rust/filtered_re2.o\ TESTOFILES=\ - obj/re2/testing/util/strutil.o\ + obj/re2-rust/testing/util/strutil.o\ TESTS=\ obj/test/set_test\ @@ -143,61 +143,61 @@ obj/so/%.o: %.cc $(HFILES) libcapi.a: cargo build --release -.PRECIOUS: obj/libre2.a -obj/libre2.a: $(OFILES) +.PRECIOUS: obj/libre2-rust.a +obj/libre2-rust.a: $(OFILES) @mkdir -p obj - $(AR) $(ARFLAGS) obj/libre2.a $(OFILES) + $(AR) $(ARFLAGS) obj/libre2-rust.a $(OFILES) -.PRECIOUS: obj/dbg/libre2.a -obj/dbg/libre2.a: $(DOFILES) +.PRECIOUS: obj/dbg/libre2-rust.a +obj/dbg/libre2-rust.a: $(DOFILES) @mkdir -p obj/dbg - $(AR) $(ARFLAGS) obj/dbg/libre2.a $(DOFILES) + $(AR) $(ARFLAGS) obj/dbg/libre2-rust.a $(DOFILES) -.PRECIOUS: obj/so/libre2.$(SOEXT) -obj/so/libre2.$(SOEXT): $(SOFILES) libre2.symbols libre2.symbols.darwin +.PRECIOUS: obj/so/libre2-rust.$(SOEXT) +obj/so/libre2-rust.$(SOEXT): $(SOFILES) libre2.symbols libre2.symbols.darwin @mkdir -p obj/so - $(MAKE_SHARED_LIBRARY) -o obj/so/libre2.$(SOEXTVER) $(SOFILES) target/release/libcapi.a $(LDFLAGS) - ln -sf libre2.$(SOEXTVER) $@ + $(MAKE_SHARED_LIBRARY) -o obj/so/libre2-rust.$(SOEXTVER) $(SOFILES) target/release/libcapi.a $(LDFLAGS) + ln -sf libre2-rust.$(SOEXTVER) $@ .PRECIOUS: obj/dbg/test/% -obj/dbg/test/%: obj/dbg/libre2.a obj/dbg/re2/testing/%.o $(DTESTOFILES) obj/dbg/re2/testing/util/test.o +obj/dbg/test/%: obj/dbg/libre2-rust.a obj/dbg/re2-rust/testing/%.o $(DTESTOFILES) obj/dbg/re2-rust/testing/util/test.o @mkdir -p obj/dbg/test - $(CXX) -o $@ obj/dbg/re2/testing/$*.o $(DTESTOFILES) obj/dbg/re2/testing/util/test.o obj/dbg/libre2.a target/release/libcapi.a $(RE2_LDFLAGS) $(LDFLAGS) + $(CXX) -o $@ obj/dbg/re2-rust/testing/$*.o $(DTESTOFILES) obj/dbg/re2-rust/testing/util/test.o obj/dbg/libre2-rust.a target/release/libcapi.a $(RE2_LDFLAGS) $(LDFLAGS) .PRECIOUS: obj/test/% -obj/test/%: obj/libre2.a obj/re2/testing/%.o $(TESTOFILES) obj/re2/testing/util/test.o +obj/test/%: obj/libre2-rust.a obj/re2-rust/testing/%.o $(TESTOFILES) obj/re2-rust/testing/util/test.o @mkdir -p obj/test - $(CXX) -o $@ obj/re2/testing/$*.o $(TESTOFILES) obj/re2/testing/util/test.o obj/libre2.a target/release/libcapi.a $(RE2_LDFLAGS) $(LDFLAGS) + $(CXX) -o $@ obj/re2-rust/testing/$*.o $(TESTOFILES) obj/re2-rust/testing/util/test.o obj/libre2-rust.a target/release/libcapi.a $(RE2_LDFLAGS) $(LDFLAGS) # Test the shared lib, falling back to the static lib for private symbols .PRECIOUS: obj/so/test/% -obj/so/test/%: obj/so/libre2.$(SOEXT) obj/libre2.a obj/re2/testing/%.o $(TESTOFILES) obj/re2/testing/util/test.o +obj/so/test/%: obj/so/libre2-rust.$(SOEXT) obj/libre2-rust.a obj/re2-rust/testing/%.o $(TESTOFILES) obj/re2-rust/testing/util/test.o @mkdir -p obj/so/test - $(CXX) -o $@ obj/re2/testing/$*.o $(TESTOFILES) obj/re2/testing/util/test.o -Lobj/so -lre2 obj/libre2.a target/release/libcapi.a $(RE2_LDFLAGS) $(LDFLAGS) + $(CXX) -o $@ obj/re2-rust/testing/$*.o $(TESTOFILES) obj/re2-rust/testing/util/test.o -Lobj/so -lre2-rust obj/libre2-rust.a target/release/libcapi.a $(RE2_LDFLAGS) $(LDFLAGS) # Filter out dump.o because testing::TempDir() isn't available for it. -obj/test/regexp_benchmark: obj/libre2.a obj/re2/testing/regexp_benchmark.o $(TESTOFILES) obj/re2/testing/util/benchmark.o +obj/test/regexp_benchmark: obj/libre2-rust.a obj/re2-rust/testing/regexp_benchmark.o $(TESTOFILES) obj/re2-rust/testing/util/benchmark.o @mkdir -p obj/test - $(CXX) -o $@ obj/re2/testing/regexp_benchmark.o $(filter-out obj/re2/testing/dump.o, $(TESTOFILES)) obj/re2/testing/util/benchmark.o obj/libre2.a target/release/libcapi.a $(RE2_LDFLAGS) $(LDFLAGS) + $(CXX) -o $@ obj/re2-rust/testing/regexp_benchmark.o $(filter-out obj/re2-rust/testing/dump.o, $(TESTOFILES)) obj/re2-rust/testing/util/benchmark.o obj/libre2-rust.a target/release/libcapi.a $(RE2_LDFLAGS) $(LDFLAGS) ifdef REBUILD_TABLES -.PRECIOUS: re2/perl_groups.cc -re2/perl_groups.cc: re2/make_perl_groups.pl +.PRECIOUS: re2-rust/perl_groups.cc +re2-rust/perl_groups.cc: re2-rust/make_perl_groups.pl perl $< > $@ -.PRECIOUS: re2/unicode_%.cc -re2/unicode_%.cc: re2/make_unicode_%.py re2/unicode.py +.PRECIOUS: re2-rust/unicode_%.cc +re2-rust/unicode_%.cc: re2-rust/make_unicode_%.py re2-rust/unicode.py python3 $< > $@ endif .PHONY: distclean distclean: clean - rm -f re2/perl_groups.cc re2/unicode_casefold.cc re2/unicode_groups.cc + rm -f re2-rust/perl_groups.cc re2-rust/unicode_casefold.cc re2-rust/unicode_groups.cc .PHONY: clean clean: rm -rf obj target - rm -f re2/*.pyc testinstall + rm -f re2-rust/*.pyc testinstall .PHONY: testofiles testofiles: $(TESTOFILES) @@ -236,28 +236,28 @@ benchmark: obj/test/regexp_benchmark install: static-install shared-install .PHONY: static -static: obj/libre2.a +static: obj/libre2-rust.a .PHONY: static-install -static-install: obj/libre2.a common-install +static-install: obj/libre2-rust.a common-install $(INSTALL) target/release/libcapi.a $(DESTDIR)$(libdir)/libcapi.a - $(INSTALL) obj/libre2.a $(DESTDIR)$(libdir)/libre2.a + $(INSTALL) obj/libre2-rust.a $(DESTDIR)$(libdir)/libre2-rust.a .PHONY: shared -shared: obj/so/libre2.$(SOEXT) +shared: obj/so/libre2-rust.$(SOEXT) .PHONY: shared-install -shared-install: obj/so/libre2.$(SOEXT) common-install - $(INSTALL) obj/so/libre2.$(SOEXT) $(DESTDIR)$(libdir)/libre2.$(SOEXTVER00) - ln -sf libre2.$(SOEXTVER00) $(DESTDIR)$(libdir)/libre2.$(SOEXTVER) - ln -sf libre2.$(SOEXTVER00) $(DESTDIR)$(libdir)/libre2.$(SOEXT) +shared-install: obj/so/libre2-rust.$(SOEXT) common-install + $(INSTALL) obj/so/libre2-rust.$(SOEXT) $(DESTDIR)$(libdir)/libre2-rust.$(SOEXTVER00) + ln -sf libre2-rust.$(SOEXTVER00) $(DESTDIR)$(libdir)/libre2-rust.$(SOEXTVER) + ln -sf libre2-rust.$(SOEXTVER00) $(DESTDIR)$(libdir)/libre2-rust.$(SOEXT) -@ldconfig .PHONY: common-install common-install: - @mkdir -p $(DESTDIR)$(includedir)/re2 $(DESTDIR)$(libdir)/pkgconfig - $(INSTALL_DATA) $(INSTALL_HFILES) $(DESTDIR)$(includedir)/re2 + @mkdir -p $(DESTDIR)$(includedir)/re2-rust $(DESTDIR)$(libdir)/pkgconfig + $(INSTALL_DATA) $(INSTALL_HFILES) $(DESTDIR)$(includedir)/re2-rust .PHONY: testinstall testinstall: static-testinstall shared-testinstall @@ -267,14 +267,14 @@ testinstall: static-testinstall shared-testinstall .PHONY: static-testinstall static-testinstall: CXXFLAGS:=-std=c++11 -pthread -I$(DESTDIR)$(includedir) $(CXXFLAGS) -static-testinstall: LDFLAGS:=-pthread -L$(DESTDIR)$(libdir) -l:libre2.a $(LDICU) $(LDFLAGS) +static-testinstall: LDFLAGS:=-pthread -L$(DESTDIR)$(libdir) -l:libre2-rust.a $(LDICU) $(LDFLAGS) static-testinstall: @mkdir -p obj @cp testinstall.cc obj ifeq ($(shell uname),Darwin) - @echo Skipping test for libre2.a on Darwin. + @echo Skipping test for libre2-rust.a on Darwin. else ifeq ($(shell uname),SunOS) - @echo Skipping test for libre2.a on SunOS. + @echo Skipping test for libre2-rust.a on SunOS. else (cd obj && $(CXX) testinstall.cc -o testinstall $(CXXFLAGS) $(LDFLAGS)) obj/testinstall @@ -282,7 +282,7 @@ endif .PHONY: shared-testinstall shared-testinstall: CXXFLAGS:=-std=c++11 -pthread -I$(DESTDIR)$(includedir) $(CXXFLAGS) -shared-testinstall: LDFLAGS:=-pthread -L$(DESTDIR)$(libdir) -lre2 $(LDICU) +shared-testinstall: LDFLAGS:=-pthread -L$(DESTDIR)$(libdir) -lre2-rust $(LDICU) shared-testinstall: @mkdir -p obj @cp testinstall.cc obj diff --git a/libre2.symbols b/libre2.symbols index 93b71b4..7e30524 100644 --- a/libre2.symbols +++ b/libre2.symbols @@ -1,17 +1,17 @@ { global: - # re2::RE2* + # re2-rust::RE2* _ZN3re23RE2*; _ZNK3re23RE2*; - # re2::StringPiece* + # re2-rust::StringPiece* _ZN3re211StringPiece*; _ZNK3re211StringPiece*; - # re2::operator<<* + # re2-rust::operator<<* _ZN3re2ls*; - # re2::FilteredRE2* + # re2-rust::FilteredRE2* _ZN3re211FilteredRE2*; _ZNK3re211FilteredRE2*; - # re2::re2_internal* + # re2-rust::re2_internal* _ZN3re212re2_internal*; _ZNK3re212re2_internal*; local: diff --git a/libre2.symbols.darwin b/libre2.symbols.darwin index 41ac96f..5996476 100644 --- a/libre2.symbols.darwin +++ b/libre2.symbols.darwin @@ -1,15 +1,15 @@ # Linker doesn't like these unmangled: -# re2::RE2* +# re2-rust::RE2* __ZN3re23RE2* __ZNK3re23RE2* -# re2::StringPiece* +# re2-rust::StringPiece* __ZN3re211StringPiece* __ZNK3re211StringPiece* -# re2::operator<<* +# re2-rust::operator<<* __ZN3re2ls* -# re2::FilteredRE2* +# re2-rust::FilteredRE2* __ZN3re211FilteredRE2* __ZNK3re211FilteredRE2* -# re2::re2_internal* +# re2-rust::re2_internal* __ZN3re212re2_internal* __ZNK3re212re2_internal* diff --git a/re2/filtered_re2.cc b/re2/filtered_re2.cc index 1e1cac5..661f3a5 100644 --- a/re2/filtered_re2.cc +++ b/re2/filtered_re2.cc @@ -19,9 +19,9 @@ #include <string> #include <utility> -#include "re2/testing/util/util.h" -#include "re2/testing/util/logging.h" -#include "re2/filtered_re2.h" +#include "re2-rust/testing/util/util.h" +#include "re2-rust/testing/util/logging.h" +#include "re2-rust/filtered_re2.h" extern "C" { #include "regex-capi/include/regex_capi.h" diff --git a/re2/filtered_re2.h b/re2/filtered_re2.h index ea5c89f..e6c8c5e 100644 --- a/re2/filtered_re2.h +++ b/re2/filtered_re2.h @@ -24,7 +24,7 @@ #include <string> #include <vector> -#include "re2/re2.h" +#include "re2-rust/re2.h" namespace re2 { diff --git a/re2/re2.cc b/re2/re2.cc index ef4c5d7..2d8366a 100644 --- a/re2/re2.cc +++ b/re2/re2.cc @@ -31,9 +31,9 @@ #include <utility> #include <vector> -#include "re2/testing/util/util.h" -#include "re2/testing/util/logging.h" -#include "re2/re2.h" +#include "re2-rust/testing/util/util.h" +#include "re2-rust/testing/util/logging.h" +#include "re2-rust/re2.h" #include "regex_internal.h" using namespace std; diff --git a/re2/re2.h b/re2/re2.h index 1550dc9..f854a92 100644 --- a/re2/re2.h +++ b/re2/re2.h @@ -214,7 +214,7 @@ #include <TargetConditionals.h> #endif -#include "re2/stringpiece.h" +#include "re2-rust/stringpiece.h" namespace re2 { class Prog; @@ -1011,4 +1011,4 @@ DECLARE_HOOK(DFASearchFailure) } // namespace re2 using re2::RE2; -using re2::LazyRE2; \ No newline at end of file +using re2::LazyRE2; diff --git a/re2/set.cc b/re2/set.cc index e764718..362f2b9 100644 --- a/re2/set.cc +++ b/re2/set.cc @@ -22,11 +22,11 @@ #include <utility> #include <map> -#include "re2/testing/util/util.h" -#include "re2/testing/util/logging.h" -#include "re2/re2.h" -#include "re2/set.h" -#include "re2/stringpiece.h" +#include "re2-rust/testing/util/util.h" +#include "re2-rust/testing/util/logging.h" +#include "re2-rust/re2.h" +#include "re2-rust/set.h" +#include "re2-rust/stringpiece.h" #include "regex_internal.h" #include "regex-capi/include/regex_capi.h" diff --git a/re2/set.h b/re2/set.h index 5d6ec91..c986d5f 100644 --- a/re2/set.h +++ b/re2/set.h @@ -9,7 +9,7 @@ #include <utility> #include <vector> -#include "re2/re2.h" +#include "re2-rust/re2.h" namespace re2 { class Prog; @@ -79,4 +79,4 @@ class RE2::Set { std::unique_ptr<re2::Prog> prog_; }; -} // namespace re2 \ No newline at end of file +} // namespace re2 diff --git a/re2/stringpiece.cc b/re2/stringpiece.cc index 5f22946..e391bc9 100644 --- a/re2/stringpiece.cc +++ b/re2/stringpiece.cc @@ -4,8 +4,8 @@ #include <ostream> -#include "re2/stringpiece.h" -#include "re2/testing/util/util.h" +#include "re2-rust/stringpiece.h" +#include "re2-rust/testing/util/util.h" namespace re2 { diff --git a/re2/testing/filtered_re2_test.cc b/re2/testing/filtered_re2_test.cc index f459413..418b3de 100644 --- a/re2/testing/filtered_re2_test.cc +++ b/re2/testing/filtered_re2_test.cc @@ -9,10 +9,10 @@ #include <vector> #include <utility> -#include "re2/testing/util/test.h" -#include "re2/testing/util/logging.h" -#include "re2/filtered_re2.h" -#include "re2/re2.h" +#include "re2-rust/testing/util/test.h" +#include "re2-rust/testing/util/logging.h" +#include "re2-rust/filtered_re2.h" +#include "re2-rust/re2.h" namespace re2 { diff --git a/re2/testing/re2_arg_test.cc b/re2/testing/re2_arg_test.cc index a5d2b82..8b4676c 100644 --- a/re2/testing/re2_arg_test.cc +++ b/re2/testing/re2_arg_test.cc @@ -10,9 +10,9 @@ #include <stdint.h> #include <string.h> -#include "re2/testing/util/test.h" -#include "re2/testing/util/logging.h" -#include "re2/re2.h" +#include "re2-rust/testing/util/test.h" +#include "re2-rust/testing/util/logging.h" +#include "re2-rust/re2.h" namespace re2 { diff --git a/re2/testing/re2_test.cc b/re2/testing/re2_test.cc index 5d22f95..c67c7ff 100644 --- a/re2/testing/re2_test.cc +++ b/re2/testing/re2_test.cc @@ -18,10 +18,10 @@ #include <unistd.h> /* for sysconf */ #endif -#include "re2/testing/util/test.h" -#include "re2/testing/util/logging.h" -#include "re2/testing/util/strutil.h" -#include "re2/re2.h" +#include "re2-rust/testing/util/test.h" +#include "re2-rust/testing/util/logging.h" +#include "re2-rust/testing/util/strutil.h" +#include "re2-rust/re2.h" namespace re2 { diff --git a/re2/testing/regexp_benchmark.cc b/re2/testing/regexp_benchmark.cc index 90c7202..ceecda3 100644 --- a/re2/testing/regexp_benchmark.cc +++ b/re2/testing/regexp_benchmark.cc @@ -16,11 +16,11 @@ #include <fstream> #include <sstream> -#include "re2/testing/util/benchmark.h" -#include "re2/testing/util/test.h" -#include "re2/testing/util/logging.h" -#include "re2/re2.h" -#include "re2/set.h" +#include "re2-rust/testing/util/benchmark.h" +#include "re2-rust/testing/util/test.h" +#include "re2-rust/testing/util/logging.h" +#include "re2-rust/re2.h" +#include "re2-rust/set.h" extern "C" { diff --git a/re2/testing/set_test.cc b/re2/testing/set_test.cc index d19b657..c0a0af0 100644 --- a/re2/testing/set_test.cc +++ b/re2/testing/set_test.cc @@ -7,10 +7,10 @@ #include <vector> #include <utility> -#include "re2/testing/util/test.h" -#include "re2/testing/util/logging.h" -#include "re2/re2.h" -#include "re2/set.h" +#include "re2-rust/testing/util/test.h" +#include "re2-rust/testing/util/logging.h" +#include "re2-rust/re2.h" +#include "re2-rust/set.h" namespace re2 { diff --git a/re2/testing/util/benchmark.cc b/re2/testing/util/benchmark.cc index d3398b5..ee68e76 100644 --- a/re2/testing/util/benchmark.cc +++ b/re2/testing/util/benchmark.cc @@ -8,8 +8,8 @@ #include <algorithm> #include <chrono> -#include "re2/testing/util/benchmark.h" -#include "re2/re2.h" +#include "re2-rust/testing/util/benchmark.h" +#include "re2-rust/re2.h" #ifdef _WIN32 #define snprintf _snprintf diff --git a/re2/testing/util/benchmark.h b/re2/testing/util/benchmark.h index a45269a..a8360d9 100644 --- a/re2/testing/util/benchmark.h +++ b/re2/testing/util/benchmark.h @@ -7,8 +7,8 @@ #include <stdint.h> #include <functional> -#include "re2/testing/util/logging.h" -#include "re2/testing/util/util.h" +#include "re2-rust/testing/util/logging.h" +#include "re2-rust/testing/util/util.h" // Globals for the old benchmark API. void StartBenchmarkTiming(); diff --git a/re2/testing/util/logging.h b/re2/testing/util/logging.h index 7a6dfca..403e65f 100644 --- a/re2/testing/util/logging.h +++ b/re2/testing/util/logging.h @@ -12,7 +12,7 @@ #include <ostream> #include <sstream> -#include "re2/testing/util/util.h" +#include "re2-rust/testing/util/util.h" // Debug-only checking. #define DCHECK(condition) assert(condition) @@ -103,4 +103,4 @@ class LogMessageFatal : public LogMessage { #ifdef _MSC_VER #pragma warning(pop) -#endif \ No newline at end of file +#endif diff --git a/re2/testing/util/strutil.cc b/re2/testing/util/strutil.cc index 7b86cf2..d9df067 100644 --- a/re2/testing/util/strutil.cc +++ b/re2/testing/util/strutil.cc @@ -5,7 +5,7 @@ #include <stdarg.h> #include <stdio.h> -#include "re2/testing/util/strutil.h" +#include "re2-rust/testing/util/strutil.h" #ifdef _WIN32 #define snprintf _snprintf diff --git a/re2/testing/util/strutil.h b/re2/testing/util/strutil.h index 8917808..d9431e9 100644 --- a/re2/testing/util/strutil.h +++ b/re2/testing/util/strutil.h @@ -6,8 +6,8 @@ #include <string> -#include "re2/stringpiece.h" -#include "re2/testing/util/util.h" +#include "re2-rust/stringpiece.h" +#include "re2-rust/testing/util/util.h" namespace re2 { @@ -15,4 +15,4 @@ std::string CEscape(const StringPiece& src); void PrefixSuccessor(std::string* prefix); std::string StringPrintf(const char* format, ...); -} // namespace re2 \ No newline at end of file +} // namespace re2 diff --git a/re2/testing/util/test.cc b/re2/testing/util/test.cc index a7e0d2f..ed4c263 100644 --- a/re2/testing/util/test.cc +++ b/re2/testing/util/test.cc @@ -5,7 +5,7 @@ #include <stdio.h> #include <string> -#include "re2/testing/util/test.h" +#include "re2-rust/testing/util/test.h" namespace testing { std::string TempDir() { return "/tmp/"; } diff --git a/re2/testing/util/test.h b/re2/testing/util/test.h index cd72e41..1676120 100644 --- a/re2/testing/util/test.h +++ b/re2/testing/util/test.h @@ -4,8 +4,8 @@ #pragma once -#include "re2/testing/util/util.h" -#include "re2/testing/util/logging.h" +#include "re2-rust/testing/util/util.h" +#include "re2-rust/testing/util/logging.h" namespace testing { std::string TempDir(); -- 2.33.0
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.
浙ICP备2022010568号-2