summaryrefslogtreecommitdiff
path: root/Cargo.lock
diff options
context:
space:
mode:
authordm <dm@work-pc>2022-02-16 12:06:25 +0800
committerÁrni Dagur <arni@dagur.eu>2022-02-26 22:06:53 +0100
commit86ba5b7a5f65b6579813b86a4414270f896e6424 (patch)
treeaf72d518a9be2a57f58e78d57c4ee22fd369ea90 /Cargo.lock
parentc63e6534d9d00121e773688e2ccd897c93dbdc69 (diff)
feat: include complete redirect rule feature.
1. update adblock-rust => 0.4.3 2. add `include_redirect_urls` parameter for `FilterSet.add_filter_list` and `FilterSet.add_filters` 3. add `Engine.add_resource` method. 4. add `adblock.AddResourceError` Exception 5. add `redirect_type` for `BlockerResult` 6. add some tests for these functions.
Diffstat (limited to 'Cargo.lock')
-rw-r--r--Cargo.lock139
1 files changed, 74 insertions, 65 deletions
diff --git a/Cargo.lock b/Cargo.lock
index df7e282..d6438cd 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
4 4
5[[package]] 5[[package]]
6name = "adblock" 6name = "adblock"
7version = "0.3.13" 7version = "0.4.3"
8source = "registry+https://github.com/rust-lang/crates.io-index" 8source = "registry+https://github.com/rust-lang/crates.io-index"
9checksum = "13df3d8a7e24ea2cc711b82a047ef2b9f743aa6580bea2552fcec68f0289603c" 9checksum = "52bdd00675903fd86d5d3109bb7899387c85cab52f990d14481546cb9a7102bf"
10dependencies = [ 10dependencies = [
11 "addr", 11 "addr",
12 "base64", 12 "base64",
@@ -17,7 +17,8 @@ dependencies = [
17 "once_cell", 17 "once_cell",
18 "percent-encoding", 18 "percent-encoding",
19 "regex", 19 "regex",
20 "rmp-serde", 20 "rmp-serde 0.13.7",
21 "rmp-serde 0.15.5",
21 "seahash", 22 "seahash",
22 "serde", 23 "serde",
23 "twoway", 24 "twoway",
@@ -28,7 +29,7 @@ dependencies = [
28name = "adblock" 29name = "adblock"
29version = "0.5.1" 30version = "0.5.1"
30dependencies = [ 31dependencies = [
31 "adblock 0.3.13", 32 "adblock 0.4.3",
32 "pyo3", 33 "pyo3",
33] 34]
34 35
@@ -59,9 +60,9 @@ dependencies = [
59 60
60[[package]] 61[[package]]
61name = "autocfg" 62name = "autocfg"
62version = "1.0.1" 63version = "1.1.0"
63source = "registry+https://github.com/rust-lang/crates.io-index" 64source = "registry+https://github.com/rust-lang/crates.io-index"
64checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" 65checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
65 66
66[[package]] 67[[package]]
67name = "base64" 68name = "base64"
@@ -71,9 +72,9 @@ checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
71 72
72[[package]] 73[[package]]
73name = "bitflags" 74name = "bitflags"
74version = "1.2.1" 75version = "1.3.2"
75source = "registry+https://github.com/rust-lang/crates.io-index" 76source = "registry+https://github.com/rust-lang/crates.io-index"
76checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" 77checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
77 78
78[[package]] 79[[package]]
79name = "byteorder" 80name = "byteorder"
@@ -89,9 +90,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
89 90
90[[package]] 91[[package]]
91name = "crc32fast" 92name = "crc32fast"
92version = "1.2.1" 93version = "1.3.2"
93source = "registry+https://github.com/rust-lang/crates.io-index" 94source = "registry+https://github.com/rust-lang/crates.io-index"
94checksum = "81156fece84ab6a9f2afdb109ce3ae577e42b1228441eded99bd77f627953b1a" 95checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
95dependencies = [ 96dependencies = [
96 "cfg-if", 97 "cfg-if",
97] 98]
@@ -104,9 +105,9 @@ checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
104 105
105[[package]] 106[[package]]
106name = "flate2" 107name = "flate2"
107version = "1.0.20" 108version = "1.0.22"
108source = "registry+https://github.com/rust-lang/crates.io-index" 109source = "registry+https://github.com/rust-lang/crates.io-index"
109checksum = "cd3aec53de10fe96d7d8c565eb17f2c687bb5518a2ec453b5b1252964526abe0" 110checksum = "1e6988e897c1c9c485f43b47a529cef42fde0547f9d8d41a7062518f1d8fc53f"
110dependencies = [ 111dependencies = [
111 "cfg-if", 112 "cfg-if",
112 "crc32fast", 113 "crc32fast",
@@ -126,9 +127,9 @@ dependencies = [
126 127
127[[package]] 128[[package]]
128name = "idna" 129name = "idna"
129version = "0.2.2" 130version = "0.2.3"
130source = "registry+https://github.com/rust-lang/crates.io-index" 131source = "registry+https://github.com/rust-lang/crates.io-index"
131checksum = "89829a5d69c23d348314a7ac337fe39173b61149a9864deabd260983aed48c21" 132checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8"
132dependencies = [ 133dependencies = [
133 "matches", 134 "matches",
134 "unicode-bidi", 135 "unicode-bidi",
@@ -160,48 +161,48 @@ dependencies = [
160 161
161[[package]] 162[[package]]
162name = "instant" 163name = "instant"
163version = "0.1.9" 164version = "0.1.12"
164source = "registry+https://github.com/rust-lang/crates.io-index" 165source = "registry+https://github.com/rust-lang/crates.io-index"
165checksum = "61124eeebbd69b8190558df225adf7e4caafce0d743919e5d6b19652314ec5ec" 166checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
166dependencies = [ 167dependencies = [
167 "cfg-if", 168 "cfg-if",
168] 169]
169 170
170[[package]] 171[[package]]
171name = "itertools" 172name = "itertools"
172version = "0.9.0" 173version = "0.10.3"
173source = "registry+https://github.com/rust-lang/crates.io-index" 174source = "registry+https://github.com/rust-lang/crates.io-index"
174checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b" 175checksum = "a9a9d19fa1e79b6215ff29b9d6880b706147f16e9b1dbb1e4e5947b5b02bc5e3"
175dependencies = [ 176dependencies = [
176 "either", 177 "either",
177] 178]
178 179
179[[package]] 180[[package]]
180name = "libc" 181name = "libc"
181version = "0.2.93" 182version = "0.2.118"
182source = "registry+https://github.com/rust-lang/crates.io-index" 183source = "registry+https://github.com/rust-lang/crates.io-index"
183checksum = "9385f66bf6105b241aa65a61cb923ef20efc665cb9f9bb50ac2f0c4b7f378d41" 184checksum = "06e509672465a0504304aa87f9f176f2b2b716ed8fb105ebe5c02dc6dce96a94"
184 185
185[[package]] 186[[package]]
186name = "lock_api" 187name = "lock_api"
187version = "0.4.3" 188version = "0.4.6"
188source = "registry+https://github.com/rust-lang/crates.io-index" 189source = "registry+https://github.com/rust-lang/crates.io-index"
189checksum = "5a3c91c24eae6777794bb1997ad98bbb87daf92890acab859f7eaa4320333176" 190checksum = "88943dd7ef4a2e5a4bfa2753aaab3013e34ce2533d1996fb18ef591e315e2b3b"
190dependencies = [ 191dependencies = [
191 "scopeguard", 192 "scopeguard",
192] 193]
193 194
194[[package]] 195[[package]]
195name = "matches" 196name = "matches"
196version = "0.1.8" 197version = "0.1.9"
197source = "registry+https://github.com/rust-lang/crates.io-index" 198source = "registry+https://github.com/rust-lang/crates.io-index"
198checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" 199checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f"
199 200
200[[package]] 201[[package]]
201name = "memchr" 202name = "memchr"
202version = "2.4.0" 203version = "2.4.1"
203source = "registry+https://github.com/rust-lang/crates.io-index" 204source = "registry+https://github.com/rust-lang/crates.io-index"
204checksum = "b16bd47d9e329435e309c58469fe0791c2d0d1ba96ec0954152a5ae2b04387dc" 205checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a"
205 206
206[[package]] 207[[package]]
207name = "miniz_oxide" 208name = "miniz_oxide"
@@ -224,15 +225,15 @@ dependencies = [
224 225
225[[package]] 226[[package]]
226name = "once_cell" 227name = "once_cell"
227version = "1.8.0" 228version = "1.9.0"
228source = "registry+https://github.com/rust-lang/crates.io-index" 229source = "registry+https://github.com/rust-lang/crates.io-index"
229checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56" 230checksum = "da32515d9f6e6e489d7bc9d84c71b060db7247dc035bbe44eac88cf87486d8d5"
230 231
231[[package]] 232[[package]]
232name = "parking_lot" 233name = "parking_lot"
233version = "0.11.1" 234version = "0.11.2"
234source = "registry+https://github.com/rust-lang/crates.io-index" 235source = "registry+https://github.com/rust-lang/crates.io-index"
235checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb" 236checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
236dependencies = [ 237dependencies = [
237 "instant", 238 "instant",
238 "lock_api", 239 "lock_api",
@@ -241,9 +242,9 @@ dependencies = [
241 242
242[[package]] 243[[package]]
243name = "parking_lot_core" 244name = "parking_lot_core"
244version = "0.8.3" 245version = "0.8.5"
245source = "registry+https://github.com/rust-lang/crates.io-index" 246source = "registry+https://github.com/rust-lang/crates.io-index"
246checksum = "fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018" 247checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216"
247dependencies = [ 248dependencies = [
248 "cfg-if", 249 "cfg-if",
249 "instant", 250 "instant",
@@ -286,27 +287,27 @@ checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5"
286 287
287[[package]] 288[[package]]
288name = "proc-macro2" 289name = "proc-macro2"
289version = "1.0.26" 290version = "1.0.36"
290source = "registry+https://github.com/rust-lang/crates.io-index" 291source = "registry+https://github.com/rust-lang/crates.io-index"
291checksum = "a152013215dca273577e18d2bf00fa862b89b24169fb78c4c95aeb07992c9cec" 292checksum = "c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029"
292dependencies = [ 293dependencies = [
293 "unicode-xid", 294 "unicode-xid",
294] 295]
295 296
296[[package]] 297[[package]]
297name = "psl" 298name = "psl"
298version = "2.0.18" 299version = "2.0.71"
299source = "registry+https://github.com/rust-lang/crates.io-index" 300source = "registry+https://github.com/rust-lang/crates.io-index"
300checksum = "b0cbbbcd909251c04efa3c0dda636f26a9e5b91734d5ce119212528b8ba32d55" 301checksum = "2f51974f40b58fd94008d3c88fa47cf1c7a58bd4e85deb0d4390bc156b0a9625"
301dependencies = [ 302dependencies = [
302 "psl-types", 303 "psl-types",
303] 304]
304 305
305[[package]] 306[[package]]
306name = "psl-types" 307name = "psl-types"
307version = "2.0.7" 308version = "2.0.10"
308source = "registry+https://github.com/rust-lang/crates.io-index" 309source = "registry+https://github.com/rust-lang/crates.io-index"
309checksum = "66b398073e7cdd6f05934389a8f5961e3aabfa66675b6f440df4e2c793d51a4f" 310checksum = "e8eda7c62d9ecaafdf8b62374c006de0adf61666ae96a96ba74a37134aa4e470"
310 311
311[[package]] 312[[package]]
312name = "pyo3" 313name = "pyo3"
@@ -358,18 +359,18 @@ dependencies = [
358 359
359[[package]] 360[[package]]
360name = "quote" 361name = "quote"
361version = "1.0.9" 362version = "1.0.15"
362source = "registry+https://github.com/rust-lang/crates.io-index" 363source = "registry+https://github.com/rust-lang/crates.io-index"
363checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" 364checksum = "864d3e96a899863136fc6e99f3d7cae289dafe43bf2c5ac19b70df7210c0a145"
364dependencies = [ 365dependencies = [
365 "proc-macro2", 366 "proc-macro2",
366] 367]
367 368
368[[package]] 369[[package]]
369name = "redox_syscall" 370name = "redox_syscall"
370version = "0.2.5" 371version = "0.2.10"
371source = "registry+https://github.com/rust-lang/crates.io-index" 372source = "registry+https://github.com/rust-lang/crates.io-index"
372checksum = "94341e4e44e24f6b591b59e47a8a027df12e008d73fd5672dbea9cc22f4507d9" 373checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff"
373dependencies = [ 374dependencies = [
374 "bitflags", 375 "bitflags",
375] 376]
@@ -413,6 +414,17 @@ dependencies = [
413] 414]
414 415
415[[package]] 416[[package]]
417name = "rmp-serde"
418version = "0.15.5"
419source = "registry+https://github.com/rust-lang/crates.io-index"
420checksum = "723ecff9ad04f4ad92fe1c8ca6c20d2196d9286e9c60727c4cb5511629260e9d"
421dependencies = [
422 "byteorder",
423 "rmp",
424 "serde",
425]
426
427[[package]]
416name = "scopeguard" 428name = "scopeguard"
417version = "1.1.0" 429version = "1.1.0"
418source = "registry+https://github.com/rust-lang/crates.io-index" 430source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -426,18 +438,18 @@ checksum = "58f57ca1d128a43733fd71d583e837b1f22239a37ebea09cde11d8d9a9080f47"
426 438
427[[package]] 439[[package]]
428name = "serde" 440name = "serde"
429version = "1.0.125" 441version = "1.0.136"
430source = "registry+https://github.com/rust-lang/crates.io-index" 442source = "registry+https://github.com/rust-lang/crates.io-index"
431checksum = "558dc50e1a5a5fa7112ca2ce4effcb321b0300c0d4ccf0776a9f60cd89031171" 443checksum = "ce31e24b01e1e524df96f1c2fdd054405f8d7376249a5110886fb4b658484789"
432dependencies = [ 444dependencies = [
433 "serde_derive", 445 "serde_derive",
434] 446]
435 447
436[[package]] 448[[package]]
437name = "serde_derive" 449name = "serde_derive"
438version = "1.0.125" 450version = "1.0.136"
439source = "registry+https://github.com/rust-lang/crates.io-index" 451source = "registry+https://github.com/rust-lang/crates.io-index"
440checksum = "b093b7a2bb58203b5da3056c05b4ec1fed827dcfdb37347a8841695263b3d06d" 452checksum = "08597e7152fcd306f41838ed3e37be9eaeed2b61c42e2117266a554fab4662f9"
441dependencies = [ 453dependencies = [
442 "proc-macro2", 454 "proc-macro2",
443 "quote", 455 "quote",
@@ -446,15 +458,15 @@ dependencies = [
446 458
447[[package]] 459[[package]]
448name = "smallvec" 460name = "smallvec"
449version = "1.6.1" 461version = "1.8.0"
450source = "registry+https://github.com/rust-lang/crates.io-index" 462source = "registry+https://github.com/rust-lang/crates.io-index"
451checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" 463checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83"
452 464
453[[package]] 465[[package]]
454name = "syn" 466name = "syn"
455version = "1.0.69" 467version = "1.0.86"
456source = "registry+https://github.com/rust-lang/crates.io-index" 468source = "registry+https://github.com/rust-lang/crates.io-index"
457checksum = "48fe99c6bd8b1cc636890bcc071842de909d902c81ac7dab53ba33c421ab8ffb" 469checksum = "8a65b3f4ffa0092e9887669db0eae07941f023991ab58ea44da8fe8e2d511c6b"
458dependencies = [ 470dependencies = [
459 "proc-macro2", 471 "proc-macro2",
460 "quote", 472 "quote",
@@ -463,9 +475,9 @@ dependencies = [
463 475
464[[package]] 476[[package]]
465name = "tinyvec" 477name = "tinyvec"
466version = "1.2.0" 478version = "1.5.1"
467source = "registry+https://github.com/rust-lang/crates.io-index" 479source = "registry+https://github.com/rust-lang/crates.io-index"
468checksum = "5b5220f05bb7de7f3f53c7c065e1199b3172696fe2db9f9c4d8ad9b4ee74c342" 480checksum = "2c1c1d5a42b6245520c249549ec267180beaffcc0615401ac8e31853d4b6d8d2"
469dependencies = [ 481dependencies = [
470 "tinyvec_macros", 482 "tinyvec_macros",
471] 483]
@@ -478,9 +490,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
478 490
479[[package]] 491[[package]]
480name = "twoway" 492name = "twoway"
481version = "0.2.1" 493version = "0.2.2"
482source = "registry+https://github.com/rust-lang/crates.io-index" 494source = "registry+https://github.com/rust-lang/crates.io-index"
483checksum = "6b40075910de3a912adbd80b5d8bad6ad10a23eeb1f5bf9d4006839e899ba5bc" 495checksum = "c57ffb460d7c24cd6eda43694110189030a3d1dfe418416d9468fd1c1d290b47"
484dependencies = [ 496dependencies = [
485 "memchr", 497 "memchr",
486 "unchecked-index", 498 "unchecked-index",
@@ -494,27 +506,24 @@ checksum = "eeba86d422ce181a719445e51872fa30f1f7413b62becb52e95ec91aa262d85c"
494 506
495[[package]] 507[[package]]
496name = "unicode-bidi" 508name = "unicode-bidi"
497version = "0.3.5" 509version = "0.3.7"
498source = "registry+https://github.com/rust-lang/crates.io-index" 510source = "registry+https://github.com/rust-lang/crates.io-index"
499checksum = "eeb8be209bb1c96b7c177c7420d26e04eccacb0eeae6b980e35fcb74678107e0" 511checksum = "1a01404663e3db436ed2746d9fefef640d868edae3cceb81c3b8d5732fda678f"
500dependencies = [
501 "matches",
502]
503 512
504[[package]] 513[[package]]
505name = "unicode-normalization" 514name = "unicode-normalization"
506version = "0.1.17" 515version = "0.1.19"
507source = "registry+https://github.com/rust-lang/crates.io-index" 516source = "registry+https://github.com/rust-lang/crates.io-index"
508checksum = "07fbfce1c8a97d547e8b5334978438d9d6ec8c20e38f56d4a4374d181493eaef" 517checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9"
509dependencies = [ 518dependencies = [
510 "tinyvec", 519 "tinyvec",
511] 520]
512 521
513[[package]] 522[[package]]
514name = "unicode-xid" 523name = "unicode-xid"
515version = "0.2.1" 524version = "0.2.2"
516source = "registry+https://github.com/rust-lang/crates.io-index" 525source = "registry+https://github.com/rust-lang/crates.io-index"
517checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" 526checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"
518 527
519[[package]] 528[[package]]
520name = "unindent" 529name = "unindent"
@@ -524,9 +533,9 @@ checksum = "f14ee04d9415b52b3aeab06258a3f07093182b88ba0f9b8d203f211a7a7d41c7"
524 533
525[[package]] 534[[package]]
526name = "url" 535name = "url"
527version = "2.2.1" 536version = "2.2.2"
528source = "registry+https://github.com/rust-lang/crates.io-index" 537source = "registry+https://github.com/rust-lang/crates.io-index"
529checksum = "9ccd964113622c8e9322cfac19eb1004a07e636c545f325da085d5cdde6f1f8b" 538checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c"
530dependencies = [ 539dependencies = [
531 "form_urlencoded", 540 "form_urlencoded",
532 "idna", 541 "idna",