Skip to content

Commit

Permalink
update adblock-rust to v0.8.12
Browse files Browse the repository at this point in the history
  • Loading branch information
@antonok-edm
antonok-edm committed Aug 7, 2024
1 parent de6a19b commit e84f545
Show file tree
Hide file tree
Showing 42 changed files with 91 additions and 116 deletions.
2 changes: 1 addition & 1 deletion components/brave_shields/adblock/rs/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ edition = "2021"
license = "MPL-2.0"

[dependencies]
adblock = { version = "0.8.11", default-features = false, features = ["full-regex-handling", "regex-debug-info", "css-validation"] }
adblock = { version = "0.8.12", default-features = false, features = ["full-regex-handling", "regex-debug-info", "css-validation"] }
cxx = "1.0"
serde_json = "1.0"
thiserror = "1.0"
Expand Down
50 changes: 25 additions & 25 deletions third_party/rust/adblock/v0_8/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,37 +13,37 @@ cargo_crate("lib") {
crate_name = "adblock"
epoch = "0.8"
crate_type = "rlib"
crate_root = "//brave/third_party/rust/chromium_crates_io/vendor/adblock-0.8.11/src/lib.rs"
crate_root = "//brave/third_party/rust/chromium_crates_io/vendor/adblock-0.8.12/src/lib.rs"
sources = [
"//brave/third_party/rust/chromium_crates_io/vendor/adblock-0.8.11/src/blocker.rs",
"//brave/third_party/rust/chromium_crates_io/vendor/adblock-0.8.11/src/content_blocking.rs",
"//brave/third_party/rust/chromium_crates_io/vendor/adblock-0.8.11/src/cosmetic_filter_cache.rs",
"//brave/third_party/rust/chromium_crates_io/vendor/adblock-0.8.11/src/data_format/mod.rs",
"//brave/third_party/rust/chromium_crates_io/vendor/adblock-0.8.11/src/data_format/utils.rs",
"//brave/third_party/rust/chromium_crates_io/vendor/adblock-0.8.11/src/data_format/v0.rs",
"//brave/third_party/rust/chromium_crates_io/vendor/adblock-0.8.11/src/engine.rs",
"//brave/third_party/rust/chromium_crates_io/vendor/adblock-0.8.11/src/filters/cosmetic.rs",
"//brave/third_party/rust/chromium_crates_io/vendor/adblock-0.8.11/src/filters/mod.rs",
"//brave/third_party/rust/chromium_crates_io/vendor/adblock-0.8.11/src/filters/network.rs",
"//brave/third_party/rust/chromium_crates_io/vendor/adblock-0.8.11/src/lib.rs",
"//brave/third_party/rust/chromium_crates_io/vendor/adblock-0.8.11/src/lists.rs",
"//brave/third_party/rust/chromium_crates_io/vendor/adblock-0.8.11/src/optimizer.rs",
"//brave/third_party/rust/chromium_crates_io/vendor/adblock-0.8.11/src/regex_manager.rs",
"//brave/third_party/rust/chromium_crates_io/vendor/adblock-0.8.11/src/request.rs",
"//brave/third_party/rust/chromium_crates_io/vendor/adblock-0.8.11/src/resources/mod.rs",
"//brave/third_party/rust/chromium_crates_io/vendor/adblock-0.8.11/src/resources/resource_assembler.rs",
"//brave/third_party/rust/chromium_crates_io/vendor/adblock-0.8.11/src/resources/resource_storage.rs",
"//brave/third_party/rust/chromium_crates_io/vendor/adblock-0.8.11/src/url_parser/mod.rs",
"//brave/third_party/rust/chromium_crates_io/vendor/adblock-0.8.11/src/url_parser/parser.rs",
"//brave/third_party/rust/chromium_crates_io/vendor/adblock-0.8.11/src/url_parser/parser_full.rs",
"//brave/third_party/rust/chromium_crates_io/vendor/adblock-0.8.11/src/url_parser/parser_regex.rs",
"//brave/third_party/rust/chromium_crates_io/vendor/adblock-0.8.11/src/utils.rs",
"//brave/third_party/rust/chromium_crates_io/vendor/adblock-0.8.12/src/blocker.rs",
"//brave/third_party/rust/chromium_crates_io/vendor/adblock-0.8.12/src/content_blocking.rs",
"//brave/third_party/rust/chromium_crates_io/vendor/adblock-0.8.12/src/cosmetic_filter_cache.rs",
"//brave/third_party/rust/chromium_crates_io/vendor/adblock-0.8.12/src/data_format/mod.rs",
"//brave/third_party/rust/chromium_crates_io/vendor/adblock-0.8.12/src/data_format/utils.rs",
"//brave/third_party/rust/chromium_crates_io/vendor/adblock-0.8.12/src/data_format/v0.rs",
"//brave/third_party/rust/chromium_crates_io/vendor/adblock-0.8.12/src/engine.rs",
"//brave/third_party/rust/chromium_crates_io/vendor/adblock-0.8.12/src/filters/cosmetic.rs",
"//brave/third_party/rust/chromium_crates_io/vendor/adblock-0.8.12/src/filters/mod.rs",
"//brave/third_party/rust/chromium_crates_io/vendor/adblock-0.8.12/src/filters/network.rs",
"//brave/third_party/rust/chromium_crates_io/vendor/adblock-0.8.12/src/lib.rs",
"//brave/third_party/rust/chromium_crates_io/vendor/adblock-0.8.12/src/lists.rs",
"//brave/third_party/rust/chromium_crates_io/vendor/adblock-0.8.12/src/optimizer.rs",
"//brave/third_party/rust/chromium_crates_io/vendor/adblock-0.8.12/src/regex_manager.rs",
"//brave/third_party/rust/chromium_crates_io/vendor/adblock-0.8.12/src/request.rs",
"//brave/third_party/rust/chromium_crates_io/vendor/adblock-0.8.12/src/resources/mod.rs",
"//brave/third_party/rust/chromium_crates_io/vendor/adblock-0.8.12/src/resources/resource_assembler.rs",
"//brave/third_party/rust/chromium_crates_io/vendor/adblock-0.8.12/src/resources/resource_storage.rs",
"//brave/third_party/rust/chromium_crates_io/vendor/adblock-0.8.12/src/url_parser/mod.rs",
"//brave/third_party/rust/chromium_crates_io/vendor/adblock-0.8.12/src/url_parser/parser.rs",
"//brave/third_party/rust/chromium_crates_io/vendor/adblock-0.8.12/src/url_parser/parser_full.rs",
"//brave/third_party/rust/chromium_crates_io/vendor/adblock-0.8.12/src/url_parser/parser_regex.rs",
"//brave/third_party/rust/chromium_crates_io/vendor/adblock-0.8.12/src/utils.rs",
]
inputs = []

build_native_rust_unit_tests = false
edition = "2021"
cargo_pkg_version = "0.8.11"
cargo_pkg_version = "0.8.12"
cargo_pkg_authors = "Anton Lazarev <alazarev@brave.com>, Andrius Aucinas"
cargo_pkg_name = "adblock"
cargo_pkg_description = "Native Rust module for Adblock Plus syntax (e.g. EasyList, EasyPrivacy) filter parsing and matching."
Expand Down
6 changes: 3 additions & 3 deletions third_party/rust/adblock/v0_8/README.chromium
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Name: adblock
URL: https://crates.io/crates/adblock
Description: Native Rust module for Adblock Plus syntax (e.g. EasyList, EasyPrivacy) filter parsing and matching.
Version: 0.8.11
Version: 0.8.12
Security Critical: yes
Shipped: yes
License: Mozilla Public License 2.0
License File: //brave/third_party/rust/chromium_crates_io/vendor/adblock-0.8.11/LICENSE
Revision: fa1cd7df0a22cc891c103260d2ecdf0d4719e6ac
License File: //brave/third_party/rust/chromium_crates_io/vendor/adblock-0.8.12/LICENSE
Revision: e01430a534b64163e16590290bbf4df6218d16aa
2 changes: 1 addition & 1 deletion third_party/rust/chromium_crates_io/Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 0 additions & 6 deletions third_party/rust/chromium_crates_io/vendor/adblock-0.8.11/.cargo_vcs_info.json
View file

This file was deleted.

0 ...endor/adblock-0.8.11/.cargo-checksum.json → ...endor/adblock-0.8.12/.cargo-checksum.json
View file
File renamed without changes.
6 changes: 6 additions & 0 deletions third_party/rust/chromium_crates_io/vendor/adblock-0.8.12/.cargo_vcs_info.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"git": {
"sha1": "e01430a534b64163e16590290bbf4df6218d16aa"
},
"path_in_vcs": ""
}
76 changes: 24 additions & 52 deletions ...rates_io/vendor/adblock-0.8.11/Cargo.lock → ...rates_io/vendor/adblock-0.8.12/Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 3 additions & 4 deletions ...rates_io/vendor/adblock-0.8.11/Cargo.toml → ...rates_io/vendor/adblock-0.8.12/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
[package]
edition = "2021"
name = "adblock"
version = "0.8.11"
version = "0.8.12"
authors = [
"Anton Lazarev <alazarev@brave.com>",
"Andrius Aucinas",
Expand Down Expand Up @@ -58,7 +58,7 @@ name = "bench_redirect_performance"
harness = false

[dependencies.addr]
version = "0.14"
version = "0.15"
features = ["psl"]
optional = true
default-features = false
Expand Down Expand Up @@ -132,8 +132,7 @@ version = "1"
version = "0.3"

[dev-dependencies.mock_instant]
version = "0.2"
features = ["sync"]
version = "0.5"

[dev-dependencies.reqwest]
version = "0.11"
Expand Down
6 changes: 3 additions & 3 deletions ..._io/vendor/adblock-0.8.11/Cargo.toml.orig → ..._io/vendor/adblock-0.8.12/Cargo.toml.orig
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 ...m_crates_io/vendor/adblock-0.8.11/LICENSE → ...m_crates_io/vendor/adblock-0.8.12/LICENSE
View file
File renamed without changes.
0 ...crates_io/vendor/adblock-0.8.11/README.md → ...crates_io/vendor/adblock-0.8.12/README.md
View file
File renamed without changes.
0 ...0.8.11/benches/bench_cosmetic_matching.rs → ...0.8.12/benches/bench_cosmetic_matching.rs
View file
File renamed without changes.
0 .../adblock-0.8.11/benches/bench_matching.rs → .../adblock-0.8.12/benches/bench_matching.rs
View file
File renamed without changes.
0 ....11/benches/bench_redirect_performance.rs → ....12/benches/bench_redirect_performance.rs
View file
File renamed without changes.
0 ...dor/adblock-0.8.11/benches/bench_regex.rs → ...dor/adblock-0.8.12/benches/bench_regex.rs
View file
File renamed without changes.
0 ...dor/adblock-0.8.11/benches/bench_rules.rs → ...dor/adblock-0.8.12/benches/bench_rules.rs
View file
File renamed without changes.
0 ...endor/adblock-0.8.11/benches/bench_url.rs → ...endor/adblock-0.8.12/benches/bench_url.rs
View file
File renamed without changes.
0 ...vendor/adblock-0.8.11/rust-toolchain.toml → ...vendor/adblock-0.8.12/rust-toolchain.toml
View file
File renamed without changes.
0 ...s_io/vendor/adblock-0.8.11/src/blocker.rs → ...s_io/vendor/adblock-0.8.12/src/blocker.rs
View file
File renamed without changes.
0 ...or/adblock-0.8.11/src/content_blocking.rs → ...or/adblock-0.8.12/src/content_blocking.rs
View file
File renamed without changes.
0 ...block-0.8.11/src/cosmetic_filter_cache.rs → ...block-0.8.12/src/cosmetic_filter_cache.rs
View file
File renamed without changes.
0 ...dor/adblock-0.8.11/src/data_format/mod.rs → ...dor/adblock-0.8.12/src/data_format/mod.rs
View file
File renamed without changes.
0 ...r/adblock-0.8.11/src/data_format/utils.rs → ...r/adblock-0.8.12/src/data_format/utils.rs
View file
File renamed without changes.
0 ...ndor/adblock-0.8.11/src/data_format/v0.rs → ...ndor/adblock-0.8.12/src/data_format/v0.rs
View file
File renamed without changes.
0 ...es_io/vendor/adblock-0.8.11/src/engine.rs → ...es_io/vendor/adblock-0.8.12/src/engine.rs
View file
File renamed without changes.
9 changes: 7 additions & 2 deletions ...or/adblock-0.8.11/src/filters/cosmetic.rs → ...or/adblock-0.8.12/src/filters/cosmetic.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -791,11 +791,11 @@ mod css_validation {
type ExtraMatchingData = ();
type AttrValue = CssString;
type Identifier = CssIdent;
type LocalName = DummyValue;
type LocalName = CssString;
type NamespaceUrl = DummyValue;
type NamespacePrefix = DummyValue;
type BorrowedNamespaceUrl = DummyValue;
type BorrowedLocalName = DummyValue;
type BorrowedLocalName = CssString;
type NonTSPseudoClass = NonTSPseudoClass;
type PseudoElement = PseudoElement;
}
Expand Down Expand Up @@ -915,6 +915,11 @@ mod css_validation {
// opening comment to match it.
assert!(validate_css_selector(r#"input[x="*/{}*{background:url(https://hackvertor.co.uk/images/logo.gif)}"]"#, false).is_some());
}

#[test]
fn escaped_quote_in_tag_name() {
assert_eq!(validate_css_selector(r#"head\""#, false), Some(r#"head\""#.to_string()));
}
}

static RE_PLAIN_SELECTOR: Lazy<Regex> = Lazy::new(|| Regex::new(r"^[#.][\w\\-]+").unwrap());
Expand Down
0 .../vendor/adblock-0.8.11/src/filters/mod.rs → .../vendor/adblock-0.8.12/src/filters/mod.rs
View file
File renamed without changes.
0 ...dor/adblock-0.8.11/src/filters/network.rs → ...dor/adblock-0.8.12/src/filters/network.rs
View file
File renamed without changes.
0 ...rates_io/vendor/adblock-0.8.11/src/lib.rs → ...rates_io/vendor/adblock-0.8.12/src/lib.rs
View file
File renamed without changes.
0 ...tes_io/vendor/adblock-0.8.11/src/lists.rs → ...tes_io/vendor/adblock-0.8.12/src/lists.rs
View file
File renamed without changes.
Loading

0 comments on commit e84f545

Please sign in to comment.