Skip to content

Commit c5503d7

Browse files
committed
Bug 1854045 - Update regex to 1.9.4. r=emilio,supply-chain-reviewers
The main side effect is the upgrade of aho-corasick to 1.1, which contains a SIMD implementation for aarch64. Differential Revision: https://phabricator.services.mozilla.com/D188673
1 parent 381c3f1 commit c5503d7

File tree

404 files changed

+118806
-34532
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

404 files changed

+118806
-34532
lines changed

Cargo.lock

+18-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

supply-chain/audits.toml

+6
Original file line numberDiff line numberDiff line change
@@ -4547,6 +4547,12 @@ user-id = 189 # Andrew Gallant (BurntSushi)
45474547
start = "2019-02-27"
45484548
end = "2024-05-03"
45494549

4550+
[[trusted.regex-automata]]
4551+
criteria = "safe-to-deploy"
4552+
user-id = 189 # Andrew Gallant (BurntSushi)
4553+
start = "2019-02-25"
4554+
end = "2024-09-20"
4555+
45504556
[[trusted.regex-syntax]]
45514557
criteria = "safe-to-deploy"
45524558
user-id = 189 # Andrew Gallant (BurntSushi)

supply-chain/imports.lock

+28
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,13 @@ user-id = 189
88
user-login = "BurntSushi"
99
user-name = "Andrew Gallant"
1010

11+
[[publisher.aho-corasick]]
12+
version = "1.1.0"
13+
when = "2023-09-18"
14+
user-id = 189
15+
user-login = "BurntSushi"
16+
user-name = "Andrew Gallant"
17+
1118
[[publisher.anstyle]]
1219
version = "1.0.3"
1320
when = "2023-09-11"
@@ -412,13 +419,34 @@ user-id = 189
412419
user-login = "BurntSushi"
413420
user-name = "Andrew Gallant"
414421

422+
[[publisher.regex]]
423+
version = "1.9.4"
424+
when = "2023-08-26"
425+
user-id = 189
426+
user-login = "BurntSushi"
427+
user-name = "Andrew Gallant"
428+
429+
[[publisher.regex-automata]]
430+
version = "0.3.7"
431+
when = "2023-08-26"
432+
user-id = 189
433+
user-login = "BurntSushi"
434+
user-name = "Andrew Gallant"
435+
415436
[[publisher.regex-syntax]]
416437
version = "0.6.28"
417438
when = "2022-11-05"
418439
user-id = 189
419440
user-login = "BurntSushi"
420441
user-name = "Andrew Gallant"
421442

443+
[[publisher.regex-syntax]]
444+
version = "0.7.5"
445+
when = "2023-08-26"
446+
user-id = 189
447+
user-login = "BurntSushi"
448+
user-name = "Andrew Gallant"
449+
422450
[[publisher.rust_cascade]]
423451
version = "1.5.0"
424452
when = "2023-04-05"
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"files":{"COPYING":"01c266bced4a434da0051174d6bee16a4c82cf634e2679b6155d40d75012390f","Cargo.toml":"c9b1b15e299ba4e6ed0d6f25cde30b26b13b6068a7fbd980000c37bca19b0104","DESIGN.md":"64ff45ea2a89d4c32b29af91acb7743a861fcac417cb94fde8e6559405d603b2","LICENSE-MIT":"0f96a83840e146e43c0ec96a22ec1f392e0680e6c1226e6f3ba87e0740af850f","README.md":"5999e5768f5da8ab9b50c016766b5185b4c79936c56bef6d311ddcb0a38c4b94","UNLICENSE":"7e12e5df4bae12cb21581ba157ced20e1986a0508dd10d0e8a4ab9a4cf94e85c","rustfmt.toml":"1ca600239a27401c4a43f363cf3f38183a212affc1f31bff3ae93234bbaec228","src/ahocorasick.rs":"b92c9a65c4ee8029ff5a710aa1514caf838e73072c177dff5375463769f0b1ce","src/automaton.rs":"931af0aad03079bc4f6400d573fce832ce1edeeaf196815a16750d57b54b2183","src/buffer.rs":"dae7ee7c1f846ca9cf115ba4949484000e1837b4fb7311f8d8c9a35011c9c26f","src/byte_frequencies.rs":"2fb85b381c038c1e44ce94294531cdcd339dca48b1e61f41455666e802cbbc9e","src/classes.rs":"99a53a2ed8eea8c13699def90e31dfdff9d0b90572b1db3cb534e3396e7a0ed0","src/dfa.rs":"25e4455b3e179a7e192108d05f3683993456b36e3ebed99f827558c52525b7e6","src/error.rs":"d34c2c9c815df5d9dedc46b4b3ce109cd2cee07825de643f0c574ec960367beb","src/lib.rs":"7a47d4c87f83e0e7ddf0777a71e4858904e73477ce18404cb89e656070e86aef","src/nfa.rs":"3b817b4aa85540e8c0d35aff7ed7cfbab70ec7d2aaa779d63b4f5369bff31ce1","src/packed/api.rs":"df42e7500c94c9de1ac44145a0dd99ea02047e6bba229da12f2575337beebcf0","src/packed/mod.rs":"ad2f8e18996737347a1181a4457387276d139315bcabfc5e34494af0c0319701","src/packed/pattern.rs":"3abf3835d4c4f8a43753c52936a894d819f713f233fc046e19de5ef95200dcce","src/packed/rabinkarp.rs":"ad7d4533f96aed336e29c5553657ae57b0d733ace9c707a6cf4d08d8fc6edee5","src/packed/teddy/README.md":"b4b83fb5afafbbea6cb76fe70f49cc8ced888f682d98abe5ea5773e95d9ec2b0","src/packed/teddy/compile.rs":"aad40b3f93d2c388b409b31fb2795d414a365237789d5b1a7510d97ceb8ce260","src/packed/teddy/mod.rs":"83b52bd80272970ad17234d0db293d17c1710ec582302bf516b203c8edec037e","src/packed/teddy/runtime.rs":"836146e90b320b14fa2c65fe4af7915a41f6fb04408aac5fac731c22ff46adae","src/packed/tests.rs":"b8dc4d3281ecd6d0fa2bf7ef16cf292a467dfdce64e470c7921e983bfa60fee2","src/packed/vector.rs":"ab3c0535fca5f09198d58cbfae44c292aeb3ce44bc92bca36d30dc72963639fc","src/prefilter.rs":"82a3eb6d5c0c3f10bc8d5f57d55d6d14cf4cf21c475bb5253e1921084063b8d7","src/state_id.rs":"519ec8c7bf3fa72103d4c561c193759759f535dca924c9853efe630f406d2029","src/tests.rs":"ee9b85f3c27cb2fba5796e5be8019aafecc13ee9a4f614553f2bc8953f51c6de"},"package":"cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac"}
1+
{"files":{"COPYING":"01c266bced4a434da0051174d6bee16a4c82cf634e2679b6155d40d75012390f","Cargo.toml":"55608b09e18c96a0c245d8af2546e63bb4576fa378c1f2ce38c7909f3b225007","DESIGN.md":"59c960e1b73b1d7fb41e4df6c0c1b1fcf44dd2ebc8a349597a7d0595f8cb5130","LICENSE-MIT":"0f96a83840e146e43c0ec96a22ec1f392e0680e6c1226e6f3ba87e0740af850f","README.md":"afc4d559a98cf190029af0bf320fc0022725e349cd2a303aac860254e28f3c53","UNLICENSE":"7e12e5df4bae12cb21581ba157ced20e1986a0508dd10d0e8a4ab9a4cf94e85c","rustfmt.toml":"1ca600239a27401c4a43f363cf3f38183a212affc1f31bff3ae93234bbaec228","src/ahocorasick.rs":"c699c07df70be45c666e128509ad571a7649d2073e4ae16ac1efd6793c9c6890","src/automaton.rs":"22258a3e118672413119f8f543a9b912cce954e63524575c0ebfdf9011f9c2dd","src/dfa.rs":"c495d615545981e1d0a4174bf0a6ab87fd81c30c7d4527acf2d64a56323bdc36","src/lib.rs":"2a92d5c5e930f2d306508802e8a929135e1f41c9f5f8deda8f7eb98947179dd2","src/macros.rs":"c6c52ae05b24433cffaca7b78b3645d797862c5d5feffddf9f54909095ed6e05","src/nfa/contiguous.rs":"aeb6ee5fd80eea04decbc4b46aa27d1ab270b78d416a644da25b7934f009ee66","src/nfa/mod.rs":"ee7b3109774d14bbad5239c16bb980dd6b8185ec136d94fbaf2f0dc27d5ffa15","src/nfa/noncontiguous.rs":"de94f02b04efd8744fb096759a8897c22012b0e0ca3ace161fd87c71befefe04","src/packed/api.rs":"160d3b10823316f7b0924e13c3afd222c8a7db5c0a00432401f311ef27d6a1b7","src/packed/ext.rs":"66be06fde8558429da23a290584d4b9fae665bf64c2578db4fe5f5f3ee864869","src/packed/mod.rs":"0020cd6f07ba5c8955923a9516d7f758864260eda53a6b6f629131c45ddeec62","src/packed/pattern.rs":"1e3a289a730c141fc30b295811e372d046c6619c7fd670308299b889a06c7673","src/packed/rabinkarp.rs":"403146eb1d838a84601d171393542340513cd1ee7ff750f2372161dd47746586","src/packed/teddy/README.md":"3a43194b64e221543d885176aba3beb1224a927385a20eca842daf6b0ea2f342","src/packed/teddy/builder.rs":"720735ea6c7ff92b081426513e6e82feed24a922849297bb538d28f7b8129f81","src/packed/teddy/generic.rs":"ea252ab05b32cea7dd9d71e332071d243db7dd0362e049252a27e5881ba2bf39","src/packed/teddy/mod.rs":"17d741f7e2fb9dbac5ba7d1bd4542cf1e35e9f146ace728e23fe6bbed20028b2","src/packed/tests.rs":"8e2f56eb3890ed3876ecb47d3121996e416563127b6430110d7b516df3f83b4b","src/packed/vector.rs":"6e0400422de015e181c758ef3a4ff517fc8d0481b078a82de00f6e29e9d2e1c8","src/tests.rs":"c68192ab97b6161d0d6ee96fefd80cc7d14e4486ddcd8d1f82b5c92432c24ed5","src/transducer.rs":"02daa33a5d6dac41dcfd67f51df7c0d4a91c5131c781fb54c4de3520c585a6e1","src/util/alphabet.rs":"6dc22658a38deddc0279892035b18870d4585069e35ba7c7e649a24509acfbcc","src/util/buffer.rs":"f9e37f662c46c6ecd734458dedbe76c3bb0e84a93b6b0117c0d4ad3042413891","src/util/byte_frequencies.rs":"2fb85b381c038c1e44ce94294531cdcd339dca48b1e61f41455666e802cbbc9e","src/util/debug.rs":"ab301ad59aa912529cb97233a54a05914dd3cb2ec43e6fec7334170b97ac5998","src/util/error.rs":"ecccd60e7406305023efcc6adcc826eeeb083ab8f7fbfe3d97469438cd4c4e5c","src/util/int.rs":"4ab6dbdba10027ddec2af63a9b28ce4eee30ded0daa5d8eb068b2b55542b6039","src/util/mod.rs":"7ab28d11323ecdbd982087f32eb8bceeee84f1a2583f3aae27039c36d58cf12c","src/util/prefilter.rs":"9fa4498f18bf70478b1996c1a013698b626d15f119aa81dbc536673c9f045718","src/util/primitives.rs":"f89f3fa1d8db4e37de9ca767c6d05e346404837cade6d063bba68972fafa610b","src/util/remapper.rs":"9f12d911583a325c11806eeceb46d0dfec863cfcfa241aed84d31af73da746e5","src/util/search.rs":"6af803e08b8b8c8a33db100623f1621b0d741616524ce40893d8316897f27ffe","src/util/special.rs":"7d2f9cb9dd9771f59816e829b2d96b1239996f32939ba98764e121696c52b146"},"package":"0f2135563fb5c609d2b2b87c1e8ce7bc41b0b45430fa9661f457981503dd5bf0"}

third_party/rust/aho-corasick/Cargo.toml

+33-9
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,16 @@
1010
# See Cargo.toml.orig for the original contents.
1111

1212
[package]
13-
edition = "2018"
13+
edition = "2021"
14+
rust-version = "1.60.0"
1415
name = "aho-corasick"
15-
version = "0.7.20"
16+
version = "1.1.0"
1617
authors = ["Andrew Gallant <jamslam@gmail.com>"]
17-
exclude = ["/aho-corasick-debug"]
18+
exclude = [
19+
"/aho-corasick-debug",
20+
"/benchmarks",
21+
"/tmp",
22+
]
1823
autotests = false
1924
description = "Fast multiple substring searching."
2025
homepage = "https://github.com/BurntSushi/aho-corasick"
@@ -23,28 +28,47 @@ keywords = [
2328
"string",
2429
"search",
2530
"text",
26-
"aho",
31+
"pattern",
2732
"multi",
2833
]
2934
categories = ["text-processing"]
3035
license = "Unlicense OR MIT"
3136
repository = "https://github.com/BurntSushi/aho-corasick"
3237

38+
[package.metadata.docs.rs]
39+
all-features = true
40+
rustdoc-args = [
41+
"--cfg",
42+
"docsrs",
43+
"--generate-link-to-definition",
44+
]
45+
3346
[profile.bench]
34-
debug = true
47+
debug = 2
3548

3649
[profile.release]
37-
debug = true
50+
debug = 2
3851

3952
[lib]
4053
name = "aho_corasick"
4154

55+
[dependencies.log]
56+
version = "0.4.17"
57+
optional = true
58+
4259
[dependencies.memchr]
4360
version = "2.4.0"
61+
optional = true
4462
default-features = false
4563

46-
[dev-dependencies]
64+
[dev-dependencies.doc-comment]
65+
version = "0.3.3"
4766

4867
[features]
49-
default = ["std"]
50-
std = ["memchr/std"]
68+
default = [
69+
"std",
70+
"perf-literal",
71+
]
72+
logging = ["dep:log"]
73+
perf-literal = ["dep:memchr"]
74+
std = ["memchr?/std"]

0 commit comments

Comments
 (0)