Removed
Link Here
|
1 |
From 9bd30e8e48b139c3f5ebe8587abff6fff7add45b Mon Sep 17 00:00:00 2001 |
2 |
From: Andrew Gallant <jamslam@gmail.com> |
3 |
Date: Thu, 7 Mar 2024 09:38:22 -0500 |
4 |
Subject: [PATCH] deps: update everything |
5 |
|
6 |
--- |
7 |
Cargo.lock | 103 +++++++++++++++++++++++++---------------------------- |
8 |
1 file changed, 48 insertions(+), 55 deletions(-) |
9 |
|
10 |
diff --git a/Cargo.lock b/Cargo.lock |
11 |
index cb1065d46..45f56f74a 100644 |
12 |
--- Cargo.lock |
13 |
+++ Cargo.lock |
14 |
@@ -13,9 +13,9 @@ dependencies = [ |
15 |
|
16 |
[[package]] |
17 |
name = "anyhow" |
18 |
-version = "1.0.79" |
19 |
+version = "1.0.80" |
20 |
source = "registry+https://github.com/rust-lang/crates.io-index" |
21 |
-checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" |
22 |
+checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1" |
23 |
|
24 |
[[package]] |
25 |
name = "autocfg" |
26 |
@@ -25,9 +25,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" |
27 |
|
28 |
[[package]] |
29 |
name = "bstr" |
30 |
-version = "1.9.0" |
31 |
+version = "1.9.1" |
32 |
source = "registry+https://github.com/rust-lang/crates.io-index" |
33 |
-checksum = "c48f0051a4b4c5e0b6d365cd04af53aeaa209e3cc15ec2cdb69e73cc87fbd0dc" |
34 |
+checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" |
35 |
dependencies = [ |
36 |
"memchr", |
37 |
"regex-automata", |
38 |
@@ -36,9 +36,9 @@ dependencies = [ |
39 |
|
40 |
[[package]] |
41 |
name = "cc" |
42 |
-version = "1.0.83" |
43 |
+version = "1.0.90" |
44 |
source = "registry+https://github.com/rust-lang/crates.io-index" |
45 |
-checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" |
46 |
+checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" |
47 |
dependencies = [ |
48 |
"jobserver", |
49 |
"libc", |
50 |
@@ -52,44 +52,37 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" |
51 |
|
52 |
[[package]] |
53 |
name = "crossbeam-channel" |
54 |
-version = "0.5.10" |
55 |
+version = "0.5.12" |
56 |
source = "registry+https://github.com/rust-lang/crates.io-index" |
57 |
-checksum = "82a9b73a36529d9c47029b9fb3a6f0ea3cc916a261195352ba19e770fc1748b2" |
58 |
+checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" |
59 |
dependencies = [ |
60 |
- "cfg-if", |
61 |
"crossbeam-utils", |
62 |
] |
63 |
|
64 |
[[package]] |
65 |
name = "crossbeam-deque" |
66 |
-version = "0.8.4" |
67 |
+version = "0.8.5" |
68 |
source = "registry+https://github.com/rust-lang/crates.io-index" |
69 |
-checksum = "fca89a0e215bab21874660c67903c5f143333cab1da83d041c7ded6053774751" |
70 |
+checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" |
71 |
dependencies = [ |
72 |
- "cfg-if", |
73 |
"crossbeam-epoch", |
74 |
"crossbeam-utils", |
75 |
] |
76 |
|
77 |
[[package]] |
78 |
name = "crossbeam-epoch" |
79 |
-version = "0.9.17" |
80 |
+version = "0.9.18" |
81 |
source = "registry+https://github.com/rust-lang/crates.io-index" |
82 |
-checksum = "0e3681d554572a651dda4186cd47240627c3d0114d45a95f6ad27f2f22e7548d" |
83 |
+checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" |
84 |
dependencies = [ |
85 |
- "autocfg", |
86 |
- "cfg-if", |
87 |
"crossbeam-utils", |
88 |
] |
89 |
|
90 |
[[package]] |
91 |
name = "crossbeam-utils" |
92 |
-version = "0.8.18" |
93 |
+version = "0.8.19" |
94 |
source = "registry+https://github.com/rust-lang/crates.io-index" |
95 |
-checksum = "c3a430a770ebd84726f584a90ee7f020d28db52c6d02138900f22341f866d39c" |
96 |
-dependencies = [ |
97 |
- "cfg-if", |
98 |
-] |
99 |
+checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" |
100 |
|
101 |
[[package]] |
102 |
name = "encoding_rs" |
103 |
@@ -257,9 +250,9 @@ dependencies = [ |
104 |
|
105 |
[[package]] |
106 |
name = "jobserver" |
107 |
-version = "0.1.27" |
108 |
+version = "0.1.28" |
109 |
source = "registry+https://github.com/rust-lang/crates.io-index" |
110 |
-checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" |
111 |
+checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6" |
112 |
dependencies = [ |
113 |
"libc", |
114 |
] |
115 |
@@ -272,9 +265,9 @@ checksum = "baff4b617f7df3d896f97fe922b64817f6cd9a756bb81d40f8883f2f66dcb401" |
116 |
|
117 |
[[package]] |
118 |
name = "libc" |
119 |
-version = "0.2.151" |
120 |
+version = "0.2.153" |
121 |
source = "registry+https://github.com/rust-lang/crates.io-index" |
122 |
-checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4" |
123 |
+checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" |
124 |
|
125 |
[[package]] |
126 |
name = "libm" |
127 |
@@ -284,9 +277,9 @@ checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" |
128 |
|
129 |
[[package]] |
130 |
name = "log" |
131 |
-version = "0.4.20" |
132 |
+version = "0.4.21" |
133 |
source = "registry+https://github.com/rust-lang/crates.io-index" |
134 |
-checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" |
135 |
+checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" |
136 |
|
137 |
[[package]] |
138 |
name = "memchr" |
139 |
@@ -296,18 +289,18 @@ checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" |
140 |
|
141 |
[[package]] |
142 |
name = "memmap2" |
143 |
-version = "0.9.3" |
144 |
+version = "0.9.4" |
145 |
source = "registry+https://github.com/rust-lang/crates.io-index" |
146 |
-checksum = "45fd3a57831bf88bc63f8cebc0cf956116276e97fef3966103e96416209f7c92" |
147 |
+checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" |
148 |
dependencies = [ |
149 |
"libc", |
150 |
] |
151 |
|
152 |
[[package]] |
153 |
name = "num-traits" |
154 |
-version = "0.2.17" |
155 |
+version = "0.2.18" |
156 |
source = "registry+https://github.com/rust-lang/crates.io-index" |
157 |
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" |
158 |
+checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" |
159 |
dependencies = [ |
160 |
"autocfg", |
161 |
"libm", |
162 |
@@ -347,15 +340,15 @@ dependencies = [ |
163 |
|
164 |
[[package]] |
165 |
name = "pkg-config" |
166 |
-version = "0.3.28" |
167 |
+version = "0.3.30" |
168 |
source = "registry+https://github.com/rust-lang/crates.io-index" |
169 |
-checksum = "69d3587f8a9e599cc7ec2c00e331f71c4e69a5f9a4b8a6efd5b07466b9736f9a" |
170 |
+checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" |
171 |
|
172 |
[[package]] |
173 |
name = "proc-macro2" |
174 |
-version = "1.0.76" |
175 |
+version = "1.0.78" |
176 |
source = "registry+https://github.com/rust-lang/crates.io-index" |
177 |
-checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" |
178 |
+checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" |
179 |
dependencies = [ |
180 |
"unicode-ident", |
181 |
] |
182 |
@@ -371,9 +364,9 @@ dependencies = [ |
183 |
|
184 |
[[package]] |
185 |
name = "regex" |
186 |
-version = "1.10.2" |
187 |
+version = "1.10.3" |
188 |
source = "registry+https://github.com/rust-lang/crates.io-index" |
189 |
-checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" |
190 |
+checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" |
191 |
dependencies = [ |
192 |
"aho-corasick", |
193 |
"memchr", |
194 |
@@ -383,9 +376,9 @@ dependencies = [ |
195 |
|
196 |
[[package]] |
197 |
name = "regex-automata" |
198 |
-version = "0.4.3" |
199 |
+version = "0.4.6" |
200 |
source = "registry+https://github.com/rust-lang/crates.io-index" |
201 |
-checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" |
202 |
+checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" |
203 |
dependencies = [ |
204 |
"aho-corasick", |
205 |
"memchr", |
206 |
@@ -419,9 +412,9 @@ dependencies = [ |
207 |
|
208 |
[[package]] |
209 |
name = "ryu" |
210 |
-version = "1.0.16" |
211 |
+version = "1.0.17" |
212 |
source = "registry+https://github.com/rust-lang/crates.io-index" |
213 |
-checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" |
214 |
+checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" |
215 |
|
216 |
[[package]] |
217 |
name = "same-file" |
218 |
@@ -434,18 +427,18 @@ dependencies = [ |
219 |
|
220 |
[[package]] |
221 |
name = "serde" |
222 |
-version = "1.0.195" |
223 |
+version = "1.0.197" |
224 |
source = "registry+https://github.com/rust-lang/crates.io-index" |
225 |
-checksum = "63261df402c67811e9ac6def069e4786148c4563f4b50fd4bf30aa370d626b02" |
226 |
+checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" |
227 |
dependencies = [ |
228 |
"serde_derive", |
229 |
] |
230 |
|
231 |
[[package]] |
232 |
name = "serde_derive" |
233 |
-version = "1.0.195" |
234 |
+version = "1.0.197" |
235 |
source = "registry+https://github.com/rust-lang/crates.io-index" |
236 |
-checksum = "46fe8f8603d81ba86327b23a2e9cdf49e1255fb94a4c5f297f6ee0547178ea2c" |
237 |
+checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" |
238 |
dependencies = [ |
239 |
"proc-macro2", |
240 |
"quote", |
241 |
@@ -454,9 +447,9 @@ dependencies = [ |
242 |
|
243 |
[[package]] |
244 |
name = "serde_json" |
245 |
-version = "1.0.111" |
246 |
+version = "1.0.114" |
247 |
source = "registry+https://github.com/rust-lang/crates.io-index" |
248 |
-checksum = "176e46fa42316f18edd598015a5166857fc835ec732f5215eac6b7bdbf0a84f4" |
249 |
+checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" |
250 |
dependencies = [ |
251 |
"itoa", |
252 |
"ryu", |
253 |
@@ -465,9 +458,9 @@ dependencies = [ |
254 |
|
255 |
[[package]] |
256 |
name = "syn" |
257 |
-version = "2.0.48" |
258 |
+version = "2.0.52" |
259 |
source = "registry+https://github.com/rust-lang/crates.io-index" |
260 |
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" |
261 |
+checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07" |
262 |
dependencies = [ |
263 |
"proc-macro2", |
264 |
"quote", |
265 |
@@ -476,18 +469,18 @@ dependencies = [ |
266 |
|
267 |
[[package]] |
268 |
name = "termcolor" |
269 |
-version = "1.4.0" |
270 |
+version = "1.4.1" |
271 |
source = "registry+https://github.com/rust-lang/crates.io-index" |
272 |
-checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449" |
273 |
+checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" |
274 |
dependencies = [ |
275 |
"winapi-util", |
276 |
] |
277 |
|
278 |
[[package]] |
279 |
name = "textwrap" |
280 |
-version = "0.16.0" |
281 |
+version = "0.16.1" |
282 |
source = "registry+https://github.com/rust-lang/crates.io-index" |
283 |
-checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" |
284 |
+checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9" |
285 |
|
286 |
[[package]] |
287 |
name = "unicode-ident" |
288 |
@@ -497,9 +490,9 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" |
289 |
|
290 |
[[package]] |
291 |
name = "walkdir" |
292 |
-version = "2.4.0" |
293 |
+version = "2.5.0" |
294 |
source = "registry+https://github.com/rust-lang/crates.io-index" |
295 |
-checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" |
296 |
+checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" |
297 |
dependencies = [ |
298 |
"same-file", |
299 |
"winapi-util", |
300 |
From e9abbc1a02de29dbe60e1b625d540c58759b23a6 Mon Sep 17 00:00:00 2001 |
301 |
From: Andrew Gallant <jamslam@gmail.com> |
302 |
Date: Thu, 7 Mar 2024 09:31:22 -0500 |
303 |
Subject: [PATCH] cargo: nuke 'simd-accel' from orbit |
304 |
|
305 |
This feature causes nothing but problems and is frequently broken. The |
306 |
only optimization it was enabling were SIMD optimizations for |
307 |
transcoding. In particular, for UTF-16 transcoding. This is performed by |
308 |
the [`encoding_rs`](https://github.com/hsivonen/encoding_rs) crate, |
309 |
which specifically uses unstable portable SIMD APIs instead of the |
310 |
stable non-portable SIMD APIs. |
311 |
|
312 |
SIMD optimizations that apply to search have long been making use of |
313 |
stable APIs, and are automatically enabled when your target supports |
314 |
them. This is, IMO, the correct user experience and one that |
315 |
`encoding_rs` refuses to support. I'm done dealing with it, so |
316 |
transcoding will only use scalar code until the SIMD optimizations in |
317 |
`encoding_rs` work on stable. (This doesn't mean that `encoding_rs` has |
318 |
to change. This could also be fixed by stabilizing `std::simd`.) |
319 |
|
320 |
Fixes #2748 |
321 |
--- |
322 |
CHANGELOG.md | 5 +++++ |
323 |
Cargo.lock | 33 -------------------------------- |
324 |
Cargo.toml | 1 - |
325 |
README.md | 22 +++++++-------------- |
326 |
crates/core/flags/doc/version.rs | 3 --- |
327 |
crates/grep/Cargo.toml | 4 ++-- |
328 |
crates/searcher/Cargo.toml | 5 ++--- |
329 |
7 files changed, 16 insertions(+), 57 deletions(-) |
330 |
|
331 |
diff --git a/CHANGELOG.md b/CHANGELOG.md |
332 |
index fafff6e5f..8f737f8c6 100644 |
333 |
--- CHANGELOG.md |
334 |
+++ CHANGELOG.md |
335 |
@@ -2,6 +2,11 @@ TBD |
336 |
=== |
337 |
Unreleased changes. Release notes have not yet been written. |
338 |
|
339 |
+Miscellaneous: |
340 |
+ |
341 |
+* [MISC #2748](https://github.com/BurntSushi/ripgrep/issues/2748): |
342 |
+ Remove ripgrep's `simd-accel` feature because it was frequently broken. |
343 |
+ |
344 |
|
345 |
14.1.0 (2024-01-06) |
346 |
=================== |
347 |
diff --git a/Cargo.lock b/Cargo.lock |
348 |
index 45f56f74a..603bdcba2 100644 |
349 |
--- Cargo.lock |
350 |
+++ Cargo.lock |
351 |
@@ -17,12 +17,6 @@ version = "1.0.80" |
352 |
source = "registry+https://github.com/rust-lang/crates.io-index" |
353 |
checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1" |
354 |
|
355 |
-[[package]] |
356 |
-name = "autocfg" |
357 |
-version = "1.1.0" |
358 |
-source = "registry+https://github.com/rust-lang/crates.io-index" |
359 |
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" |
360 |
- |
361 |
[[package]] |
362 |
name = "bstr" |
363 |
version = "1.9.1" |
364 |
@@ -91,7 +85,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" |
365 |
checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" |
366 |
dependencies = [ |
367 |
"cfg-if", |
368 |
- "packed_simd", |
369 |
] |
370 |
|
371 |
[[package]] |
372 |
@@ -269,12 +262,6 @@ version = "0.2.153" |
373 |
source = "registry+https://github.com/rust-lang/crates.io-index" |
374 |
checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" |
375 |
|
376 |
-[[package]] |
377 |
-name = "libm" |
378 |
-version = "0.2.8" |
379 |
-source = "registry+https://github.com/rust-lang/crates.io-index" |
380 |
-checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" |
381 |
- |
382 |
[[package]] |
383 |
name = "log" |
384 |
version = "0.4.21" |
385 |
@@ -296,26 +283,6 @@ dependencies = [ |
386 |
"libc", |
387 |
] |
388 |
|
389 |
-[[package]] |
390 |
-name = "num-traits" |
391 |
-version = "0.2.18" |
392 |
-source = "registry+https://github.com/rust-lang/crates.io-index" |
393 |
-checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" |
394 |
-dependencies = [ |
395 |
- "autocfg", |
396 |
- "libm", |
397 |
-] |
398 |
- |
399 |
-[[package]] |
400 |
-name = "packed_simd" |
401 |
-version = "0.3.9" |
402 |
-source = "registry+https://github.com/rust-lang/crates.io-index" |
403 |
-checksum = "1f9f08af0c877571712e2e3e686ad79efad9657dbf0f7c3c8ba943ff6c38932d" |
404 |
-dependencies = [ |
405 |
- "cfg-if", |
406 |
- "num-traits", |
407 |
-] |
408 |
- |
409 |
[[package]] |
410 |
name = "pcre2" |
411 |
version = "0.2.6" |
412 |
diff --git a/Cargo.toml b/Cargo.toml |
413 |
index da350bc81..6bb068b81 100644 |
414 |
--- Cargo.toml |
415 |
+++ Cargo.toml |
416 |
@@ -68,7 +68,6 @@ serde_derive = "1.0.77" |
417 |
walkdir = "2" |
418 |
|
419 |
[features] |
420 |
-simd-accel = ["grep/simd-accel"] |
421 |
pcre2 = ["grep/pcre2"] |
422 |
|
423 |
[profile.release] |
424 |
diff --git a/README.md b/README.md |
425 |
index 0821fab58..251c85630 100644 |
426 |
--- README.md |
427 |
+++ README.md |
428 |
@@ -432,18 +432,13 @@ $ ./target/release/rg --version |
429 |
0.1.3 |
430 |
``` |
431 |
|
432 |
-If you have a Rust nightly compiler and a recent Intel CPU, then you can enable |
433 |
-additional optional SIMD acceleration like so: |
434 |
- |
435 |
-``` |
436 |
-RUSTFLAGS="-C target-cpu=native" cargo build --release --features 'simd-accel' |
437 |
-``` |
438 |
- |
439 |
-The `simd-accel` feature enables SIMD support in certain ripgrep dependencies |
440 |
-(responsible for transcoding). They are not necessary to get SIMD optimizations |
441 |
-for search; those are enabled automatically. Hopefully, some day, the |
442 |
-`simd-accel` feature will similarly become unnecessary. **WARNING:** Currently, |
443 |
-enabling this option can increase compilation times dramatically. |
444 |
+**NOTE:** In the past, ripgrep supported a `simd-accel` Cargo feature when |
445 |
+using a Rust nightly compiler. This only benefited UTF-16 transcoding. |
446 |
+Since it required unstable features, this build mode was prone to breakage. |
447 |
+Because of that, support for it has been removed. If you want SIMD |
448 |
+optimizations for UTF-16 transcoding, then you'll have to petition the |
449 |
+[`encoding_rs`](https://github.com/hsivonen/encoding_rs) project to use stable |
450 |
+APIs. |
451 |
|
452 |
Finally, optional PCRE2 support can be built with ripgrep by enabling the |
453 |
`pcre2` feature: |
454 |
@@ -452,9 +447,6 @@ Finally, optional PCRE2 support can be built with ripgrep by enabling the |
455 |
$ cargo build --release --features 'pcre2' |
456 |
``` |
457 |
|
458 |
-(Tip: use `--features 'pcre2 simd-accel'` to also include compile time SIMD |
459 |
-optimizations, which will only work with a nightly compiler.) |
460 |
- |
461 |
Enabling the PCRE2 feature works with a stable Rust compiler and will |
462 |
attempt to automatically find and link with your system's PCRE2 library via |
463 |
`pkg-config`. If one doesn't exist, then ripgrep will build PCRE2 from source |
464 |
diff --git a/crates/core/flags/doc/version.rs b/crates/core/flags/doc/version.rs |
465 |
index 8e52861f2..d238ba0cd 100644 |
466 |
--- crates/core/flags/doc/version.rs |
467 |
+++ crates/core/flags/doc/version.rs |
468 |
@@ -161,9 +161,6 @@ fn compile_cpu_features() -> Vec<String> { |
469 |
fn features() -> Vec<String> { |
470 |
let mut features = vec![]; |
471 |
|
472 |
- let simd_accel = cfg!(feature = "simd-accel"); |
473 |
- features.push(format!("{sign}simd-accel", sign = sign(simd_accel))); |
474 |
- |
475 |
let pcre2 = cfg!(feature = "pcre2"); |
476 |
features.push(format!("{sign}pcre2", sign = sign(pcre2))); |
477 |
|
478 |
diff --git a/crates/grep/Cargo.toml b/crates/grep/Cargo.toml |
479 |
index 48369c867..a615f48f4 100644 |
480 |
--- crates/grep/Cargo.toml |
481 |
+++ crates/grep/Cargo.toml |
482 |
@@ -26,8 +26,8 @@ termcolor = "1.0.4" |
483 |
walkdir = "2.2.7" |
484 |
|
485 |
[features] |
486 |
-simd-accel = ["grep-searcher/simd-accel"] |
487 |
pcre2 = ["grep-pcre2"] |
488 |
|
489 |
-# This feature is DEPRECATED. Runtime dispatch is used for SIMD now. |
490 |
+# These features are DEPRECATED. Runtime dispatch is used for SIMD now. |
491 |
+simd-accel = [] |
492 |
avx-accel = [] |
493 |
diff --git a/crates/searcher/Cargo.toml b/crates/searcher/Cargo.toml |
494 |
index eeb805d3c..05ccad3f9 100644 |
495 |
--- crates/searcher/Cargo.toml |
496 |
+++ crates/searcher/Cargo.toml |
497 |
@@ -27,7 +27,6 @@ grep-regex = { version = "0.1.12", path = "../regex" } |
498 |
regex = "1.9.5" |
499 |
|
500 |
[features] |
501 |
-simd-accel = ["encoding_rs/simd-accel"] |
502 |
- |
503 |
-# This feature is DEPRECATED. Runtime dispatch is used for SIMD now. |
504 |
+# These features are DEPRECATED. Runtime dispatch is used for SIMD now. |
505 |
+simd-accel = [] |
506 |
avx-accel = [] |
507 |
- |