git: 5ea82036cc59 - main - textproc/ripgrep: Update to version 14.1.1
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 25 Sep 2024 06:30:05 UTC
The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=5ea82036cc59224c8ab7553764f49e2c88fc5b98 commit 5ea82036cc59224c8ab7553764f49e2c88fc5b98 Author: Petteri Valkonen <petteri.valkonen@iki.fi> AuthorDate: 2024-09-14 16:44:50 +0000 Commit: Robert Clausecker <fuz@FreeBSD.org> CommitDate: 2024-09-25 06:28:03 +0000 textproc/ripgrep: Update to version 14.1.1 Changelog: https://github.com/BurntSushi/ripgrep/releases/tag/14.1.1 PR: 281504 Event: EuroBSDcon 2024 --- textproc/ripgrep/Makefile | 15 +- textproc/ripgrep/Makefile.crates | 94 +++--- textproc/ripgrep/distinfo | 134 ++++---- textproc/ripgrep/files/patch-rust-1.78.0 | 506 ------------------------------- 4 files changed, 133 insertions(+), 616 deletions(-) diff --git a/textproc/ripgrep/Makefile b/textproc/ripgrep/Makefile index 5113bec4c5df..0acd85785428 100644 --- a/textproc/ripgrep/Makefile +++ b/textproc/ripgrep/Makefile @@ -1,6 +1,5 @@ PORTNAME= ripgrep -DISTVERSION= 14.1.0 -PORTREVISION= 5 +DISTVERSION= 14.1.1 CATEGORIES= textproc MAINTAINER= petteri.valkonen@iki.fi @@ -19,22 +18,22 @@ GH_ACCOUNT= BurntSushi PLIST_FILES= bin/rg \ etc/bash_completion.d/rg.bash \ - share/man/man1/rg.1.gz \ share/fish/vendor_completions.d/rg.fish \ + share/man/man1/rg.1.gz \ share/zsh/site-functions/_rg PORTDOCS= CHANGELOG.md FAQ.md GUIDE.md -OPTIONS_DEFINE= DOCS PCRE2 SIMD -OPTIONS_DEFAULT=PCRE2 +OPTIONS_DEFINE= DOCS PCRE2 SIMD +OPTIONS_DEFAULT= PCRE2 -OPTIONS_DEFAULT_aarch64=SIMD +OPTIONS_DEFAULT_aarch64= SIMD OPTIONS_DEFAULT_amd64= ${OPTIONS_DEFAULT_i386} OPTIONS_DEFAULT_i386= ${MACHINE_CPU:tu:S/SSE2/SIMD/} -PCRE2_DESC= ${PCRE_DESC} version 2 +PCRE2_DESC= ${PCRE_DESC} version 2 PCRE2_LIB_DEPENDS= libpcre2-8.so:devel/pcre2 -PCRE2_VARS= CARGO_FEATURES+=pcre2 +PCRE2_VARS= CARGO_FEATURES+=pcre2 SIMD_MAKE_ENV= RUSTC_BOOTSTRAP=encoding_rs SIMD_VARS= ${SIMD_VARS_${ARCH}} diff --git a/textproc/ripgrep/Makefile.crates b/textproc/ripgrep/Makefile.crates index 6487fbefe0e2..e3220ad08a39 100644 --- a/textproc/ripgrep/Makefile.crates +++ b/textproc/ripgrep/Makefile.crates @@ -1,43 +1,51 @@ -CARGO_CRATES= aho-corasick-1.1.2 \ - anyhow-1.0.80 \ - bstr-1.9.1 \ - cc-1.0.90 \ - cfg-if-1.0.0 \ - crossbeam-channel-0.5.12 \ - crossbeam-deque-0.8.5 \ - crossbeam-epoch-0.9.18 \ - crossbeam-utils-0.8.19 \ - encoding_rs-0.8.33 \ - encoding_rs_io-0.1.7 \ - glob-0.3.1 \ - itoa-1.0.10 \ - jemalloc-sys-0.5.4+5.3.0-patched \ - jemallocator-0.5.4 \ - jobserver-0.1.28 \ - lexopt-0.3.0 \ - libc-0.2.153 \ - log-0.4.21 \ - memchr-2.7.1 \ - memmap2-0.9.4 \ - pcre2-0.2.6 \ - pcre2-sys-0.2.8 \ - pkg-config-0.3.30 \ - proc-macro2-1.0.78 \ - quote-1.0.35 \ - regex-1.10.3 \ - regex-automata-0.4.6 \ - regex-syntax-0.8.2 \ - ryu-1.0.17 \ - same-file-1.0.6 \ - serde-1.0.197 \ - serde_derive-1.0.197 \ - serde_json-1.0.114 \ - syn-2.0.52 \ - termcolor-1.4.1 \ - textwrap-0.16.1 \ - unicode-ident-1.0.12 \ - walkdir-2.5.0 \ - winapi-0.3.9 \ - winapi-i686-pc-windows-gnu-0.4.0 \ - winapi-util-0.1.6 \ - winapi-x86_64-pc-windows-gnu-0.4.0 +CARGO_CRATES= aho-corasick-1.1.3 \ + anyhow-1.0.87 \ + bstr-1.10.0 \ + cc-1.1.18 \ + cfg-if-1.0.0 \ + crossbeam-channel-0.5.13 \ + crossbeam-deque-0.8.5 \ + crossbeam-epoch-0.9.18 \ + crossbeam-utils-0.8.20 \ + encoding_rs-0.8.34 \ + encoding_rs_io-0.1.7 \ + glob-0.3.1 \ + itoa-1.0.11 \ + jemalloc-sys-0.5.4+5.3.0-patched \ + jemallocator-0.5.4 \ + jobserver-0.1.32 \ + lexopt-0.3.0 \ + libc-0.2.158 \ + log-0.4.22 \ + memchr-2.7.4 \ + memmap2-0.9.4 \ + pcre2-0.2.9 \ + pcre2-sys-0.2.9 \ + pkg-config-0.3.30 \ + proc-macro2-1.0.86 \ + quote-1.0.37 \ + regex-1.10.6 \ + regex-automata-0.4.7 \ + regex-syntax-0.8.4 \ + ryu-1.0.18 \ + same-file-1.0.6 \ + serde-1.0.210 \ + serde_derive-1.0.210 \ + serde_json-1.0.128 \ + shlex-1.3.0 \ + syn-2.0.77 \ + termcolor-1.4.1 \ + textwrap-0.16.1 \ + unicode-ident-1.0.12 \ + walkdir-2.5.0 \ + winapi-util-0.1.9 \ + windows-sys-0.59.0 \ + windows-targets-0.52.6 \ + windows_aarch64_gnullvm-0.52.6 \ + windows_aarch64_msvc-0.52.6 \ + windows_i686_gnu-0.52.6 \ + windows_i686_gnullvm-0.52.6 \ + windows_i686_msvc-0.52.6 \ + windows_x86_64_gnu-0.52.6 \ + windows_x86_64_gnullvm-0.52.6 \ + windows_x86_64_msvc-0.52.6 diff --git a/textproc/ripgrep/distinfo b/textproc/ripgrep/distinfo index 378b705cb244..ac90c7051e28 100644 --- a/textproc/ripgrep/distinfo +++ b/textproc/ripgrep/distinfo @@ -1,74 +1,76 @@ -TIMESTAMP = 1715159701 -SHA256 (rust/crates/aho-corasick-1.1.2.crate) = b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0 -SIZE (rust/crates/aho-corasick-1.1.2.crate) = 183136 -SHA256 (rust/crates/anyhow-1.0.80.crate) = 5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1 -SIZE (rust/crates/anyhow-1.0.80.crate) = 45138 -SHA256 (rust/crates/bstr-1.9.1.crate) = 05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706 -SIZE (rust/crates/bstr-1.9.1.crate) = 380305 -SHA256 (rust/crates/cc-1.0.90.crate) = 8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5 -SIZE (rust/crates/cc-1.0.90.crate) = 73954 +TIMESTAMP = 1726332718 +SHA256 (rust/crates/aho-corasick-1.1.3.crate) = 8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916 +SIZE (rust/crates/aho-corasick-1.1.3.crate) = 183311 +SHA256 (rust/crates/anyhow-1.0.87.crate) = 10f00e1f6e58a40e807377c75c6a7f97bf9044fab57816f2414e6f5f4499d7b8 +SIZE (rust/crates/anyhow-1.0.87.crate) = 46831 +SHA256 (rust/crates/bstr-1.10.0.crate) = 40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c +SIZE (rust/crates/bstr-1.10.0.crate) = 380426 +SHA256 (rust/crates/cc-1.1.18.crate) = b62ac837cdb5cb22e10a256099b4fc502b1dfe560cb282963a974d7abd80e476 +SIZE (rust/crates/cc-1.1.18.crate) = 83315 SHA256 (rust/crates/cfg-if-1.0.0.crate) = baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd SIZE (rust/crates/cfg-if-1.0.0.crate) = 7934 -SHA256 (rust/crates/crossbeam-channel-0.5.12.crate) = ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95 -SIZE (rust/crates/crossbeam-channel-0.5.12.crate) = 90515 +SHA256 (rust/crates/crossbeam-channel-0.5.13.crate) = 33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2 +SIZE (rust/crates/crossbeam-channel-0.5.13.crate) = 91174 SHA256 (rust/crates/crossbeam-deque-0.8.5.crate) = 613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d SIZE (rust/crates/crossbeam-deque-0.8.5.crate) = 21726 SHA256 (rust/crates/crossbeam-epoch-0.9.18.crate) = 5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e SIZE (rust/crates/crossbeam-epoch-0.9.18.crate) = 46875 -SHA256 (rust/crates/crossbeam-utils-0.8.19.crate) = 248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345 -SIZE (rust/crates/crossbeam-utils-0.8.19.crate) = 42328 -SHA256 (rust/crates/encoding_rs-0.8.33.crate) = 7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1 -SIZE (rust/crates/encoding_rs-0.8.33.crate) = 1370071 +SHA256 (rust/crates/crossbeam-utils-0.8.20.crate) = 22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80 +SIZE (rust/crates/crossbeam-utils-0.8.20.crate) = 42487 +SHA256 (rust/crates/encoding_rs-0.8.34.crate) = b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59 +SIZE (rust/crates/encoding_rs-0.8.34.crate) = 1378166 SHA256 (rust/crates/encoding_rs_io-0.1.7.crate) = 1cc3c5651fb62ab8aa3103998dade57efdd028544bd300516baa31840c252a83 SIZE (rust/crates/encoding_rs_io-0.1.7.crate) = 16969 SHA256 (rust/crates/glob-0.3.1.crate) = d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b SIZE (rust/crates/glob-0.3.1.crate) = 18880 -SHA256 (rust/crates/itoa-1.0.10.crate) = b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c -SIZE (rust/crates/itoa-1.0.10.crate) = 10534 +SHA256 (rust/crates/itoa-1.0.11.crate) = 49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b +SIZE (rust/crates/itoa-1.0.11.crate) = 10563 SHA256 (rust/crates/jemalloc-sys-0.5.4+5.3.0-patched.crate) = ac6c1946e1cea1788cbfde01c993b52a10e2da07f4bac608228d1bed20bfebf2 SIZE (rust/crates/jemalloc-sys-0.5.4+5.3.0-patched.crate) = 884321 SHA256 (rust/crates/jemallocator-0.5.4.crate) = a0de374a9f8e63150e6f5e8a60cc14c668226d7a347d8aee1a45766e3c4dd3bc SIZE (rust/crates/jemallocator-0.5.4.crate) = 13088 -SHA256 (rust/crates/jobserver-0.1.28.crate) = ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6 -SIZE (rust/crates/jobserver-0.1.28.crate) = 25543 +SHA256 (rust/crates/jobserver-0.1.32.crate) = 48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0 +SIZE (rust/crates/jobserver-0.1.32.crate) = 27549 SHA256 (rust/crates/lexopt-0.3.0.crate) = baff4b617f7df3d896f97fe922b64817f6cd9a756bb81d40f8883f2f66dcb401 SIZE (rust/crates/lexopt-0.3.0.crate) = 24767 -SHA256 (rust/crates/libc-0.2.153.crate) = 9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd -SIZE (rust/crates/libc-0.2.153.crate) = 740614 -SHA256 (rust/crates/log-0.4.21.crate) = 90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c -SIZE (rust/crates/log-0.4.21.crate) = 43442 -SHA256 (rust/crates/memchr-2.7.1.crate) = 523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149 -SIZE (rust/crates/memchr-2.7.1.crate) = 96307 +SHA256 (rust/crates/libc-0.2.158.crate) = d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439 +SIZE (rust/crates/libc-0.2.158.crate) = 751340 +SHA256 (rust/crates/log-0.4.22.crate) = a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24 +SIZE (rust/crates/log-0.4.22.crate) = 44027 +SHA256 (rust/crates/memchr-2.7.4.crate) = 78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3 +SIZE (rust/crates/memchr-2.7.4.crate) = 96670 SHA256 (rust/crates/memmap2-0.9.4.crate) = fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322 SIZE (rust/crates/memmap2-0.9.4.crate) = 32752 -SHA256 (rust/crates/pcre2-0.2.6.crate) = 4c9d53a8ea5fc3d3568d3de4bebc12606fd0eb8234c602576f1f1ee4880488a7 -SIZE (rust/crates/pcre2-0.2.6.crate) = 30765 -SHA256 (rust/crates/pcre2-sys-0.2.8.crate) = 25b8a7b5253a4465b873a21ee7e8d6ec561a57eed5d319621bec36bea35c86ae -SIZE (rust/crates/pcre2-sys-0.2.8.crate) = 626303 +SHA256 (rust/crates/pcre2-0.2.9.crate) = 3be55c43ac18044541d58d897e8f4c55157218428953ebd39d86df3ba0286b2b +SIZE (rust/crates/pcre2-0.2.9.crate) = 31025 +SHA256 (rust/crates/pcre2-sys-0.2.9.crate) = 550f5d18fb1b90c20b87e161852c10cde77858c3900c5059b5ad2a1449f11d8a +SIZE (rust/crates/pcre2-sys-0.2.9.crate) = 697425 SHA256 (rust/crates/pkg-config-0.3.30.crate) = d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec SIZE (rust/crates/pkg-config-0.3.30.crate) = 20613 -SHA256 (rust/crates/proc-macro2-1.0.78.crate) = e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae -SIZE (rust/crates/proc-macro2-1.0.78.crate) = 47158 -SHA256 (rust/crates/quote-1.0.35.crate) = 291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef -SIZE (rust/crates/quote-1.0.35.crate) = 28136 -SHA256 (rust/crates/regex-1.10.3.crate) = b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15 -SIZE (rust/crates/regex-1.10.3.crate) = 253101 -SHA256 (rust/crates/regex-automata-0.4.6.crate) = 86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea -SIZE (rust/crates/regex-automata-0.4.6.crate) = 617565 -SHA256 (rust/crates/regex-syntax-0.8.2.crate) = c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f -SIZE (rust/crates/regex-syntax-0.8.2.crate) = 347228 -SHA256 (rust/crates/ryu-1.0.17.crate) = e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1 -SIZE (rust/crates/ryu-1.0.17.crate) = 47537 +SHA256 (rust/crates/proc-macro2-1.0.86.crate) = 5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77 +SIZE (rust/crates/proc-macro2-1.0.86.crate) = 48958 +SHA256 (rust/crates/quote-1.0.37.crate) = b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af +SIZE (rust/crates/quote-1.0.37.crate) = 28558 +SHA256 (rust/crates/regex-1.10.6.crate) = 4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619 +SIZE (rust/crates/regex-1.10.6.crate) = 253894 +SHA256 (rust/crates/regex-automata-0.4.7.crate) = 38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df +SIZE (rust/crates/regex-automata-0.4.7.crate) = 617582 +SHA256 (rust/crates/regex-syntax-0.8.4.crate) = 7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b +SIZE (rust/crates/regex-syntax-0.8.4.crate) = 347577 +SHA256 (rust/crates/ryu-1.0.18.crate) = f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f +SIZE (rust/crates/ryu-1.0.18.crate) = 47713 SHA256 (rust/crates/same-file-1.0.6.crate) = 93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502 SIZE (rust/crates/same-file-1.0.6.crate) = 10183 -SHA256 (rust/crates/serde-1.0.197.crate) = 3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2 -SIZE (rust/crates/serde-1.0.197.crate) = 77087 -SHA256 (rust/crates/serde_derive-1.0.197.crate) = 7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b -SIZE (rust/crates/serde_derive-1.0.197.crate) = 55771 -SHA256 (rust/crates/serde_json-1.0.114.crate) = c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0 -SIZE (rust/crates/serde_json-1.0.114.crate) = 146986 -SHA256 (rust/crates/syn-2.0.52.crate) = b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07 -SIZE (rust/crates/syn-2.0.52.crate) = 254728 +SHA256 (rust/crates/serde-1.0.210.crate) = c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a +SIZE (rust/crates/serde-1.0.210.crate) = 78338 +SHA256 (rust/crates/serde_derive-1.0.210.crate) = 243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f +SIZE (rust/crates/serde_derive-1.0.210.crate) = 56020 +SHA256 (rust/crates/serde_json-1.0.128.crate) = 6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8 +SIZE (rust/crates/serde_json-1.0.128.crate) = 149520 +SHA256 (rust/crates/shlex-1.3.0.crate) = 0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64 +SIZE (rust/crates/shlex-1.3.0.crate) = 18713 +SHA256 (rust/crates/syn-2.0.77.crate) = 9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed +SIZE (rust/crates/syn-2.0.77.crate) = 268784 SHA256 (rust/crates/termcolor-1.4.1.crate) = 06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755 SIZE (rust/crates/termcolor-1.4.1.crate) = 18773 SHA256 (rust/crates/textwrap-0.16.1.crate) = 23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9 @@ -77,13 +79,27 @@ SHA256 (rust/crates/unicode-ident-1.0.12.crate) = 3354b9ac3fae1ff6755cb6db53683a SIZE (rust/crates/unicode-ident-1.0.12.crate) = 42168 SHA256 (rust/crates/walkdir-2.5.0.crate) = 29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b SIZE (rust/crates/walkdir-2.5.0.crate) = 23951 -SHA256 (rust/crates/winapi-0.3.9.crate) = 5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419 -SIZE (rust/crates/winapi-0.3.9.crate) = 1200382 -SHA256 (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.crate) = ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6 -SIZE (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.crate) = 2918815 -SHA256 (rust/crates/winapi-util-0.1.6.crate) = f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596 -SIZE (rust/crates/winapi-util-0.1.6.crate) = 12234 -SHA256 (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f -SIZE (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 2947998 -SHA256 (BurntSushi-ripgrep-14.1.0_GH0.tar.gz) = 33c6169596a6bbfdc81415910008f26e0809422fda2d849562637996553b2ab6 -SIZE (BurntSushi-ripgrep-14.1.0_GH0.tar.gz) = 584473 +SHA256 (rust/crates/winapi-util-0.1.9.crate) = cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb +SIZE (rust/crates/winapi-util-0.1.9.crate) = 12464 +SHA256 (rust/crates/windows-sys-0.59.0.crate) = 1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b +SIZE (rust/crates/windows-sys-0.59.0.crate) = 2387323 +SHA256 (rust/crates/windows-targets-0.52.6.crate) = 9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973 +SIZE (rust/crates/windows-targets-0.52.6.crate) = 6403 +SHA256 (rust/crates/windows_aarch64_gnullvm-0.52.6.crate) = 32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3 +SIZE (rust/crates/windows_aarch64_gnullvm-0.52.6.crate) = 435718 +SHA256 (rust/crates/windows_aarch64_msvc-0.52.6.crate) = 09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469 +SIZE (rust/crates/windows_aarch64_msvc-0.52.6.crate) = 832615 +SHA256 (rust/crates/windows_i686_gnu-0.52.6.crate) = 8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b +SIZE (rust/crates/windows_i686_gnu-0.52.6.crate) = 880402 +SHA256 (rust/crates/windows_i686_gnullvm-0.52.6.crate) = 0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66 +SIZE (rust/crates/windows_i686_gnullvm-0.52.6.crate) = 475940 +SHA256 (rust/crates/windows_i686_msvc-0.52.6.crate) = 240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66 +SIZE (rust/crates/windows_i686_msvc-0.52.6.crate) = 901163 +SHA256 (rust/crates/windows_x86_64_gnu-0.52.6.crate) = 147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78 +SIZE (rust/crates/windows_x86_64_gnu-0.52.6.crate) = 836363 +SHA256 (rust/crates/windows_x86_64_gnullvm-0.52.6.crate) = 24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d +SIZE (rust/crates/windows_x86_64_gnullvm-0.52.6.crate) = 435707 +SHA256 (rust/crates/windows_x86_64_msvc-0.52.6.crate) = 589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec +SIZE (rust/crates/windows_x86_64_msvc-0.52.6.crate) = 832564 +SHA256 (BurntSushi-ripgrep-14.1.1_GH0.tar.gz) = 4dad02a2f9c8c3c8d89434e47337aa654cb0e2aa50e806589132f186bf5c2b66 +SIZE (BurntSushi-ripgrep-14.1.1_GH0.tar.gz) = 581402 diff --git a/textproc/ripgrep/files/patch-rust-1.78.0 b/textproc/ripgrep/files/patch-rust-1.78.0 deleted file mode 100644 index 2fe71c793ebd..000000000000 --- a/textproc/ripgrep/files/patch-rust-1.78.0 +++ /dev/null @@ -1,506 +0,0 @@ -From 9bd30e8e48b139c3f5ebe8587abff6fff7add45b Mon Sep 17 00:00:00 2001 -From: Andrew Gallant <jamslam@gmail.com> -Date: Thu, 7 Mar 2024 09:38:22 -0500 -Subject: [PATCH] deps: update everything - ---- - Cargo.lock | 103 +++++++++++++++++++++++++---------------------------- - 1 file changed, 48 insertions(+), 55 deletions(-) - -diff --git a/Cargo.lock b/Cargo.lock -index cb1065d46..45f56f74a 100644 ---- Cargo.lock -+++ Cargo.lock -@@ -13,9 +13,9 @@ dependencies = [ - - [[package]] - name = "anyhow" --version = "1.0.79" -+version = "1.0.80" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" -+checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1" - - [[package]] - name = "autocfg" -@@ -25,9 +25,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - - [[package]] - name = "bstr" --version = "1.9.0" -+version = "1.9.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "c48f0051a4b4c5e0b6d365cd04af53aeaa209e3cc15ec2cdb69e73cc87fbd0dc" -+checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" - dependencies = [ - "memchr", - "regex-automata", -@@ -36,9 +36,9 @@ dependencies = [ - - [[package]] - name = "cc" --version = "1.0.83" -+version = "1.0.90" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" -+checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" - dependencies = [ - "jobserver", - "libc", -@@ -52,44 +52,37 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - - [[package]] - name = "crossbeam-channel" --version = "0.5.10" -+version = "0.5.12" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "82a9b73a36529d9c47029b9fb3a6f0ea3cc916a261195352ba19e770fc1748b2" -+checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" - dependencies = [ -- "cfg-if", - "crossbeam-utils", - ] - - [[package]] - name = "crossbeam-deque" --version = "0.8.4" -+version = "0.8.5" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "fca89a0e215bab21874660c67903c5f143333cab1da83d041c7ded6053774751" -+checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" - dependencies = [ -- "cfg-if", - "crossbeam-epoch", - "crossbeam-utils", - ] - - [[package]] - name = "crossbeam-epoch" --version = "0.9.17" -+version = "0.9.18" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "0e3681d554572a651dda4186cd47240627c3d0114d45a95f6ad27f2f22e7548d" -+checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" - dependencies = [ -- "autocfg", -- "cfg-if", - "crossbeam-utils", - ] - - [[package]] - name = "crossbeam-utils" --version = "0.8.18" -+version = "0.8.19" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "c3a430a770ebd84726f584a90ee7f020d28db52c6d02138900f22341f866d39c" --dependencies = [ -- "cfg-if", --] -+checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" - - [[package]] - name = "encoding_rs" -@@ -257,9 +250,9 @@ dependencies = [ - - [[package]] - name = "jobserver" --version = "0.1.27" -+version = "0.1.28" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" -+checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6" - dependencies = [ - "libc", - ] -@@ -272,9 +265,9 @@ checksum = "baff4b617f7df3d896f97fe922b64817f6cd9a756bb81d40f8883f2f66dcb401" - - [[package]] - name = "libc" --version = "0.2.151" -+version = "0.2.153" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4" -+checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" - - [[package]] - name = "libm" -@@ -284,9 +277,9 @@ checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" - - [[package]] - name = "log" --version = "0.4.20" -+version = "0.4.21" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" -+checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" - - [[package]] - name = "memchr" -@@ -296,18 +289,18 @@ checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" - - [[package]] - name = "memmap2" --version = "0.9.3" -+version = "0.9.4" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "45fd3a57831bf88bc63f8cebc0cf956116276e97fef3966103e96416209f7c92" -+checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" - dependencies = [ - "libc", - ] - - [[package]] - name = "num-traits" --version = "0.2.17" -+version = "0.2.18" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" -+checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" - dependencies = [ - "autocfg", - "libm", -@@ -347,15 +340,15 @@ dependencies = [ - - [[package]] - name = "pkg-config" --version = "0.3.28" -+version = "0.3.30" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "69d3587f8a9e599cc7ec2c00e331f71c4e69a5f9a4b8a6efd5b07466b9736f9a" -+checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" - - [[package]] - name = "proc-macro2" --version = "1.0.76" -+version = "1.0.78" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" -+checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" - dependencies = [ - "unicode-ident", - ] -@@ -371,9 +364,9 @@ dependencies = [ - - [[package]] - name = "regex" --version = "1.10.2" -+version = "1.10.3" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" -+checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" - dependencies = [ - "aho-corasick", - "memchr", -@@ -383,9 +376,9 @@ dependencies = [ - - [[package]] - name = "regex-automata" --version = "0.4.3" -+version = "0.4.6" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" -+checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" - dependencies = [ - "aho-corasick", - "memchr", -@@ -419,9 +412,9 @@ dependencies = [ - - [[package]] - name = "ryu" --version = "1.0.16" -+version = "1.0.17" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" -+checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" - - [[package]] - name = "same-file" -@@ -434,18 +427,18 @@ dependencies = [ - - [[package]] - name = "serde" --version = "1.0.195" -+version = "1.0.197" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "63261df402c67811e9ac6def069e4786148c4563f4b50fd4bf30aa370d626b02" -+checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" - dependencies = [ - "serde_derive", - ] - - [[package]] - name = "serde_derive" --version = "1.0.195" -+version = "1.0.197" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "46fe8f8603d81ba86327b23a2e9cdf49e1255fb94a4c5f297f6ee0547178ea2c" -+checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" - dependencies = [ - "proc-macro2", - "quote", -@@ -454,9 +447,9 @@ dependencies = [ - - [[package]] - name = "serde_json" --version = "1.0.111" -+version = "1.0.114" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "176e46fa42316f18edd598015a5166857fc835ec732f5215eac6b7bdbf0a84f4" -+checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" - dependencies = [ - "itoa", - "ryu", -@@ -465,9 +458,9 @@ dependencies = [ - - [[package]] - name = "syn" --version = "2.0.48" -+version = "2.0.52" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" -+checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07" - dependencies = [ - "proc-macro2", - "quote", -@@ -476,18 +469,18 @@ dependencies = [ - - [[package]] - name = "termcolor" --version = "1.4.0" -+version = "1.4.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449" -+checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" - dependencies = [ - "winapi-util", - ] - - [[package]] - name = "textwrap" --version = "0.16.0" -+version = "0.16.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" -+checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9" - - [[package]] - name = "unicode-ident" -@@ -497,9 +490,9 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" - - [[package]] - name = "walkdir" --version = "2.4.0" -+version = "2.5.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" -+checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" - dependencies = [ - "same-file", - "winapi-util", -From e9abbc1a02de29dbe60e1b625d540c58759b23a6 Mon Sep 17 00:00:00 2001 -From: Andrew Gallant <jamslam@gmail.com> -Date: Thu, 7 Mar 2024 09:31:22 -0500 -Subject: [PATCH] cargo: nuke 'simd-accel' from orbit - -This feature causes nothing but problems and is frequently broken. The -only optimization it was enabling were SIMD optimizations for -transcoding. In particular, for UTF-16 transcoding. This is performed by -the [`encoding_rs`](https://github.com/hsivonen/encoding_rs) crate, -which specifically uses unstable portable SIMD APIs instead of the -stable non-portable SIMD APIs. - -SIMD optimizations that apply to search have long been making use of -stable APIs, and are automatically enabled when your target supports -them. This is, IMO, the correct user experience and one that -`encoding_rs` refuses to support. I'm done dealing with it, so -transcoding will only use scalar code until the SIMD optimizations in -`encoding_rs` work on stable. (This doesn't mean that `encoding_rs` has -to change. This could also be fixed by stabilizing `std::simd`.) - -Fixes #2748 ---- - CHANGELOG.md | 5 +++++ - Cargo.lock | 33 -------------------------------- - Cargo.toml | 1 - - README.md | 22 +++++++-------------- - crates/core/flags/doc/version.rs | 3 --- - crates/grep/Cargo.toml | 4 ++-- - crates/searcher/Cargo.toml | 5 ++--- - 7 files changed, 16 insertions(+), 57 deletions(-) - -diff --git a/CHANGELOG.md b/CHANGELOG.md -index fafff6e5f..8f737f8c6 100644 ---- CHANGELOG.md -+++ CHANGELOG.md -@@ -2,6 +2,11 @@ TBD - === - Unreleased changes. Release notes have not yet been written. - -+Miscellaneous: -+ -+* [MISC #2748](https://github.com/BurntSushi/ripgrep/issues/2748): -+ Remove ripgrep's `simd-accel` feature because it was frequently broken. -+ - - 14.1.0 (2024-01-06) - =================== -diff --git a/Cargo.lock b/Cargo.lock -index 45f56f74a..603bdcba2 100644 ---- Cargo.lock -+++ Cargo.lock -@@ -17,12 +17,6 @@ version = "1.0.80" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1" - --[[package]] --name = "autocfg" --version = "1.1.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" -- - [[package]] - name = "bstr" - version = "1.9.1" -@@ -91,7 +85,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" - dependencies = [ - "cfg-if", -- "packed_simd", - ] - - [[package]] -@@ -269,12 +262,6 @@ version = "0.2.153" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" - --[[package]] --name = "libm" --version = "0.2.8" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" -- - [[package]] - name = "log" - version = "0.4.21" -@@ -296,26 +283,6 @@ dependencies = [ - "libc", - ] - --[[package]] --name = "num-traits" --version = "0.2.18" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" --dependencies = [ -- "autocfg", -- "libm", --] -- --[[package]] --name = "packed_simd" --version = "0.3.9" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "1f9f08af0c877571712e2e3e686ad79efad9657dbf0f7c3c8ba943ff6c38932d" --dependencies = [ -- "cfg-if", -- "num-traits", --] -- - [[package]] - name = "pcre2" - version = "0.2.6" -diff --git a/Cargo.toml b/Cargo.toml -index da350bc81..6bb068b81 100644 ---- Cargo.toml -+++ Cargo.toml -@@ -68,7 +68,6 @@ serde_derive = "1.0.77" - walkdir = "2" - - [features] --simd-accel = ["grep/simd-accel"] - pcre2 = ["grep/pcre2"] - - [profile.release] -diff --git a/README.md b/README.md -index 0821fab58..251c85630 100644 ---- README.md -+++ README.md -@@ -432,18 +432,13 @@ $ ./target/release/rg --version - 0.1.3 - ``` - --If you have a Rust nightly compiler and a recent Intel CPU, then you can enable --additional optional SIMD acceleration like so: -- --``` --RUSTFLAGS="-C target-cpu=native" cargo build --release --features 'simd-accel' --``` -- --The `simd-accel` feature enables SIMD support in certain ripgrep dependencies --(responsible for transcoding). They are not necessary to get SIMD optimizations --for search; those are enabled automatically. Hopefully, some day, the --`simd-accel` feature will similarly become unnecessary. **WARNING:** Currently, --enabling this option can increase compilation times dramatically. -+**NOTE:** In the past, ripgrep supported a `simd-accel` Cargo feature when -+using a Rust nightly compiler. This only benefited UTF-16 transcoding. -+Since it required unstable features, this build mode was prone to breakage. -+Because of that, support for it has been removed. If you want SIMD -+optimizations for UTF-16 transcoding, then you'll have to petition the -+[`encoding_rs`](https://github.com/hsivonen/encoding_rs) project to use stable -+APIs. - - Finally, optional PCRE2 support can be built with ripgrep by enabling the - `pcre2` feature: -@@ -452,9 +447,6 @@ Finally, optional PCRE2 support can be built with ripgrep by enabling the - $ cargo build --release --features 'pcre2' - ``` - --(Tip: use `--features 'pcre2 simd-accel'` to also include compile time SIMD --optimizations, which will only work with a nightly compiler.) -- - Enabling the PCRE2 feature works with a stable Rust compiler and will - attempt to automatically find and link with your system's PCRE2 library via - `pkg-config`. If one doesn't exist, then ripgrep will build PCRE2 from source -diff --git a/crates/core/flags/doc/version.rs b/crates/core/flags/doc/version.rs -index 8e52861f2..d238ba0cd 100644 ---- crates/core/flags/doc/version.rs -+++ crates/core/flags/doc/version.rs -@@ -161,9 +161,6 @@ fn compile_cpu_features() -> Vec<String> { - fn features() -> Vec<String> { - let mut features = vec![]; - -- let simd_accel = cfg!(feature = "simd-accel"); -- features.push(format!("{sign}simd-accel", sign = sign(simd_accel))); -- - let pcre2 = cfg!(feature = "pcre2"); - features.push(format!("{sign}pcre2", sign = sign(pcre2))); - -diff --git a/crates/grep/Cargo.toml b/crates/grep/Cargo.toml -index 48369c867..a615f48f4 100644 ---- crates/grep/Cargo.toml -+++ crates/grep/Cargo.toml -@@ -26,8 +26,8 @@ termcolor = "1.0.4" - walkdir = "2.2.7" - - [features] --simd-accel = ["grep-searcher/simd-accel"] - pcre2 = ["grep-pcre2"] - --# This feature is DEPRECATED. Runtime dispatch is used for SIMD now. -+# These features are DEPRECATED. Runtime dispatch is used for SIMD now. -+simd-accel = [] - avx-accel = [] -diff --git a/crates/searcher/Cargo.toml b/crates/searcher/Cargo.toml -index eeb805d3c..05ccad3f9 100644 ---- crates/searcher/Cargo.toml -+++ crates/searcher/Cargo.toml -@@ -27,7 +27,6 @@ grep-regex = { version = "0.1.12", path = "../regex" } - regex = "1.9.5" - - [features] --simd-accel = ["encoding_rs/simd-accel"] -- --# This feature is DEPRECATED. Runtime dispatch is used for SIMD now. -+# These features are DEPRECATED. Runtime dispatch is used for SIMD now. -+simd-accel = [] - avx-accel = []