diff --git a/Cargo.lock b/Cargo.lock index ff105d8c..f771c555 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,7 +4,7 @@ version = 3 [[package]] name = "adblock" -version = "0.9.0" +version = "0.8.11" dependencies = [ "addr", "base64 0.13.0", @@ -45,9 +45,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "0.7.19" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] @@ -776,9 +776,9 @@ checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" [[package]] name = "memchr" -version = "2.4.1" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memoffset" @@ -1090,9 +1090,21 @@ dependencies = [ [[package]] name = "regex" -version = "1.6.0" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b" +checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" dependencies = [ "aho-corasick", "memchr", @@ -1101,9 +1113,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.27" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "reqwest" diff --git a/Cargo.toml b/Cargo.toml index 4310f6c1..fb376207 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "adblock" -version = "0.9.0" +version = "0.8.11" authors = ["Anton Lazarev ", "Andrius Aucinas"] edition = "2021" @@ -39,13 +39,14 @@ rmp-serde = "0.15" lifeguard = { version = "^ 0.6.1", optional = true } cssparser = { version = "0.28", optional = true } selectors = { version = "0.23", optional = true } -serde_json = "1.0" +serde_json = { version = "1.0", optional = true } thiserror = "1.0" [dev-dependencies] criterion = "0.5" csv = "1" mock_instant = { version = "0.5" } +serde_json = "1.0" # By default, reqwest builds openssl from source, which fails on missing/incompatible system dependencies reqwest = { version = "0.11", features = ["rustls-tls"], default-features = false } futures = "0.3" @@ -90,6 +91,6 @@ object-pooling = ["lifeguard"] # disables `Send` and `Sync` on `Engine`. unsync-regex-caching = [] # disables `Send` and `Sync` on `Engine`. regex-debug-info = [] css-validation = ["cssparser", "selectors"] -content-blocking = [] +content-blocking = ["serde_json"] embedded-domain-resolver = ["addr"] # Requires setting an external domain resolver if disabled. -resource-assembler = [] +resource-assembler = ["serde_json"]