From ac3528654251c3019d5a691baa46a9e9afc38a88 Mon Sep 17 00:00:00 2001 From: brave-builds <45370463+brave-builds@users.noreply.github.com> Date: Tue, 23 Jan 2024 22:46:48 +0100 Subject: [PATCH] bump adblock to 0.8.4 (uplift to 1.62.x) (#21715) Uplift of #21705 (squashed) to release --- third_party/rust/Cargo.lock | 2 +- third_party/rust/adblock/v0_8/BUILD.gn | 2 +- third_party/rust/adblock/v0_8/crate/Cargo.toml | 2 +- third_party/rust/adblock/v0_8/crate/src/blocker.rs | 1 + third_party/rust/third_party.toml | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/third_party/rust/Cargo.lock b/third_party/rust/Cargo.lock index 1595d65b9f48..9cac03f40a9b 100644 --- a/third_party/rust/Cargo.lock +++ b/third_party/rust/Cargo.lock @@ -4,7 +4,7 @@ version = 3 [[package]] name = "adblock" -version = "0.8.3" +version = "0.8.4" dependencies = [ "base64", "bitflags", diff --git a/third_party/rust/adblock/v0_8/BUILD.gn b/third_party/rust/adblock/v0_8/BUILD.gn index 25067b6cf2d8..3f794bd9a493 100644 --- a/third_party/rust/adblock/v0_8/BUILD.gn +++ b/third_party/rust/adblock/v0_8/BUILD.gn @@ -45,7 +45,7 @@ cargo_crate("lib") { # Unit tests skipped. Generate with --with-tests to include them. build_native_rust_unit_tests = false edition = "2021" - cargo_pkg_version = "0.8.3" + cargo_pkg_version = "0.8.4" cargo_pkg_authors = "Andrius Aucinas , Anton Lazarev " cargo_pkg_name = "adblock" diff --git a/third_party/rust/adblock/v0_8/crate/Cargo.toml b/third_party/rust/adblock/v0_8/crate/Cargo.toml index 697fc7baa871..b748e9205669 100644 --- a/third_party/rust/adblock/v0_8/crate/Cargo.toml +++ b/third_party/rust/adblock/v0_8/crate/Cargo.toml @@ -12,7 +12,7 @@ [package] edition = "2021" name = "adblock" -version = "0.8.3" +version = "0.8.4" authors = [ "Andrius Aucinas ", "Anton Lazarev ", diff --git a/third_party/rust/adblock/v0_8/crate/src/blocker.rs b/third_party/rust/adblock/v0_8/crate/src/blocker.rs index e69c058310dd..78d7edd1c698 100644 --- a/third_party/rust/adblock/v0_8/crate/src/blocker.rs +++ b/third_party/rust/adblock/v0_8/crate/src/blocker.rs @@ -800,6 +800,7 @@ impl NetworkFilterList { }; optimized.append(&mut unoptimizable); + optimized.shrink_to_fit(); optimized_map.insert(key, optimized); } diff --git a/third_party/rust/third_party.toml b/third_party/rust/third_party.toml index 28e063135b32..787fa0d4d0ca 100644 --- a/third_party/rust/third_party.toml +++ b/third_party/rust/third_party.toml @@ -239,7 +239,7 @@ if (is_mac) { ''' [dependencies.adblock] -version = "0.8.3" +version = "0.8.4" default-features = false features = ["full-regex-handling", "regex-debug-info", "css-validation"] gn-variables-lib = '''