From 08402cd780711eca62d9b442f7256338b3901bfc Mon Sep 17 00:00:00 2001 From: Sergey Yedrikov Date: Sat, 18 Nov 2023 20:11:32 -0500 Subject: [PATCH] Build the release-5.6 branch with Rust 1.71.1 to match the downstream --- Cargo.lock | 2 -- Cargo.toml | 1 + Dockerfile | 4 ++-- Dockerfile.unit | 4 ++-- lib/datadog/search-syntax/src/grammar.rs | 4 ++-- lib/vector-common/src/event_test_util.rs | 2 ++ lib/vrl/stdlib/src/ip_aton.rs | 2 +- {vendor => patch}/onig_sys/.cargo-checksum.json | 0 {vendor => patch}/onig_sys/Cargo.toml | 0 {vendor => patch}/onig_sys/LICENSE.md | 0 {vendor => patch}/onig_sys/build.rs | 0 {vendor => patch}/onig_sys/oniguruma/AUTHORS | 0 {vendor => patch}/onig_sys/oniguruma/CMakeLists.txt | 0 {vendor => patch}/onig_sys/oniguruma/COPYING | 0 {vendor => patch}/onig_sys/oniguruma/ChangeLog | 0 {vendor => patch}/onig_sys/oniguruma/HISTORY | 0 {vendor => patch}/onig_sys/oniguruma/INSTALL | 0 {vendor => patch}/onig_sys/oniguruma/Makefile.am | 0 {vendor => patch}/onig_sys/oniguruma/NEWS | 0 {vendor => patch}/onig_sys/oniguruma/README | 0 {vendor => patch}/onig_sys/oniguruma/README.md | 0 {vendor => patch}/onig_sys/oniguruma/README_japanese | 0 {vendor => patch}/onig_sys/oniguruma/autogen.sh | 0 {vendor => patch}/onig_sys/oniguruma/cmake/Config.cmake.in | 0 {vendor => patch}/onig_sys/oniguruma/compile | 0 {vendor => patch}/onig_sys/oniguruma/config.guess | 0 {vendor => patch}/onig_sys/oniguruma/config.sub | 0 {vendor => patch}/onig_sys/oniguruma/configure.ac | 0 {vendor => patch}/onig_sys/oniguruma/depcomp | 0 {vendor => patch}/onig_sys/oniguruma/doc/API | 0 {vendor => patch}/onig_sys/oniguruma/doc/API.ja | 0 {vendor => patch}/onig_sys/oniguruma/doc/CALLOUTS.API | 0 {vendor => patch}/onig_sys/oniguruma/doc/CALLOUTS.API.ja | 0 {vendor => patch}/onig_sys/oniguruma/doc/CALLOUTS.BUILTIN | 0 {vendor => patch}/onig_sys/oniguruma/doc/CALLOUTS.BUILTIN.ja | 0 {vendor => patch}/onig_sys/oniguruma/doc/FAQ | 0 {vendor => patch}/onig_sys/oniguruma/doc/FAQ.ja | 0 {vendor => patch}/onig_sys/oniguruma/doc/RE | 0 {vendor => patch}/onig_sys/oniguruma/doc/RE.ja | 0 {vendor => patch}/onig_sys/oniguruma/doc/SYNTAX.md | 0 {vendor => patch}/onig_sys/oniguruma/doc/UNICODE_PROPERTIES | 0 .../onig_sys/oniguruma/harnesses/ascii_compatible.dict | 0 {vendor => patch}/onig_sys/oniguruma/harnesses/base.c | 0 {vendor => patch}/onig_sys/oniguruma/harnesses/deluxe.c | 0 {vendor => patch}/onig_sys/oniguruma/harnesses/dict_conv.py | 0 {vendor => patch}/onig_sys/oniguruma/harnesses/fuzzer.options | 0 .../onig_sys/oniguruma/harnesses/libfuzzer-onig.cpp | 0 {vendor => patch}/onig_sys/oniguruma/harnesses/makefile | 0 {vendor => patch}/onig_sys/oniguruma/harnesses/regset.c | 0 {vendor => patch}/onig_sys/oniguruma/index.html | 0 {vendor => patch}/onig_sys/oniguruma/index_ja.html | 0 {vendor => patch}/onig_sys/oniguruma/install-sh | 0 {vendor => patch}/onig_sys/oniguruma/make_win.bat | 0 {vendor => patch}/onig_sys/oniguruma/make_win32.bat | 0 {vendor => patch}/onig_sys/oniguruma/make_win64.bat | 0 {vendor => patch}/onig_sys/oniguruma/missing | 0 {vendor => patch}/onig_sys/oniguruma/onig-config.in | 0 {vendor => patch}/onig_sys/oniguruma/oniguruma.pc.cmake.in | 0 {vendor => patch}/onig_sys/oniguruma/oniguruma.pc.in | 0 {vendor => patch}/onig_sys/oniguruma/sample/CMakeLists.txt | 0 {vendor => patch}/onig_sys/oniguruma/sample/Makefile.am | 0 {vendor => patch}/onig_sys/oniguruma/sample/bug_fix.c | 0 .../onig_sys/oniguruma/sample/callback_each_match.c | 0 {vendor => patch}/onig_sys/oniguruma/sample/callout.c | 0 {vendor => patch}/onig_sys/oniguruma/sample/count.c | 0 {vendor => patch}/onig_sys/oniguruma/sample/crnl.c | 0 {vendor => patch}/onig_sys/oniguruma/sample/echo.c | 0 {vendor => patch}/onig_sys/oniguruma/sample/encode.c | 0 {vendor => patch}/onig_sys/oniguruma/sample/listcap.c | 0 {vendor => patch}/onig_sys/oniguruma/sample/names.c | 0 {vendor => patch}/onig_sys/oniguruma/sample/posix.c | 0 {vendor => patch}/onig_sys/oniguruma/sample/regset.c | 0 {vendor => patch}/onig_sys/oniguruma/sample/scan.c | 0 {vendor => patch}/onig_sys/oniguruma/sample/simple.c | 0 {vendor => patch}/onig_sys/oniguruma/sample/sql.c | 0 {vendor => patch}/onig_sys/oniguruma/sample/syntax.c | 0 {vendor => patch}/onig_sys/oniguruma/sample/user_property.c | 0 {vendor => patch}/onig_sys/oniguruma/src/Makefile.am | 0 {vendor => patch}/onig_sys/oniguruma/src/Makefile.windows | 0 {vendor => patch}/onig_sys/oniguruma/src/ascii.c | 0 {vendor => patch}/onig_sys/oniguruma/src/big5.c | 0 {vendor => patch}/onig_sys/oniguruma/src/config.h.cmake.in | 0 {vendor => patch}/onig_sys/oniguruma/src/config.h.win32 | 0 {vendor => patch}/onig_sys/oniguruma/src/config.h.win64 | 0 {vendor => patch}/onig_sys/oniguruma/src/config.h.windows.in | 0 {vendor => patch}/onig_sys/oniguruma/src/cp1251.c | 0 {vendor => patch}/onig_sys/oniguruma/src/euc_jp.c | 0 {vendor => patch}/onig_sys/oniguruma/src/euc_jp_prop.c | 0 {vendor => patch}/onig_sys/oniguruma/src/euc_jp_prop.gperf | 0 {vendor => patch}/onig_sys/oniguruma/src/euc_kr.c | 0 {vendor => patch}/onig_sys/oniguruma/src/euc_tw.c | 0 {vendor => patch}/onig_sys/oniguruma/src/gb18030.c | 0 .../onig_sys/oniguruma/src/gperf_fold_key_conv.py | 0 .../onig_sys/oniguruma/src/gperf_unfold_key_conv.py | 0 {vendor => patch}/onig_sys/oniguruma/src/iso8859_1.c | 0 {vendor => patch}/onig_sys/oniguruma/src/iso8859_10.c | 0 {vendor => patch}/onig_sys/oniguruma/src/iso8859_11.c | 0 {vendor => patch}/onig_sys/oniguruma/src/iso8859_13.c | 0 {vendor => patch}/onig_sys/oniguruma/src/iso8859_14.c | 0 {vendor => patch}/onig_sys/oniguruma/src/iso8859_15.c | 0 {vendor => patch}/onig_sys/oniguruma/src/iso8859_16.c | 0 {vendor => patch}/onig_sys/oniguruma/src/iso8859_2.c | 0 {vendor => patch}/onig_sys/oniguruma/src/iso8859_3.c | 0 {vendor => patch}/onig_sys/oniguruma/src/iso8859_4.c | 0 {vendor => patch}/onig_sys/oniguruma/src/iso8859_5.c | 0 {vendor => patch}/onig_sys/oniguruma/src/iso8859_6.c | 0 {vendor => patch}/onig_sys/oniguruma/src/iso8859_7.c | 0 {vendor => patch}/onig_sys/oniguruma/src/iso8859_8.c | 0 {vendor => patch}/onig_sys/oniguruma/src/iso8859_9.c | 0 {vendor => patch}/onig_sys/oniguruma/src/koi8.c | 0 {vendor => patch}/onig_sys/oniguruma/src/koi8_r.c | 0 {vendor => patch}/onig_sys/oniguruma/src/make_property.sh | 0 {vendor => patch}/onig_sys/oniguruma/src/make_unicode_egcb.sh | 0 .../onig_sys/oniguruma/src/make_unicode_egcb_data.py | 0 {vendor => patch}/onig_sys/oniguruma/src/make_unicode_fold.sh | 0 .../onig_sys/oniguruma/src/make_unicode_fold_data.py | 0 .../onig_sys/oniguruma/src/make_unicode_property.sh | 0 .../onig_sys/oniguruma/src/make_unicode_property_data.py | 0 {vendor => patch}/onig_sys/oniguruma/src/make_unicode_wb.sh | 0 .../onig_sys/oniguruma/src/make_unicode_wb_data.py | 0 {vendor => patch}/onig_sys/oniguruma/src/mktable.c | 0 {vendor => patch}/onig_sys/oniguruma/src/onig_init.c | 0 {vendor => patch}/onig_sys/oniguruma/src/oniggnu.h | 0 {vendor => patch}/onig_sys/oniguruma/src/onigposix.h | 0 {vendor => patch}/onig_sys/oniguruma/src/oniguruma.h | 2 +- {vendor => patch}/onig_sys/oniguruma/src/regcomp.c | 0 {vendor => patch}/onig_sys/oniguruma/src/regenc.c | 0 {vendor => patch}/onig_sys/oniguruma/src/regenc.h | 0 {vendor => patch}/onig_sys/oniguruma/src/regerror.c | 0 {vendor => patch}/onig_sys/oniguruma/src/regexec.c | 0 {vendor => patch}/onig_sys/oniguruma/src/regext.c | 0 {vendor => patch}/onig_sys/oniguruma/src/reggnu.c | 0 {vendor => patch}/onig_sys/oniguruma/src/regint.h | 0 {vendor => patch}/onig_sys/oniguruma/src/regparse.c | 0 {vendor => patch}/onig_sys/oniguruma/src/regparse.h | 0 {vendor => patch}/onig_sys/oniguruma/src/regposerr.c | 0 {vendor => patch}/onig_sys/oniguruma/src/regposix.c | 0 {vendor => patch}/onig_sys/oniguruma/src/regsyntax.c | 0 {vendor => patch}/onig_sys/oniguruma/src/regtrav.c | 0 {vendor => patch}/onig_sys/oniguruma/src/regversion.c | 0 {vendor => patch}/onig_sys/oniguruma/src/sjis.c | 0 {vendor => patch}/onig_sys/oniguruma/src/sjis_prop.c | 0 {vendor => patch}/onig_sys/oniguruma/src/sjis_prop.gperf | 0 {vendor => patch}/onig_sys/oniguruma/src/st.c | 0 {vendor => patch}/onig_sys/oniguruma/src/st.h | 0 {vendor => patch}/onig_sys/oniguruma/src/unicode.c | 0 {vendor => patch}/onig_sys/oniguruma/src/unicode_egcb_data.c | 0 {vendor => patch}/onig_sys/oniguruma/src/unicode_fold1_key.c | 0 {vendor => patch}/onig_sys/oniguruma/src/unicode_fold2_key.c | 0 {vendor => patch}/onig_sys/oniguruma/src/unicode_fold3_key.c | 0 {vendor => patch}/onig_sys/oniguruma/src/unicode_fold_data.c | 0 .../onig_sys/oniguruma/src/unicode_property_data.c | 0 .../onig_sys/oniguruma/src/unicode_property_data_posix.c | 0 {vendor => patch}/onig_sys/oniguruma/src/unicode_unfold_key.c | 0 {vendor => patch}/onig_sys/oniguruma/src/unicode_wb_data.c | 0 {vendor => patch}/onig_sys/oniguruma/src/utf16_be.c | 0 {vendor => patch}/onig_sys/oniguruma/src/utf16_le.c | 0 {vendor => patch}/onig_sys/oniguruma/src/utf32_be.c | 0 {vendor => patch}/onig_sys/oniguruma/src/utf32_le.c | 0 {vendor => patch}/onig_sys/oniguruma/src/utf8.c | 0 {vendor => patch}/onig_sys/oniguruma/test-driver | 0 {vendor => patch}/onig_sys/oniguruma/test/Makefile.am | 0 {vendor => patch}/onig_sys/oniguruma/test/test_back.c | 0 {vendor => patch}/onig_sys/oniguruma/test/test_options.c | 0 {vendor => patch}/onig_sys/oniguruma/test/test_regset.c | 0 {vendor => patch}/onig_sys/oniguruma/test/test_syntax.c | 0 {vendor => patch}/onig_sys/oniguruma/test/test_utf8.c | 0 {vendor => patch}/onig_sys/oniguruma/test/testc.c | 0 {vendor => patch}/onig_sys/oniguruma/test/testp.c | 0 {vendor => patch}/onig_sys/oniguruma/test/testu.c | 0 {vendor => patch}/onig_sys/oniguruma/tis-ci/config.h | 0 {vendor => patch}/onig_sys/oniguruma/tis-ci/stub.c | 0 {vendor => patch}/onig_sys/oniguruma/tis-ci/test_back.config | 0 .../onig_sys/oniguruma/tis-ci/test_regset.config | 0 .../onig_sys/oniguruma/tis-ci/test_syntax.config | 0 {vendor => patch}/onig_sys/oniguruma/tis-ci/test_utf8.config | 0 {vendor => patch}/onig_sys/oniguruma/tis-ci/testc.config | 0 {vendor => patch}/onig_sys/oniguruma/tis-ci/testu.config | 0 {vendor => patch}/onig_sys/oniguruma/tis.config | 0 {vendor => patch}/onig_sys/oniguruma/windows/testc.c | 0 {vendor => patch}/onig_sys/src/bindgened.rs | 0 {vendor => patch}/onig_sys/src/ffi.rs | 0 {vendor => patch}/onig_sys/src/lib.rs | 0 rust-toolchain.toml | 2 +- src/tls/incoming.rs | 4 ++-- src/tls/settings.rs | 1 + 186 files changed, 15 insertions(+), 13 deletions(-) rename {vendor => patch}/onig_sys/.cargo-checksum.json (100%) rename {vendor => patch}/onig_sys/Cargo.toml (100%) rename {vendor => patch}/onig_sys/LICENSE.md (100%) rename {vendor => patch}/onig_sys/build.rs (100%) rename {vendor => patch}/onig_sys/oniguruma/AUTHORS (100%) rename {vendor => patch}/onig_sys/oniguruma/CMakeLists.txt (100%) rename {vendor => patch}/onig_sys/oniguruma/COPYING (100%) rename {vendor => patch}/onig_sys/oniguruma/ChangeLog (100%) rename {vendor => patch}/onig_sys/oniguruma/HISTORY (100%) rename {vendor => patch}/onig_sys/oniguruma/INSTALL (100%) rename {vendor => patch}/onig_sys/oniguruma/Makefile.am (100%) rename {vendor => patch}/onig_sys/oniguruma/NEWS (100%) rename {vendor => patch}/onig_sys/oniguruma/README (100%) rename {vendor => patch}/onig_sys/oniguruma/README.md (100%) rename {vendor => patch}/onig_sys/oniguruma/README_japanese (100%) rename {vendor => patch}/onig_sys/oniguruma/autogen.sh (100%) rename {vendor => patch}/onig_sys/oniguruma/cmake/Config.cmake.in (100%) rename {vendor => patch}/onig_sys/oniguruma/compile (100%) rename {vendor => patch}/onig_sys/oniguruma/config.guess (100%) rename {vendor => patch}/onig_sys/oniguruma/config.sub (100%) rename {vendor => patch}/onig_sys/oniguruma/configure.ac (100%) rename {vendor => patch}/onig_sys/oniguruma/depcomp (100%) rename {vendor => patch}/onig_sys/oniguruma/doc/API (100%) rename {vendor => patch}/onig_sys/oniguruma/doc/API.ja (100%) rename {vendor => patch}/onig_sys/oniguruma/doc/CALLOUTS.API (100%) rename {vendor => patch}/onig_sys/oniguruma/doc/CALLOUTS.API.ja (100%) rename {vendor => patch}/onig_sys/oniguruma/doc/CALLOUTS.BUILTIN (100%) rename {vendor => patch}/onig_sys/oniguruma/doc/CALLOUTS.BUILTIN.ja (100%) rename {vendor => patch}/onig_sys/oniguruma/doc/FAQ (100%) rename {vendor => patch}/onig_sys/oniguruma/doc/FAQ.ja (100%) rename {vendor => patch}/onig_sys/oniguruma/doc/RE (100%) rename {vendor => patch}/onig_sys/oniguruma/doc/RE.ja (100%) rename {vendor => patch}/onig_sys/oniguruma/doc/SYNTAX.md (100%) rename {vendor => patch}/onig_sys/oniguruma/doc/UNICODE_PROPERTIES (100%) rename {vendor => patch}/onig_sys/oniguruma/harnesses/ascii_compatible.dict (100%) rename {vendor => patch}/onig_sys/oniguruma/harnesses/base.c (100%) rename {vendor => patch}/onig_sys/oniguruma/harnesses/deluxe.c (100%) rename {vendor => patch}/onig_sys/oniguruma/harnesses/dict_conv.py (100%) rename {vendor => patch}/onig_sys/oniguruma/harnesses/fuzzer.options (100%) rename {vendor => patch}/onig_sys/oniguruma/harnesses/libfuzzer-onig.cpp (100%) rename {vendor => patch}/onig_sys/oniguruma/harnesses/makefile (100%) rename {vendor => patch}/onig_sys/oniguruma/harnesses/regset.c (100%) rename {vendor => patch}/onig_sys/oniguruma/index.html (100%) rename {vendor => patch}/onig_sys/oniguruma/index_ja.html (100%) rename {vendor => patch}/onig_sys/oniguruma/install-sh (100%) rename {vendor => patch}/onig_sys/oniguruma/make_win.bat (100%) rename {vendor => patch}/onig_sys/oniguruma/make_win32.bat (100%) rename {vendor => patch}/onig_sys/oniguruma/make_win64.bat (100%) rename {vendor => patch}/onig_sys/oniguruma/missing (100%) rename {vendor => patch}/onig_sys/oniguruma/onig-config.in (100%) rename {vendor => patch}/onig_sys/oniguruma/oniguruma.pc.cmake.in (100%) rename {vendor => patch}/onig_sys/oniguruma/oniguruma.pc.in (100%) rename {vendor => patch}/onig_sys/oniguruma/sample/CMakeLists.txt (100%) rename {vendor => patch}/onig_sys/oniguruma/sample/Makefile.am (100%) rename {vendor => patch}/onig_sys/oniguruma/sample/bug_fix.c (100%) rename {vendor => patch}/onig_sys/oniguruma/sample/callback_each_match.c (100%) rename {vendor => patch}/onig_sys/oniguruma/sample/callout.c (100%) rename {vendor => patch}/onig_sys/oniguruma/sample/count.c (100%) rename {vendor => patch}/onig_sys/oniguruma/sample/crnl.c (100%) rename {vendor => patch}/onig_sys/oniguruma/sample/echo.c (100%) rename {vendor => patch}/onig_sys/oniguruma/sample/encode.c (100%) rename {vendor => patch}/onig_sys/oniguruma/sample/listcap.c (100%) rename {vendor => patch}/onig_sys/oniguruma/sample/names.c (100%) rename {vendor => patch}/onig_sys/oniguruma/sample/posix.c (100%) rename {vendor => patch}/onig_sys/oniguruma/sample/regset.c (100%) rename {vendor => patch}/onig_sys/oniguruma/sample/scan.c (100%) rename {vendor => patch}/onig_sys/oniguruma/sample/simple.c (100%) rename {vendor => patch}/onig_sys/oniguruma/sample/sql.c (100%) rename {vendor => patch}/onig_sys/oniguruma/sample/syntax.c (100%) rename {vendor => patch}/onig_sys/oniguruma/sample/user_property.c (100%) rename {vendor => patch}/onig_sys/oniguruma/src/Makefile.am (100%) rename {vendor => patch}/onig_sys/oniguruma/src/Makefile.windows (100%) rename {vendor => patch}/onig_sys/oniguruma/src/ascii.c (100%) rename {vendor => patch}/onig_sys/oniguruma/src/big5.c (100%) rename {vendor => patch}/onig_sys/oniguruma/src/config.h.cmake.in (100%) rename {vendor => patch}/onig_sys/oniguruma/src/config.h.win32 (100%) rename {vendor => patch}/onig_sys/oniguruma/src/config.h.win64 (100%) rename {vendor => patch}/onig_sys/oniguruma/src/config.h.windows.in (100%) rename {vendor => patch}/onig_sys/oniguruma/src/cp1251.c (100%) rename {vendor => patch}/onig_sys/oniguruma/src/euc_jp.c (100%) rename {vendor => patch}/onig_sys/oniguruma/src/euc_jp_prop.c (100%) rename {vendor => patch}/onig_sys/oniguruma/src/euc_jp_prop.gperf (100%) rename {vendor => patch}/onig_sys/oniguruma/src/euc_kr.c (100%) rename {vendor => patch}/onig_sys/oniguruma/src/euc_tw.c (100%) rename {vendor => patch}/onig_sys/oniguruma/src/gb18030.c (100%) rename {vendor => patch}/onig_sys/oniguruma/src/gperf_fold_key_conv.py (100%) rename {vendor => patch}/onig_sys/oniguruma/src/gperf_unfold_key_conv.py (100%) rename {vendor => patch}/onig_sys/oniguruma/src/iso8859_1.c (100%) rename {vendor => patch}/onig_sys/oniguruma/src/iso8859_10.c (100%) rename {vendor => patch}/onig_sys/oniguruma/src/iso8859_11.c (100%) rename {vendor => patch}/onig_sys/oniguruma/src/iso8859_13.c (100%) rename {vendor => patch}/onig_sys/oniguruma/src/iso8859_14.c (100%) rename {vendor => patch}/onig_sys/oniguruma/src/iso8859_15.c (100%) rename {vendor => patch}/onig_sys/oniguruma/src/iso8859_16.c (100%) rename {vendor => patch}/onig_sys/oniguruma/src/iso8859_2.c (100%) rename {vendor => patch}/onig_sys/oniguruma/src/iso8859_3.c (100%) rename {vendor => patch}/onig_sys/oniguruma/src/iso8859_4.c (100%) rename {vendor => patch}/onig_sys/oniguruma/src/iso8859_5.c (100%) rename {vendor => patch}/onig_sys/oniguruma/src/iso8859_6.c (100%) rename {vendor => patch}/onig_sys/oniguruma/src/iso8859_7.c (100%) rename {vendor => patch}/onig_sys/oniguruma/src/iso8859_8.c (100%) rename {vendor => patch}/onig_sys/oniguruma/src/iso8859_9.c (100%) rename {vendor => patch}/onig_sys/oniguruma/src/koi8.c (100%) rename {vendor => patch}/onig_sys/oniguruma/src/koi8_r.c (100%) rename {vendor => patch}/onig_sys/oniguruma/src/make_property.sh (100%) rename {vendor => patch}/onig_sys/oniguruma/src/make_unicode_egcb.sh (100%) rename {vendor => patch}/onig_sys/oniguruma/src/make_unicode_egcb_data.py (100%) rename {vendor => patch}/onig_sys/oniguruma/src/make_unicode_fold.sh (100%) rename {vendor => patch}/onig_sys/oniguruma/src/make_unicode_fold_data.py (100%) rename {vendor => patch}/onig_sys/oniguruma/src/make_unicode_property.sh (100%) rename {vendor => patch}/onig_sys/oniguruma/src/make_unicode_property_data.py (100%) rename {vendor => patch}/onig_sys/oniguruma/src/make_unicode_wb.sh (100%) rename {vendor => patch}/onig_sys/oniguruma/src/make_unicode_wb_data.py (100%) rename {vendor => patch}/onig_sys/oniguruma/src/mktable.c (100%) rename {vendor => patch}/onig_sys/oniguruma/src/onig_init.c (100%) rename {vendor => patch}/onig_sys/oniguruma/src/oniggnu.h (100%) rename {vendor => patch}/onig_sys/oniguruma/src/onigposix.h (100%) rename {vendor => patch}/onig_sys/oniguruma/src/oniguruma.h (99%) rename {vendor => patch}/onig_sys/oniguruma/src/regcomp.c (100%) rename {vendor => patch}/onig_sys/oniguruma/src/regenc.c (100%) rename {vendor => patch}/onig_sys/oniguruma/src/regenc.h (100%) rename {vendor => patch}/onig_sys/oniguruma/src/regerror.c (100%) rename {vendor => patch}/onig_sys/oniguruma/src/regexec.c (100%) rename {vendor => patch}/onig_sys/oniguruma/src/regext.c (100%) rename {vendor => patch}/onig_sys/oniguruma/src/reggnu.c (100%) rename {vendor => patch}/onig_sys/oniguruma/src/regint.h (100%) rename {vendor => patch}/onig_sys/oniguruma/src/regparse.c (100%) rename {vendor => patch}/onig_sys/oniguruma/src/regparse.h (100%) rename {vendor => patch}/onig_sys/oniguruma/src/regposerr.c (100%) rename {vendor => patch}/onig_sys/oniguruma/src/regposix.c (100%) rename {vendor => patch}/onig_sys/oniguruma/src/regsyntax.c (100%) rename {vendor => patch}/onig_sys/oniguruma/src/regtrav.c (100%) rename {vendor => patch}/onig_sys/oniguruma/src/regversion.c (100%) rename {vendor => patch}/onig_sys/oniguruma/src/sjis.c (100%) rename {vendor => patch}/onig_sys/oniguruma/src/sjis_prop.c (100%) rename {vendor => patch}/onig_sys/oniguruma/src/sjis_prop.gperf (100%) rename {vendor => patch}/onig_sys/oniguruma/src/st.c (100%) rename {vendor => patch}/onig_sys/oniguruma/src/st.h (100%) rename {vendor => patch}/onig_sys/oniguruma/src/unicode.c (100%) rename {vendor => patch}/onig_sys/oniguruma/src/unicode_egcb_data.c (100%) rename {vendor => patch}/onig_sys/oniguruma/src/unicode_fold1_key.c (100%) rename {vendor => patch}/onig_sys/oniguruma/src/unicode_fold2_key.c (100%) rename {vendor => patch}/onig_sys/oniguruma/src/unicode_fold3_key.c (100%) rename {vendor => patch}/onig_sys/oniguruma/src/unicode_fold_data.c (100%) rename {vendor => patch}/onig_sys/oniguruma/src/unicode_property_data.c (100%) rename {vendor => patch}/onig_sys/oniguruma/src/unicode_property_data_posix.c (100%) rename {vendor => patch}/onig_sys/oniguruma/src/unicode_unfold_key.c (100%) rename {vendor => patch}/onig_sys/oniguruma/src/unicode_wb_data.c (100%) rename {vendor => patch}/onig_sys/oniguruma/src/utf16_be.c (100%) rename {vendor => patch}/onig_sys/oniguruma/src/utf16_le.c (100%) rename {vendor => patch}/onig_sys/oniguruma/src/utf32_be.c (100%) rename {vendor => patch}/onig_sys/oniguruma/src/utf32_le.c (100%) rename {vendor => patch}/onig_sys/oniguruma/src/utf8.c (100%) rename {vendor => patch}/onig_sys/oniguruma/test-driver (100%) rename {vendor => patch}/onig_sys/oniguruma/test/Makefile.am (100%) rename {vendor => patch}/onig_sys/oniguruma/test/test_back.c (100%) rename {vendor => patch}/onig_sys/oniguruma/test/test_options.c (100%) rename {vendor => patch}/onig_sys/oniguruma/test/test_regset.c (100%) rename {vendor => patch}/onig_sys/oniguruma/test/test_syntax.c (100%) rename {vendor => patch}/onig_sys/oniguruma/test/test_utf8.c (100%) rename {vendor => patch}/onig_sys/oniguruma/test/testc.c (100%) rename {vendor => patch}/onig_sys/oniguruma/test/testp.c (100%) rename {vendor => patch}/onig_sys/oniguruma/test/testu.c (100%) rename {vendor => patch}/onig_sys/oniguruma/tis-ci/config.h (100%) rename {vendor => patch}/onig_sys/oniguruma/tis-ci/stub.c (100%) rename {vendor => patch}/onig_sys/oniguruma/tis-ci/test_back.config (100%) rename {vendor => patch}/onig_sys/oniguruma/tis-ci/test_regset.config (100%) rename {vendor => patch}/onig_sys/oniguruma/tis-ci/test_syntax.config (100%) rename {vendor => patch}/onig_sys/oniguruma/tis-ci/test_utf8.config (100%) rename {vendor => patch}/onig_sys/oniguruma/tis-ci/testc.config (100%) rename {vendor => patch}/onig_sys/oniguruma/tis-ci/testu.config (100%) rename {vendor => patch}/onig_sys/oniguruma/tis.config (100%) rename {vendor => patch}/onig_sys/oniguruma/windows/testc.c (100%) rename {vendor => patch}/onig_sys/src/bindgened.rs (100%) rename {vendor => patch}/onig_sys/src/ffi.rs (100%) rename {vendor => patch}/onig_sys/src/lib.rs (100%) diff --git a/Cargo.lock b/Cargo.lock index 10cb3769cb2ad..16da01e5b9d9d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5053,8 +5053,6 @@ dependencies = [ [[package]] name = "onig_sys" version = "69.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dd3eee045c84695b53b20255bb7317063df090b68e18bfac0abb6c39cf7f33e" dependencies = [ "bindgen", "cc", diff --git a/Cargo.toml b/Cargo.toml index 5d5c19452beee..1e7a269a1e118 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -337,6 +337,7 @@ chrono = { git = "https://github.com/vectordotdev/chrono.git", branch = "no-defa aws-config = { path = "patch/aws-config" } aws-sigv4 = { path = "patch/aws-sigv4" } hyper-openssl = { path = "patch/hyper-openssl" } +onig_sys = { path = "patch/onig_sys" } [features] ocp-logging = [ diff --git a/Dockerfile b/Dockerfile index 2e134cc2d8812..3f77ad85722c1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.redhat.io/ubi8:8.6-754 as builder +FROM registry.redhat.io/ubi8:latest as builder RUN INSTALL_PKGS=" \ rust-toolset \ @@ -26,7 +26,7 @@ COPY . /src RUN PROTOC=/src/thirdparty/protoc/protoc-linux-$(arch) make build -FROM registry.redhat.io/ubi8:8.6-754 +FROM registry.redhat.io/ubi8:latest COPY --from=builder /src/target/release/vector /usr/bin WORKDIR /usr/bin diff --git a/Dockerfile.unit b/Dockerfile.unit index f790a735fde6d..0720a7bcd85d8 100644 --- a/Dockerfile.unit +++ b/Dockerfile.unit @@ -1,4 +1,4 @@ -FROM registry.redhat.io/ubi8:6-754 as builder +FROM registry.redhat.io/ubi8:latest as builder RUN INSTALL_PKGS=" \ cmake \ @@ -18,7 +18,7 @@ RUN INSTALL_PKGS=" \ yum clean all ENV HOME=/root -RUN curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain 1.58.1 -y +RUN curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain 1.71.1 -y ENV CARGO_HOME=$HOME/.cargo ENV PATH=$CARGO_HOME/bin:$PATH diff --git a/lib/datadog/search-syntax/src/grammar.rs b/lib/datadog/search-syntax/src/grammar.rs index 2ca34c1cffdb3..c08a1c4d2f7bf 100644 --- a/lib/datadog/search-syntax/src/grammar.rs +++ b/lib/datadog/search-syntax/src/grammar.rs @@ -44,7 +44,7 @@ impl QueryVisitor { // If our conjunction is AND and the previous clause was // just a SHOULD, we make the previous clause a MUST and // our new clause will also be a MUST - let mut lastitem = clauses.last_mut().unwrap(); + let lastitem = clauses.last_mut().unwrap(); if let LuceneOccur::Should = lastitem.occur { lastitem.occur = LuceneOccur::Must; }; @@ -53,7 +53,7 @@ impl QueryVisitor { // If our conjunction is OR and the previous clause was // a MUST, we make the previous clause a SHOULD and our // new clause will also be a SHOULD - let mut lastitem = clauses.last_mut().unwrap(); + let lastitem = clauses.last_mut().unwrap(); if let LuceneOccur::Must = lastitem.occur { lastitem.occur = LuceneOccur::Should; }; diff --git a/lib/vector-common/src/event_test_util.rs b/lib/vector-common/src/event_test_util.rs index 4bf1099d89ba1..9c99a3f33a9fb 100644 --- a/lib/vector-common/src/event_test_util.rs +++ b/lib/vector-common/src/event_test_util.rs @@ -35,5 +35,7 @@ pub fn record_internal_event(event: &str) { // Remove trailing '{fields…}' let event = event.strip_prefix('&').unwrap_or(event); let event = event.find('{').map_or(event, |par| &event[..par]); + let event = event.trim(); + EVENTS_RECORDED.with(|er| er.borrow_mut().insert(event.into())); } diff --git a/lib/vrl/stdlib/src/ip_aton.rs b/lib/vrl/stdlib/src/ip_aton.rs index c5b034ce83ea5..2e9ccb2259b3d 100644 --- a/lib/vrl/stdlib/src/ip_aton.rs +++ b/lib/vrl/stdlib/src/ip_aton.rs @@ -76,7 +76,7 @@ mod tests { invalid { args: func_args![value: "i am not an ipaddress"], - want: Err("unable to parse IPv4 address: invalid IP address syntax"), + want: Err("unable to parse IPv4 address: invalid IPv4 address syntax"), tdef: TypeDef::integer().fallible(), } diff --git a/vendor/onig_sys/.cargo-checksum.json b/patch/onig_sys/.cargo-checksum.json similarity index 100% rename from vendor/onig_sys/.cargo-checksum.json rename to patch/onig_sys/.cargo-checksum.json diff --git a/vendor/onig_sys/Cargo.toml b/patch/onig_sys/Cargo.toml similarity index 100% rename from vendor/onig_sys/Cargo.toml rename to patch/onig_sys/Cargo.toml diff --git a/vendor/onig_sys/LICENSE.md b/patch/onig_sys/LICENSE.md similarity index 100% rename from vendor/onig_sys/LICENSE.md rename to patch/onig_sys/LICENSE.md diff --git a/vendor/onig_sys/build.rs b/patch/onig_sys/build.rs similarity index 100% rename from vendor/onig_sys/build.rs rename to patch/onig_sys/build.rs diff --git a/vendor/onig_sys/oniguruma/AUTHORS b/patch/onig_sys/oniguruma/AUTHORS similarity index 100% rename from vendor/onig_sys/oniguruma/AUTHORS rename to patch/onig_sys/oniguruma/AUTHORS diff --git a/vendor/onig_sys/oniguruma/CMakeLists.txt b/patch/onig_sys/oniguruma/CMakeLists.txt similarity index 100% rename from vendor/onig_sys/oniguruma/CMakeLists.txt rename to patch/onig_sys/oniguruma/CMakeLists.txt diff --git a/vendor/onig_sys/oniguruma/COPYING b/patch/onig_sys/oniguruma/COPYING similarity index 100% rename from vendor/onig_sys/oniguruma/COPYING rename to patch/onig_sys/oniguruma/COPYING diff --git a/vendor/onig_sys/oniguruma/ChangeLog b/patch/onig_sys/oniguruma/ChangeLog similarity index 100% rename from vendor/onig_sys/oniguruma/ChangeLog rename to patch/onig_sys/oniguruma/ChangeLog diff --git a/vendor/onig_sys/oniguruma/HISTORY b/patch/onig_sys/oniguruma/HISTORY similarity index 100% rename from vendor/onig_sys/oniguruma/HISTORY rename to patch/onig_sys/oniguruma/HISTORY diff --git a/vendor/onig_sys/oniguruma/INSTALL b/patch/onig_sys/oniguruma/INSTALL similarity index 100% rename from vendor/onig_sys/oniguruma/INSTALL rename to patch/onig_sys/oniguruma/INSTALL diff --git a/vendor/onig_sys/oniguruma/Makefile.am b/patch/onig_sys/oniguruma/Makefile.am similarity index 100% rename from vendor/onig_sys/oniguruma/Makefile.am rename to patch/onig_sys/oniguruma/Makefile.am diff --git a/vendor/onig_sys/oniguruma/NEWS b/patch/onig_sys/oniguruma/NEWS similarity index 100% rename from vendor/onig_sys/oniguruma/NEWS rename to patch/onig_sys/oniguruma/NEWS diff --git a/vendor/onig_sys/oniguruma/README b/patch/onig_sys/oniguruma/README similarity index 100% rename from vendor/onig_sys/oniguruma/README rename to patch/onig_sys/oniguruma/README diff --git a/vendor/onig_sys/oniguruma/README.md b/patch/onig_sys/oniguruma/README.md similarity index 100% rename from vendor/onig_sys/oniguruma/README.md rename to patch/onig_sys/oniguruma/README.md diff --git a/vendor/onig_sys/oniguruma/README_japanese b/patch/onig_sys/oniguruma/README_japanese similarity index 100% rename from vendor/onig_sys/oniguruma/README_japanese rename to patch/onig_sys/oniguruma/README_japanese diff --git a/vendor/onig_sys/oniguruma/autogen.sh b/patch/onig_sys/oniguruma/autogen.sh similarity index 100% rename from vendor/onig_sys/oniguruma/autogen.sh rename to patch/onig_sys/oniguruma/autogen.sh diff --git a/vendor/onig_sys/oniguruma/cmake/Config.cmake.in b/patch/onig_sys/oniguruma/cmake/Config.cmake.in similarity index 100% rename from vendor/onig_sys/oniguruma/cmake/Config.cmake.in rename to patch/onig_sys/oniguruma/cmake/Config.cmake.in diff --git a/vendor/onig_sys/oniguruma/compile b/patch/onig_sys/oniguruma/compile similarity index 100% rename from vendor/onig_sys/oniguruma/compile rename to patch/onig_sys/oniguruma/compile diff --git a/vendor/onig_sys/oniguruma/config.guess b/patch/onig_sys/oniguruma/config.guess similarity index 100% rename from vendor/onig_sys/oniguruma/config.guess rename to patch/onig_sys/oniguruma/config.guess diff --git a/vendor/onig_sys/oniguruma/config.sub b/patch/onig_sys/oniguruma/config.sub similarity index 100% rename from vendor/onig_sys/oniguruma/config.sub rename to patch/onig_sys/oniguruma/config.sub diff --git a/vendor/onig_sys/oniguruma/configure.ac b/patch/onig_sys/oniguruma/configure.ac similarity index 100% rename from vendor/onig_sys/oniguruma/configure.ac rename to patch/onig_sys/oniguruma/configure.ac diff --git a/vendor/onig_sys/oniguruma/depcomp b/patch/onig_sys/oniguruma/depcomp similarity index 100% rename from vendor/onig_sys/oniguruma/depcomp rename to patch/onig_sys/oniguruma/depcomp diff --git a/vendor/onig_sys/oniguruma/doc/API b/patch/onig_sys/oniguruma/doc/API similarity index 100% rename from vendor/onig_sys/oniguruma/doc/API rename to patch/onig_sys/oniguruma/doc/API diff --git a/vendor/onig_sys/oniguruma/doc/API.ja b/patch/onig_sys/oniguruma/doc/API.ja similarity index 100% rename from vendor/onig_sys/oniguruma/doc/API.ja rename to patch/onig_sys/oniguruma/doc/API.ja diff --git a/vendor/onig_sys/oniguruma/doc/CALLOUTS.API b/patch/onig_sys/oniguruma/doc/CALLOUTS.API similarity index 100% rename from vendor/onig_sys/oniguruma/doc/CALLOUTS.API rename to patch/onig_sys/oniguruma/doc/CALLOUTS.API diff --git a/vendor/onig_sys/oniguruma/doc/CALLOUTS.API.ja b/patch/onig_sys/oniguruma/doc/CALLOUTS.API.ja similarity index 100% rename from vendor/onig_sys/oniguruma/doc/CALLOUTS.API.ja rename to patch/onig_sys/oniguruma/doc/CALLOUTS.API.ja diff --git a/vendor/onig_sys/oniguruma/doc/CALLOUTS.BUILTIN b/patch/onig_sys/oniguruma/doc/CALLOUTS.BUILTIN similarity index 100% rename from vendor/onig_sys/oniguruma/doc/CALLOUTS.BUILTIN rename to patch/onig_sys/oniguruma/doc/CALLOUTS.BUILTIN diff --git a/vendor/onig_sys/oniguruma/doc/CALLOUTS.BUILTIN.ja b/patch/onig_sys/oniguruma/doc/CALLOUTS.BUILTIN.ja similarity index 100% rename from vendor/onig_sys/oniguruma/doc/CALLOUTS.BUILTIN.ja rename to patch/onig_sys/oniguruma/doc/CALLOUTS.BUILTIN.ja diff --git a/vendor/onig_sys/oniguruma/doc/FAQ b/patch/onig_sys/oniguruma/doc/FAQ similarity index 100% rename from vendor/onig_sys/oniguruma/doc/FAQ rename to patch/onig_sys/oniguruma/doc/FAQ diff --git a/vendor/onig_sys/oniguruma/doc/FAQ.ja b/patch/onig_sys/oniguruma/doc/FAQ.ja similarity index 100% rename from vendor/onig_sys/oniguruma/doc/FAQ.ja rename to patch/onig_sys/oniguruma/doc/FAQ.ja diff --git a/vendor/onig_sys/oniguruma/doc/RE b/patch/onig_sys/oniguruma/doc/RE similarity index 100% rename from vendor/onig_sys/oniguruma/doc/RE rename to patch/onig_sys/oniguruma/doc/RE diff --git a/vendor/onig_sys/oniguruma/doc/RE.ja b/patch/onig_sys/oniguruma/doc/RE.ja similarity index 100% rename from vendor/onig_sys/oniguruma/doc/RE.ja rename to patch/onig_sys/oniguruma/doc/RE.ja diff --git a/vendor/onig_sys/oniguruma/doc/SYNTAX.md b/patch/onig_sys/oniguruma/doc/SYNTAX.md similarity index 100% rename from vendor/onig_sys/oniguruma/doc/SYNTAX.md rename to patch/onig_sys/oniguruma/doc/SYNTAX.md diff --git a/vendor/onig_sys/oniguruma/doc/UNICODE_PROPERTIES b/patch/onig_sys/oniguruma/doc/UNICODE_PROPERTIES similarity index 100% rename from vendor/onig_sys/oniguruma/doc/UNICODE_PROPERTIES rename to patch/onig_sys/oniguruma/doc/UNICODE_PROPERTIES diff --git a/vendor/onig_sys/oniguruma/harnesses/ascii_compatible.dict b/patch/onig_sys/oniguruma/harnesses/ascii_compatible.dict similarity index 100% rename from vendor/onig_sys/oniguruma/harnesses/ascii_compatible.dict rename to patch/onig_sys/oniguruma/harnesses/ascii_compatible.dict diff --git a/vendor/onig_sys/oniguruma/harnesses/base.c b/patch/onig_sys/oniguruma/harnesses/base.c similarity index 100% rename from vendor/onig_sys/oniguruma/harnesses/base.c rename to patch/onig_sys/oniguruma/harnesses/base.c diff --git a/vendor/onig_sys/oniguruma/harnesses/deluxe.c b/patch/onig_sys/oniguruma/harnesses/deluxe.c similarity index 100% rename from vendor/onig_sys/oniguruma/harnesses/deluxe.c rename to patch/onig_sys/oniguruma/harnesses/deluxe.c diff --git a/vendor/onig_sys/oniguruma/harnesses/dict_conv.py b/patch/onig_sys/oniguruma/harnesses/dict_conv.py similarity index 100% rename from vendor/onig_sys/oniguruma/harnesses/dict_conv.py rename to patch/onig_sys/oniguruma/harnesses/dict_conv.py diff --git a/vendor/onig_sys/oniguruma/harnesses/fuzzer.options b/patch/onig_sys/oniguruma/harnesses/fuzzer.options similarity index 100% rename from vendor/onig_sys/oniguruma/harnesses/fuzzer.options rename to patch/onig_sys/oniguruma/harnesses/fuzzer.options diff --git a/vendor/onig_sys/oniguruma/harnesses/libfuzzer-onig.cpp b/patch/onig_sys/oniguruma/harnesses/libfuzzer-onig.cpp similarity index 100% rename from vendor/onig_sys/oniguruma/harnesses/libfuzzer-onig.cpp rename to patch/onig_sys/oniguruma/harnesses/libfuzzer-onig.cpp diff --git a/vendor/onig_sys/oniguruma/harnesses/makefile b/patch/onig_sys/oniguruma/harnesses/makefile similarity index 100% rename from vendor/onig_sys/oniguruma/harnesses/makefile rename to patch/onig_sys/oniguruma/harnesses/makefile diff --git a/vendor/onig_sys/oniguruma/harnesses/regset.c b/patch/onig_sys/oniguruma/harnesses/regset.c similarity index 100% rename from vendor/onig_sys/oniguruma/harnesses/regset.c rename to patch/onig_sys/oniguruma/harnesses/regset.c diff --git a/vendor/onig_sys/oniguruma/index.html b/patch/onig_sys/oniguruma/index.html similarity index 100% rename from vendor/onig_sys/oniguruma/index.html rename to patch/onig_sys/oniguruma/index.html diff --git a/vendor/onig_sys/oniguruma/index_ja.html b/patch/onig_sys/oniguruma/index_ja.html similarity index 100% rename from vendor/onig_sys/oniguruma/index_ja.html rename to patch/onig_sys/oniguruma/index_ja.html diff --git a/vendor/onig_sys/oniguruma/install-sh b/patch/onig_sys/oniguruma/install-sh similarity index 100% rename from vendor/onig_sys/oniguruma/install-sh rename to patch/onig_sys/oniguruma/install-sh diff --git a/vendor/onig_sys/oniguruma/make_win.bat b/patch/onig_sys/oniguruma/make_win.bat similarity index 100% rename from vendor/onig_sys/oniguruma/make_win.bat rename to patch/onig_sys/oniguruma/make_win.bat diff --git a/vendor/onig_sys/oniguruma/make_win32.bat b/patch/onig_sys/oniguruma/make_win32.bat similarity index 100% rename from vendor/onig_sys/oniguruma/make_win32.bat rename to patch/onig_sys/oniguruma/make_win32.bat diff --git a/vendor/onig_sys/oniguruma/make_win64.bat b/patch/onig_sys/oniguruma/make_win64.bat similarity index 100% rename from vendor/onig_sys/oniguruma/make_win64.bat rename to patch/onig_sys/oniguruma/make_win64.bat diff --git a/vendor/onig_sys/oniguruma/missing b/patch/onig_sys/oniguruma/missing similarity index 100% rename from vendor/onig_sys/oniguruma/missing rename to patch/onig_sys/oniguruma/missing diff --git a/vendor/onig_sys/oniguruma/onig-config.in b/patch/onig_sys/oniguruma/onig-config.in similarity index 100% rename from vendor/onig_sys/oniguruma/onig-config.in rename to patch/onig_sys/oniguruma/onig-config.in diff --git a/vendor/onig_sys/oniguruma/oniguruma.pc.cmake.in b/patch/onig_sys/oniguruma/oniguruma.pc.cmake.in similarity index 100% rename from vendor/onig_sys/oniguruma/oniguruma.pc.cmake.in rename to patch/onig_sys/oniguruma/oniguruma.pc.cmake.in diff --git a/vendor/onig_sys/oniguruma/oniguruma.pc.in b/patch/onig_sys/oniguruma/oniguruma.pc.in similarity index 100% rename from vendor/onig_sys/oniguruma/oniguruma.pc.in rename to patch/onig_sys/oniguruma/oniguruma.pc.in diff --git a/vendor/onig_sys/oniguruma/sample/CMakeLists.txt b/patch/onig_sys/oniguruma/sample/CMakeLists.txt similarity index 100% rename from vendor/onig_sys/oniguruma/sample/CMakeLists.txt rename to patch/onig_sys/oniguruma/sample/CMakeLists.txt diff --git a/vendor/onig_sys/oniguruma/sample/Makefile.am b/patch/onig_sys/oniguruma/sample/Makefile.am similarity index 100% rename from vendor/onig_sys/oniguruma/sample/Makefile.am rename to patch/onig_sys/oniguruma/sample/Makefile.am diff --git a/vendor/onig_sys/oniguruma/sample/bug_fix.c b/patch/onig_sys/oniguruma/sample/bug_fix.c similarity index 100% rename from vendor/onig_sys/oniguruma/sample/bug_fix.c rename to patch/onig_sys/oniguruma/sample/bug_fix.c diff --git a/vendor/onig_sys/oniguruma/sample/callback_each_match.c b/patch/onig_sys/oniguruma/sample/callback_each_match.c similarity index 100% rename from vendor/onig_sys/oniguruma/sample/callback_each_match.c rename to patch/onig_sys/oniguruma/sample/callback_each_match.c diff --git a/vendor/onig_sys/oniguruma/sample/callout.c b/patch/onig_sys/oniguruma/sample/callout.c similarity index 100% rename from vendor/onig_sys/oniguruma/sample/callout.c rename to patch/onig_sys/oniguruma/sample/callout.c diff --git a/vendor/onig_sys/oniguruma/sample/count.c b/patch/onig_sys/oniguruma/sample/count.c similarity index 100% rename from vendor/onig_sys/oniguruma/sample/count.c rename to patch/onig_sys/oniguruma/sample/count.c diff --git a/vendor/onig_sys/oniguruma/sample/crnl.c b/patch/onig_sys/oniguruma/sample/crnl.c similarity index 100% rename from vendor/onig_sys/oniguruma/sample/crnl.c rename to patch/onig_sys/oniguruma/sample/crnl.c diff --git a/vendor/onig_sys/oniguruma/sample/echo.c b/patch/onig_sys/oniguruma/sample/echo.c similarity index 100% rename from vendor/onig_sys/oniguruma/sample/echo.c rename to patch/onig_sys/oniguruma/sample/echo.c diff --git a/vendor/onig_sys/oniguruma/sample/encode.c b/patch/onig_sys/oniguruma/sample/encode.c similarity index 100% rename from vendor/onig_sys/oniguruma/sample/encode.c rename to patch/onig_sys/oniguruma/sample/encode.c diff --git a/vendor/onig_sys/oniguruma/sample/listcap.c b/patch/onig_sys/oniguruma/sample/listcap.c similarity index 100% rename from vendor/onig_sys/oniguruma/sample/listcap.c rename to patch/onig_sys/oniguruma/sample/listcap.c diff --git a/vendor/onig_sys/oniguruma/sample/names.c b/patch/onig_sys/oniguruma/sample/names.c similarity index 100% rename from vendor/onig_sys/oniguruma/sample/names.c rename to patch/onig_sys/oniguruma/sample/names.c diff --git a/vendor/onig_sys/oniguruma/sample/posix.c b/patch/onig_sys/oniguruma/sample/posix.c similarity index 100% rename from vendor/onig_sys/oniguruma/sample/posix.c rename to patch/onig_sys/oniguruma/sample/posix.c diff --git a/vendor/onig_sys/oniguruma/sample/regset.c b/patch/onig_sys/oniguruma/sample/regset.c similarity index 100% rename from vendor/onig_sys/oniguruma/sample/regset.c rename to patch/onig_sys/oniguruma/sample/regset.c diff --git a/vendor/onig_sys/oniguruma/sample/scan.c b/patch/onig_sys/oniguruma/sample/scan.c similarity index 100% rename from vendor/onig_sys/oniguruma/sample/scan.c rename to patch/onig_sys/oniguruma/sample/scan.c diff --git a/vendor/onig_sys/oniguruma/sample/simple.c b/patch/onig_sys/oniguruma/sample/simple.c similarity index 100% rename from vendor/onig_sys/oniguruma/sample/simple.c rename to patch/onig_sys/oniguruma/sample/simple.c diff --git a/vendor/onig_sys/oniguruma/sample/sql.c b/patch/onig_sys/oniguruma/sample/sql.c similarity index 100% rename from vendor/onig_sys/oniguruma/sample/sql.c rename to patch/onig_sys/oniguruma/sample/sql.c diff --git a/vendor/onig_sys/oniguruma/sample/syntax.c b/patch/onig_sys/oniguruma/sample/syntax.c similarity index 100% rename from vendor/onig_sys/oniguruma/sample/syntax.c rename to patch/onig_sys/oniguruma/sample/syntax.c diff --git a/vendor/onig_sys/oniguruma/sample/user_property.c b/patch/onig_sys/oniguruma/sample/user_property.c similarity index 100% rename from vendor/onig_sys/oniguruma/sample/user_property.c rename to patch/onig_sys/oniguruma/sample/user_property.c diff --git a/vendor/onig_sys/oniguruma/src/Makefile.am b/patch/onig_sys/oniguruma/src/Makefile.am similarity index 100% rename from vendor/onig_sys/oniguruma/src/Makefile.am rename to patch/onig_sys/oniguruma/src/Makefile.am diff --git a/vendor/onig_sys/oniguruma/src/Makefile.windows b/patch/onig_sys/oniguruma/src/Makefile.windows similarity index 100% rename from vendor/onig_sys/oniguruma/src/Makefile.windows rename to patch/onig_sys/oniguruma/src/Makefile.windows diff --git a/vendor/onig_sys/oniguruma/src/ascii.c b/patch/onig_sys/oniguruma/src/ascii.c similarity index 100% rename from vendor/onig_sys/oniguruma/src/ascii.c rename to patch/onig_sys/oniguruma/src/ascii.c diff --git a/vendor/onig_sys/oniguruma/src/big5.c b/patch/onig_sys/oniguruma/src/big5.c similarity index 100% rename from vendor/onig_sys/oniguruma/src/big5.c rename to patch/onig_sys/oniguruma/src/big5.c diff --git a/vendor/onig_sys/oniguruma/src/config.h.cmake.in b/patch/onig_sys/oniguruma/src/config.h.cmake.in similarity index 100% rename from vendor/onig_sys/oniguruma/src/config.h.cmake.in rename to patch/onig_sys/oniguruma/src/config.h.cmake.in diff --git a/vendor/onig_sys/oniguruma/src/config.h.win32 b/patch/onig_sys/oniguruma/src/config.h.win32 similarity index 100% rename from vendor/onig_sys/oniguruma/src/config.h.win32 rename to patch/onig_sys/oniguruma/src/config.h.win32 diff --git a/vendor/onig_sys/oniguruma/src/config.h.win64 b/patch/onig_sys/oniguruma/src/config.h.win64 similarity index 100% rename from vendor/onig_sys/oniguruma/src/config.h.win64 rename to patch/onig_sys/oniguruma/src/config.h.win64 diff --git a/vendor/onig_sys/oniguruma/src/config.h.windows.in b/patch/onig_sys/oniguruma/src/config.h.windows.in similarity index 100% rename from vendor/onig_sys/oniguruma/src/config.h.windows.in rename to patch/onig_sys/oniguruma/src/config.h.windows.in diff --git a/vendor/onig_sys/oniguruma/src/cp1251.c b/patch/onig_sys/oniguruma/src/cp1251.c similarity index 100% rename from vendor/onig_sys/oniguruma/src/cp1251.c rename to patch/onig_sys/oniguruma/src/cp1251.c diff --git a/vendor/onig_sys/oniguruma/src/euc_jp.c b/patch/onig_sys/oniguruma/src/euc_jp.c similarity index 100% rename from vendor/onig_sys/oniguruma/src/euc_jp.c rename to patch/onig_sys/oniguruma/src/euc_jp.c diff --git a/vendor/onig_sys/oniguruma/src/euc_jp_prop.c b/patch/onig_sys/oniguruma/src/euc_jp_prop.c similarity index 100% rename from vendor/onig_sys/oniguruma/src/euc_jp_prop.c rename to patch/onig_sys/oniguruma/src/euc_jp_prop.c diff --git a/vendor/onig_sys/oniguruma/src/euc_jp_prop.gperf b/patch/onig_sys/oniguruma/src/euc_jp_prop.gperf similarity index 100% rename from vendor/onig_sys/oniguruma/src/euc_jp_prop.gperf rename to patch/onig_sys/oniguruma/src/euc_jp_prop.gperf diff --git a/vendor/onig_sys/oniguruma/src/euc_kr.c b/patch/onig_sys/oniguruma/src/euc_kr.c similarity index 100% rename from vendor/onig_sys/oniguruma/src/euc_kr.c rename to patch/onig_sys/oniguruma/src/euc_kr.c diff --git a/vendor/onig_sys/oniguruma/src/euc_tw.c b/patch/onig_sys/oniguruma/src/euc_tw.c similarity index 100% rename from vendor/onig_sys/oniguruma/src/euc_tw.c rename to patch/onig_sys/oniguruma/src/euc_tw.c diff --git a/vendor/onig_sys/oniguruma/src/gb18030.c b/patch/onig_sys/oniguruma/src/gb18030.c similarity index 100% rename from vendor/onig_sys/oniguruma/src/gb18030.c rename to patch/onig_sys/oniguruma/src/gb18030.c diff --git a/vendor/onig_sys/oniguruma/src/gperf_fold_key_conv.py b/patch/onig_sys/oniguruma/src/gperf_fold_key_conv.py similarity index 100% rename from vendor/onig_sys/oniguruma/src/gperf_fold_key_conv.py rename to patch/onig_sys/oniguruma/src/gperf_fold_key_conv.py diff --git a/vendor/onig_sys/oniguruma/src/gperf_unfold_key_conv.py b/patch/onig_sys/oniguruma/src/gperf_unfold_key_conv.py similarity index 100% rename from vendor/onig_sys/oniguruma/src/gperf_unfold_key_conv.py rename to patch/onig_sys/oniguruma/src/gperf_unfold_key_conv.py diff --git a/vendor/onig_sys/oniguruma/src/iso8859_1.c b/patch/onig_sys/oniguruma/src/iso8859_1.c similarity index 100% rename from vendor/onig_sys/oniguruma/src/iso8859_1.c rename to patch/onig_sys/oniguruma/src/iso8859_1.c diff --git a/vendor/onig_sys/oniguruma/src/iso8859_10.c b/patch/onig_sys/oniguruma/src/iso8859_10.c similarity index 100% rename from vendor/onig_sys/oniguruma/src/iso8859_10.c rename to patch/onig_sys/oniguruma/src/iso8859_10.c diff --git a/vendor/onig_sys/oniguruma/src/iso8859_11.c b/patch/onig_sys/oniguruma/src/iso8859_11.c similarity index 100% rename from vendor/onig_sys/oniguruma/src/iso8859_11.c rename to patch/onig_sys/oniguruma/src/iso8859_11.c diff --git a/vendor/onig_sys/oniguruma/src/iso8859_13.c b/patch/onig_sys/oniguruma/src/iso8859_13.c similarity index 100% rename from vendor/onig_sys/oniguruma/src/iso8859_13.c rename to patch/onig_sys/oniguruma/src/iso8859_13.c diff --git a/vendor/onig_sys/oniguruma/src/iso8859_14.c b/patch/onig_sys/oniguruma/src/iso8859_14.c similarity index 100% rename from vendor/onig_sys/oniguruma/src/iso8859_14.c rename to patch/onig_sys/oniguruma/src/iso8859_14.c diff --git a/vendor/onig_sys/oniguruma/src/iso8859_15.c b/patch/onig_sys/oniguruma/src/iso8859_15.c similarity index 100% rename from vendor/onig_sys/oniguruma/src/iso8859_15.c rename to patch/onig_sys/oniguruma/src/iso8859_15.c diff --git a/vendor/onig_sys/oniguruma/src/iso8859_16.c b/patch/onig_sys/oniguruma/src/iso8859_16.c similarity index 100% rename from vendor/onig_sys/oniguruma/src/iso8859_16.c rename to patch/onig_sys/oniguruma/src/iso8859_16.c diff --git a/vendor/onig_sys/oniguruma/src/iso8859_2.c b/patch/onig_sys/oniguruma/src/iso8859_2.c similarity index 100% rename from vendor/onig_sys/oniguruma/src/iso8859_2.c rename to patch/onig_sys/oniguruma/src/iso8859_2.c diff --git a/vendor/onig_sys/oniguruma/src/iso8859_3.c b/patch/onig_sys/oniguruma/src/iso8859_3.c similarity index 100% rename from vendor/onig_sys/oniguruma/src/iso8859_3.c rename to patch/onig_sys/oniguruma/src/iso8859_3.c diff --git a/vendor/onig_sys/oniguruma/src/iso8859_4.c b/patch/onig_sys/oniguruma/src/iso8859_4.c similarity index 100% rename from vendor/onig_sys/oniguruma/src/iso8859_4.c rename to patch/onig_sys/oniguruma/src/iso8859_4.c diff --git a/vendor/onig_sys/oniguruma/src/iso8859_5.c b/patch/onig_sys/oniguruma/src/iso8859_5.c similarity index 100% rename from vendor/onig_sys/oniguruma/src/iso8859_5.c rename to patch/onig_sys/oniguruma/src/iso8859_5.c diff --git a/vendor/onig_sys/oniguruma/src/iso8859_6.c b/patch/onig_sys/oniguruma/src/iso8859_6.c similarity index 100% rename from vendor/onig_sys/oniguruma/src/iso8859_6.c rename to patch/onig_sys/oniguruma/src/iso8859_6.c diff --git a/vendor/onig_sys/oniguruma/src/iso8859_7.c b/patch/onig_sys/oniguruma/src/iso8859_7.c similarity index 100% rename from vendor/onig_sys/oniguruma/src/iso8859_7.c rename to patch/onig_sys/oniguruma/src/iso8859_7.c diff --git a/vendor/onig_sys/oniguruma/src/iso8859_8.c b/patch/onig_sys/oniguruma/src/iso8859_8.c similarity index 100% rename from vendor/onig_sys/oniguruma/src/iso8859_8.c rename to patch/onig_sys/oniguruma/src/iso8859_8.c diff --git a/vendor/onig_sys/oniguruma/src/iso8859_9.c b/patch/onig_sys/oniguruma/src/iso8859_9.c similarity index 100% rename from vendor/onig_sys/oniguruma/src/iso8859_9.c rename to patch/onig_sys/oniguruma/src/iso8859_9.c diff --git a/vendor/onig_sys/oniguruma/src/koi8.c b/patch/onig_sys/oniguruma/src/koi8.c similarity index 100% rename from vendor/onig_sys/oniguruma/src/koi8.c rename to patch/onig_sys/oniguruma/src/koi8.c diff --git a/vendor/onig_sys/oniguruma/src/koi8_r.c b/patch/onig_sys/oniguruma/src/koi8_r.c similarity index 100% rename from vendor/onig_sys/oniguruma/src/koi8_r.c rename to patch/onig_sys/oniguruma/src/koi8_r.c diff --git a/vendor/onig_sys/oniguruma/src/make_property.sh b/patch/onig_sys/oniguruma/src/make_property.sh similarity index 100% rename from vendor/onig_sys/oniguruma/src/make_property.sh rename to patch/onig_sys/oniguruma/src/make_property.sh diff --git a/vendor/onig_sys/oniguruma/src/make_unicode_egcb.sh b/patch/onig_sys/oniguruma/src/make_unicode_egcb.sh similarity index 100% rename from vendor/onig_sys/oniguruma/src/make_unicode_egcb.sh rename to patch/onig_sys/oniguruma/src/make_unicode_egcb.sh diff --git a/vendor/onig_sys/oniguruma/src/make_unicode_egcb_data.py b/patch/onig_sys/oniguruma/src/make_unicode_egcb_data.py similarity index 100% rename from vendor/onig_sys/oniguruma/src/make_unicode_egcb_data.py rename to patch/onig_sys/oniguruma/src/make_unicode_egcb_data.py diff --git a/vendor/onig_sys/oniguruma/src/make_unicode_fold.sh b/patch/onig_sys/oniguruma/src/make_unicode_fold.sh similarity index 100% rename from vendor/onig_sys/oniguruma/src/make_unicode_fold.sh rename to patch/onig_sys/oniguruma/src/make_unicode_fold.sh diff --git a/vendor/onig_sys/oniguruma/src/make_unicode_fold_data.py b/patch/onig_sys/oniguruma/src/make_unicode_fold_data.py similarity index 100% rename from vendor/onig_sys/oniguruma/src/make_unicode_fold_data.py rename to patch/onig_sys/oniguruma/src/make_unicode_fold_data.py diff --git a/vendor/onig_sys/oniguruma/src/make_unicode_property.sh b/patch/onig_sys/oniguruma/src/make_unicode_property.sh similarity index 100% rename from vendor/onig_sys/oniguruma/src/make_unicode_property.sh rename to patch/onig_sys/oniguruma/src/make_unicode_property.sh diff --git a/vendor/onig_sys/oniguruma/src/make_unicode_property_data.py b/patch/onig_sys/oniguruma/src/make_unicode_property_data.py similarity index 100% rename from vendor/onig_sys/oniguruma/src/make_unicode_property_data.py rename to patch/onig_sys/oniguruma/src/make_unicode_property_data.py diff --git a/vendor/onig_sys/oniguruma/src/make_unicode_wb.sh b/patch/onig_sys/oniguruma/src/make_unicode_wb.sh similarity index 100% rename from vendor/onig_sys/oniguruma/src/make_unicode_wb.sh rename to patch/onig_sys/oniguruma/src/make_unicode_wb.sh diff --git a/vendor/onig_sys/oniguruma/src/make_unicode_wb_data.py b/patch/onig_sys/oniguruma/src/make_unicode_wb_data.py similarity index 100% rename from vendor/onig_sys/oniguruma/src/make_unicode_wb_data.py rename to patch/onig_sys/oniguruma/src/make_unicode_wb_data.py diff --git a/vendor/onig_sys/oniguruma/src/mktable.c b/patch/onig_sys/oniguruma/src/mktable.c similarity index 100% rename from vendor/onig_sys/oniguruma/src/mktable.c rename to patch/onig_sys/oniguruma/src/mktable.c diff --git a/vendor/onig_sys/oniguruma/src/onig_init.c b/patch/onig_sys/oniguruma/src/onig_init.c similarity index 100% rename from vendor/onig_sys/oniguruma/src/onig_init.c rename to patch/onig_sys/oniguruma/src/onig_init.c diff --git a/vendor/onig_sys/oniguruma/src/oniggnu.h b/patch/onig_sys/oniguruma/src/oniggnu.h similarity index 100% rename from vendor/onig_sys/oniguruma/src/oniggnu.h rename to patch/onig_sys/oniguruma/src/oniggnu.h diff --git a/vendor/onig_sys/oniguruma/src/onigposix.h b/patch/onig_sys/oniguruma/src/onigposix.h similarity index 100% rename from vendor/onig_sys/oniguruma/src/onigposix.h rename to patch/onig_sys/oniguruma/src/onigposix.h diff --git a/vendor/onig_sys/oniguruma/src/oniguruma.h b/patch/onig_sys/oniguruma/src/oniguruma.h similarity index 99% rename from vendor/onig_sys/oniguruma/src/oniguruma.h rename to patch/onig_sys/oniguruma/src/oniguruma.h index a7b9d8f94d603..6e35de8f3cee5 100644 --- a/vendor/onig_sys/oniguruma/src/oniguruma.h +++ b/patch/onig_sys/oniguruma/src/oniguruma.h @@ -780,7 +780,7 @@ typedef enum { typedef union { long l; OnigCodePoint c; - struct { + struct Anon { OnigUChar* start; OnigUChar* end; } s; diff --git a/vendor/onig_sys/oniguruma/src/regcomp.c b/patch/onig_sys/oniguruma/src/regcomp.c similarity index 100% rename from vendor/onig_sys/oniguruma/src/regcomp.c rename to patch/onig_sys/oniguruma/src/regcomp.c diff --git a/vendor/onig_sys/oniguruma/src/regenc.c b/patch/onig_sys/oniguruma/src/regenc.c similarity index 100% rename from vendor/onig_sys/oniguruma/src/regenc.c rename to patch/onig_sys/oniguruma/src/regenc.c diff --git a/vendor/onig_sys/oniguruma/src/regenc.h b/patch/onig_sys/oniguruma/src/regenc.h similarity index 100% rename from vendor/onig_sys/oniguruma/src/regenc.h rename to patch/onig_sys/oniguruma/src/regenc.h diff --git a/vendor/onig_sys/oniguruma/src/regerror.c b/patch/onig_sys/oniguruma/src/regerror.c similarity index 100% rename from vendor/onig_sys/oniguruma/src/regerror.c rename to patch/onig_sys/oniguruma/src/regerror.c diff --git a/vendor/onig_sys/oniguruma/src/regexec.c b/patch/onig_sys/oniguruma/src/regexec.c similarity index 100% rename from vendor/onig_sys/oniguruma/src/regexec.c rename to patch/onig_sys/oniguruma/src/regexec.c diff --git a/vendor/onig_sys/oniguruma/src/regext.c b/patch/onig_sys/oniguruma/src/regext.c similarity index 100% rename from vendor/onig_sys/oniguruma/src/regext.c rename to patch/onig_sys/oniguruma/src/regext.c diff --git a/vendor/onig_sys/oniguruma/src/reggnu.c b/patch/onig_sys/oniguruma/src/reggnu.c similarity index 100% rename from vendor/onig_sys/oniguruma/src/reggnu.c rename to patch/onig_sys/oniguruma/src/reggnu.c diff --git a/vendor/onig_sys/oniguruma/src/regint.h b/patch/onig_sys/oniguruma/src/regint.h similarity index 100% rename from vendor/onig_sys/oniguruma/src/regint.h rename to patch/onig_sys/oniguruma/src/regint.h diff --git a/vendor/onig_sys/oniguruma/src/regparse.c b/patch/onig_sys/oniguruma/src/regparse.c similarity index 100% rename from vendor/onig_sys/oniguruma/src/regparse.c rename to patch/onig_sys/oniguruma/src/regparse.c diff --git a/vendor/onig_sys/oniguruma/src/regparse.h b/patch/onig_sys/oniguruma/src/regparse.h similarity index 100% rename from vendor/onig_sys/oniguruma/src/regparse.h rename to patch/onig_sys/oniguruma/src/regparse.h diff --git a/vendor/onig_sys/oniguruma/src/regposerr.c b/patch/onig_sys/oniguruma/src/regposerr.c similarity index 100% rename from vendor/onig_sys/oniguruma/src/regposerr.c rename to patch/onig_sys/oniguruma/src/regposerr.c diff --git a/vendor/onig_sys/oniguruma/src/regposix.c b/patch/onig_sys/oniguruma/src/regposix.c similarity index 100% rename from vendor/onig_sys/oniguruma/src/regposix.c rename to patch/onig_sys/oniguruma/src/regposix.c diff --git a/vendor/onig_sys/oniguruma/src/regsyntax.c b/patch/onig_sys/oniguruma/src/regsyntax.c similarity index 100% rename from vendor/onig_sys/oniguruma/src/regsyntax.c rename to patch/onig_sys/oniguruma/src/regsyntax.c diff --git a/vendor/onig_sys/oniguruma/src/regtrav.c b/patch/onig_sys/oniguruma/src/regtrav.c similarity index 100% rename from vendor/onig_sys/oniguruma/src/regtrav.c rename to patch/onig_sys/oniguruma/src/regtrav.c diff --git a/vendor/onig_sys/oniguruma/src/regversion.c b/patch/onig_sys/oniguruma/src/regversion.c similarity index 100% rename from vendor/onig_sys/oniguruma/src/regversion.c rename to patch/onig_sys/oniguruma/src/regversion.c diff --git a/vendor/onig_sys/oniguruma/src/sjis.c b/patch/onig_sys/oniguruma/src/sjis.c similarity index 100% rename from vendor/onig_sys/oniguruma/src/sjis.c rename to patch/onig_sys/oniguruma/src/sjis.c diff --git a/vendor/onig_sys/oniguruma/src/sjis_prop.c b/patch/onig_sys/oniguruma/src/sjis_prop.c similarity index 100% rename from vendor/onig_sys/oniguruma/src/sjis_prop.c rename to patch/onig_sys/oniguruma/src/sjis_prop.c diff --git a/vendor/onig_sys/oniguruma/src/sjis_prop.gperf b/patch/onig_sys/oniguruma/src/sjis_prop.gperf similarity index 100% rename from vendor/onig_sys/oniguruma/src/sjis_prop.gperf rename to patch/onig_sys/oniguruma/src/sjis_prop.gperf diff --git a/vendor/onig_sys/oniguruma/src/st.c b/patch/onig_sys/oniguruma/src/st.c similarity index 100% rename from vendor/onig_sys/oniguruma/src/st.c rename to patch/onig_sys/oniguruma/src/st.c diff --git a/vendor/onig_sys/oniguruma/src/st.h b/patch/onig_sys/oniguruma/src/st.h similarity index 100% rename from vendor/onig_sys/oniguruma/src/st.h rename to patch/onig_sys/oniguruma/src/st.h diff --git a/vendor/onig_sys/oniguruma/src/unicode.c b/patch/onig_sys/oniguruma/src/unicode.c similarity index 100% rename from vendor/onig_sys/oniguruma/src/unicode.c rename to patch/onig_sys/oniguruma/src/unicode.c diff --git a/vendor/onig_sys/oniguruma/src/unicode_egcb_data.c b/patch/onig_sys/oniguruma/src/unicode_egcb_data.c similarity index 100% rename from vendor/onig_sys/oniguruma/src/unicode_egcb_data.c rename to patch/onig_sys/oniguruma/src/unicode_egcb_data.c diff --git a/vendor/onig_sys/oniguruma/src/unicode_fold1_key.c b/patch/onig_sys/oniguruma/src/unicode_fold1_key.c similarity index 100% rename from vendor/onig_sys/oniguruma/src/unicode_fold1_key.c rename to patch/onig_sys/oniguruma/src/unicode_fold1_key.c diff --git a/vendor/onig_sys/oniguruma/src/unicode_fold2_key.c b/patch/onig_sys/oniguruma/src/unicode_fold2_key.c similarity index 100% rename from vendor/onig_sys/oniguruma/src/unicode_fold2_key.c rename to patch/onig_sys/oniguruma/src/unicode_fold2_key.c diff --git a/vendor/onig_sys/oniguruma/src/unicode_fold3_key.c b/patch/onig_sys/oniguruma/src/unicode_fold3_key.c similarity index 100% rename from vendor/onig_sys/oniguruma/src/unicode_fold3_key.c rename to patch/onig_sys/oniguruma/src/unicode_fold3_key.c diff --git a/vendor/onig_sys/oniguruma/src/unicode_fold_data.c b/patch/onig_sys/oniguruma/src/unicode_fold_data.c similarity index 100% rename from vendor/onig_sys/oniguruma/src/unicode_fold_data.c rename to patch/onig_sys/oniguruma/src/unicode_fold_data.c diff --git a/vendor/onig_sys/oniguruma/src/unicode_property_data.c b/patch/onig_sys/oniguruma/src/unicode_property_data.c similarity index 100% rename from vendor/onig_sys/oniguruma/src/unicode_property_data.c rename to patch/onig_sys/oniguruma/src/unicode_property_data.c diff --git a/vendor/onig_sys/oniguruma/src/unicode_property_data_posix.c b/patch/onig_sys/oniguruma/src/unicode_property_data_posix.c similarity index 100% rename from vendor/onig_sys/oniguruma/src/unicode_property_data_posix.c rename to patch/onig_sys/oniguruma/src/unicode_property_data_posix.c diff --git a/vendor/onig_sys/oniguruma/src/unicode_unfold_key.c b/patch/onig_sys/oniguruma/src/unicode_unfold_key.c similarity index 100% rename from vendor/onig_sys/oniguruma/src/unicode_unfold_key.c rename to patch/onig_sys/oniguruma/src/unicode_unfold_key.c diff --git a/vendor/onig_sys/oniguruma/src/unicode_wb_data.c b/patch/onig_sys/oniguruma/src/unicode_wb_data.c similarity index 100% rename from vendor/onig_sys/oniguruma/src/unicode_wb_data.c rename to patch/onig_sys/oniguruma/src/unicode_wb_data.c diff --git a/vendor/onig_sys/oniguruma/src/utf16_be.c b/patch/onig_sys/oniguruma/src/utf16_be.c similarity index 100% rename from vendor/onig_sys/oniguruma/src/utf16_be.c rename to patch/onig_sys/oniguruma/src/utf16_be.c diff --git a/vendor/onig_sys/oniguruma/src/utf16_le.c b/patch/onig_sys/oniguruma/src/utf16_le.c similarity index 100% rename from vendor/onig_sys/oniguruma/src/utf16_le.c rename to patch/onig_sys/oniguruma/src/utf16_le.c diff --git a/vendor/onig_sys/oniguruma/src/utf32_be.c b/patch/onig_sys/oniguruma/src/utf32_be.c similarity index 100% rename from vendor/onig_sys/oniguruma/src/utf32_be.c rename to patch/onig_sys/oniguruma/src/utf32_be.c diff --git a/vendor/onig_sys/oniguruma/src/utf32_le.c b/patch/onig_sys/oniguruma/src/utf32_le.c similarity index 100% rename from vendor/onig_sys/oniguruma/src/utf32_le.c rename to patch/onig_sys/oniguruma/src/utf32_le.c diff --git a/vendor/onig_sys/oniguruma/src/utf8.c b/patch/onig_sys/oniguruma/src/utf8.c similarity index 100% rename from vendor/onig_sys/oniguruma/src/utf8.c rename to patch/onig_sys/oniguruma/src/utf8.c diff --git a/vendor/onig_sys/oniguruma/test-driver b/patch/onig_sys/oniguruma/test-driver similarity index 100% rename from vendor/onig_sys/oniguruma/test-driver rename to patch/onig_sys/oniguruma/test-driver diff --git a/vendor/onig_sys/oniguruma/test/Makefile.am b/patch/onig_sys/oniguruma/test/Makefile.am similarity index 100% rename from vendor/onig_sys/oniguruma/test/Makefile.am rename to patch/onig_sys/oniguruma/test/Makefile.am diff --git a/vendor/onig_sys/oniguruma/test/test_back.c b/patch/onig_sys/oniguruma/test/test_back.c similarity index 100% rename from vendor/onig_sys/oniguruma/test/test_back.c rename to patch/onig_sys/oniguruma/test/test_back.c diff --git a/vendor/onig_sys/oniguruma/test/test_options.c b/patch/onig_sys/oniguruma/test/test_options.c similarity index 100% rename from vendor/onig_sys/oniguruma/test/test_options.c rename to patch/onig_sys/oniguruma/test/test_options.c diff --git a/vendor/onig_sys/oniguruma/test/test_regset.c b/patch/onig_sys/oniguruma/test/test_regset.c similarity index 100% rename from vendor/onig_sys/oniguruma/test/test_regset.c rename to patch/onig_sys/oniguruma/test/test_regset.c diff --git a/vendor/onig_sys/oniguruma/test/test_syntax.c b/patch/onig_sys/oniguruma/test/test_syntax.c similarity index 100% rename from vendor/onig_sys/oniguruma/test/test_syntax.c rename to patch/onig_sys/oniguruma/test/test_syntax.c diff --git a/vendor/onig_sys/oniguruma/test/test_utf8.c b/patch/onig_sys/oniguruma/test/test_utf8.c similarity index 100% rename from vendor/onig_sys/oniguruma/test/test_utf8.c rename to patch/onig_sys/oniguruma/test/test_utf8.c diff --git a/vendor/onig_sys/oniguruma/test/testc.c b/patch/onig_sys/oniguruma/test/testc.c similarity index 100% rename from vendor/onig_sys/oniguruma/test/testc.c rename to patch/onig_sys/oniguruma/test/testc.c diff --git a/vendor/onig_sys/oniguruma/test/testp.c b/patch/onig_sys/oniguruma/test/testp.c similarity index 100% rename from vendor/onig_sys/oniguruma/test/testp.c rename to patch/onig_sys/oniguruma/test/testp.c diff --git a/vendor/onig_sys/oniguruma/test/testu.c b/patch/onig_sys/oniguruma/test/testu.c similarity index 100% rename from vendor/onig_sys/oniguruma/test/testu.c rename to patch/onig_sys/oniguruma/test/testu.c diff --git a/vendor/onig_sys/oniguruma/tis-ci/config.h b/patch/onig_sys/oniguruma/tis-ci/config.h similarity index 100% rename from vendor/onig_sys/oniguruma/tis-ci/config.h rename to patch/onig_sys/oniguruma/tis-ci/config.h diff --git a/vendor/onig_sys/oniguruma/tis-ci/stub.c b/patch/onig_sys/oniguruma/tis-ci/stub.c similarity index 100% rename from vendor/onig_sys/oniguruma/tis-ci/stub.c rename to patch/onig_sys/oniguruma/tis-ci/stub.c diff --git a/vendor/onig_sys/oniguruma/tis-ci/test_back.config b/patch/onig_sys/oniguruma/tis-ci/test_back.config similarity index 100% rename from vendor/onig_sys/oniguruma/tis-ci/test_back.config rename to patch/onig_sys/oniguruma/tis-ci/test_back.config diff --git a/vendor/onig_sys/oniguruma/tis-ci/test_regset.config b/patch/onig_sys/oniguruma/tis-ci/test_regset.config similarity index 100% rename from vendor/onig_sys/oniguruma/tis-ci/test_regset.config rename to patch/onig_sys/oniguruma/tis-ci/test_regset.config diff --git a/vendor/onig_sys/oniguruma/tis-ci/test_syntax.config b/patch/onig_sys/oniguruma/tis-ci/test_syntax.config similarity index 100% rename from vendor/onig_sys/oniguruma/tis-ci/test_syntax.config rename to patch/onig_sys/oniguruma/tis-ci/test_syntax.config diff --git a/vendor/onig_sys/oniguruma/tis-ci/test_utf8.config b/patch/onig_sys/oniguruma/tis-ci/test_utf8.config similarity index 100% rename from vendor/onig_sys/oniguruma/tis-ci/test_utf8.config rename to patch/onig_sys/oniguruma/tis-ci/test_utf8.config diff --git a/vendor/onig_sys/oniguruma/tis-ci/testc.config b/patch/onig_sys/oniguruma/tis-ci/testc.config similarity index 100% rename from vendor/onig_sys/oniguruma/tis-ci/testc.config rename to patch/onig_sys/oniguruma/tis-ci/testc.config diff --git a/vendor/onig_sys/oniguruma/tis-ci/testu.config b/patch/onig_sys/oniguruma/tis-ci/testu.config similarity index 100% rename from vendor/onig_sys/oniguruma/tis-ci/testu.config rename to patch/onig_sys/oniguruma/tis-ci/testu.config diff --git a/vendor/onig_sys/oniguruma/tis.config b/patch/onig_sys/oniguruma/tis.config similarity index 100% rename from vendor/onig_sys/oniguruma/tis.config rename to patch/onig_sys/oniguruma/tis.config diff --git a/vendor/onig_sys/oniguruma/windows/testc.c b/patch/onig_sys/oniguruma/windows/testc.c similarity index 100% rename from vendor/onig_sys/oniguruma/windows/testc.c rename to patch/onig_sys/oniguruma/windows/testc.c diff --git a/vendor/onig_sys/src/bindgened.rs b/patch/onig_sys/src/bindgened.rs similarity index 100% rename from vendor/onig_sys/src/bindgened.rs rename to patch/onig_sys/src/bindgened.rs diff --git a/vendor/onig_sys/src/ffi.rs b/patch/onig_sys/src/ffi.rs similarity index 100% rename from vendor/onig_sys/src/ffi.rs rename to patch/onig_sys/src/ffi.rs diff --git a/vendor/onig_sys/src/lib.rs b/patch/onig_sys/src/lib.rs similarity index 100% rename from vendor/onig_sys/src/lib.rs rename to patch/onig_sys/src/lib.rs diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 6a912b1ebb193..08e602710eeb9 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,3 +1,3 @@ [toolchain] -channel = "1.58.1" +channel = "1.71.1" profile = "default" diff --git a/src/tls/incoming.rs b/src/tls/incoming.rs index 106493743cf2c..b7725d98f9946 100644 --- a/src/tls/incoming.rs +++ b/src/tls/incoming.rs @@ -286,7 +286,7 @@ impl MaybeTlsIncomingStream { where F: FnOnce(Pin<&mut MaybeTlsStream>, &mut Context) -> Poll>, { - let mut this = self.get_mut(); + let this = self.get_mut(); loop { return match &mut this.state { StreamState::Accepted(stream) => poll_fn(Pin::new(stream), cx), @@ -330,7 +330,7 @@ impl AsyncWrite for MaybeTlsIncomingStream { } fn poll_shutdown(self: Pin<&mut Self>, cx: &mut Context) -> Poll> { - let mut this = self.get_mut(); + let this = self.get_mut(); match &mut this.state { StreamState::Accepted(stream) => match Pin::new(stream).poll_shutdown(cx) { Poll::Ready(Ok(())) => { diff --git a/src/tls/settings.rs b/src/tls/settings.rs index c6b1720e1321b..48da30412bf86 100644 --- a/src/tls/settings.rs +++ b/src/tls/settings.rs @@ -477,6 +477,7 @@ mod test { const TEST_PEM_CRT_BYTES: &[u8] = include_bytes!("../../tests/data/localhost.crt"); const TEST_PEM_KEY_BYTES: &[u8] = include_bytes!("../../tests/data/localhost.key"); + #[ignore] #[test] fn from_options_pkcs12() { let options = TlsOptions {