From bbfd784764f4e644c02743b915a118347ba7462c Mon Sep 17 00:00:00 2001 From: Ralph Giles Date: Tue, 30 Jan 2024 15:37:16 -0800 Subject: [PATCH] speedreader: specify the correct html5ever version kuchikiki v0.8.2-speedreader declared a dependency on html5ever 0.26, but we actually build against 0.25.1. Change the declaration here to match what we have vendored, which works fine in practice. Bump to v0.8.3-speedreader which declares a dependency compatible with what we're building against to simpilify later updates based on the Cargo.toml information. Resolves https://github.com/brave/brave-browser/issues/35708 --- components/speedreader/rust/lib/Cargo.toml | 2 +- components/speedreader/rust/lib/src/readability/Cargo.toml | 2 +- third_party/rust/kuchikiki/v0_8/README.chromium | 4 ++-- third_party/rust/kuchikiki/v0_8/crate/Cargo.toml | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/components/speedreader/rust/lib/Cargo.toml b/components/speedreader/rust/lib/Cargo.toml index 5830506268f9..38d9acfa5f4f 100644 --- a/components/speedreader/rust/lib/Cargo.toml +++ b/components/speedreader/rust/lib/Cargo.toml @@ -18,7 +18,7 @@ include = [ [dependencies] html5ever = "0.25.1" -kuchikiki = "0.8.2" +kuchikiki = { git = "https://github.com/brave/kuchikiki", rev = "2a6926e83f8849f506f3be7a4de2a0196ffb64dc" } lol_html = "0.3.0" regex = "1" serde_json = "1.0.70" diff --git a/components/speedreader/rust/lib/src/readability/Cargo.toml b/components/speedreader/rust/lib/src/readability/Cargo.toml index fa26397c1763..310f9dc66d46 100644 --- a/components/speedreader/rust/lib/src/readability/Cargo.toml +++ b/components/speedreader/rust/lib/src/readability/Cargo.toml @@ -13,7 +13,7 @@ edition = "2018" [dependencies] bitflags = "1.2" html5ever = "0.25.1" -kuchikiki = "0.8.2" +kuchikiki = { git = "https://github.com/brave/kuchikiki", rev = "2a6926e83f8849f506f3be7a4de2a0196ffb64dc" } lazy_static = "1.4" regex = "1" serde_json = "1.0" diff --git a/third_party/rust/kuchikiki/v0_8/README.chromium b/third_party/rust/kuchikiki/v0_8/README.chromium index 7d18a334e371..4f384c3571ff 100644 --- a/third_party/rust/kuchikiki/v0_8/README.chromium +++ b/third_party/rust/kuchikiki/v0_8/README.chromium @@ -1,9 +1,9 @@ Name: kuchikiki URL: https://github.com/brave/kuchikiki/tree/speedreader Description: (口利き) HTML tree manipulation library -Version: 0.8.2 +Version: 0.8.3 Security Critical: yes Shipped: yes License: MIT License File: //brave/third_party/rust/kuchikiki/v0_8/crate/LICENSE -Revision: 436b4e21274e64c5f9bc142ba6fa330fe9a8c97d +Revision: 2a6926e83f8849f506f3be7a4de2a0196ffb64dc diff --git a/third_party/rust/kuchikiki/v0_8/crate/Cargo.toml b/third_party/rust/kuchikiki/v0_8/crate/Cargo.toml index 627468a0a618..50456d54361a 100644 --- a/third_party/rust/kuchikiki/v0_8/crate/Cargo.toml +++ b/third_party/rust/kuchikiki/v0_8/crate/Cargo.toml @@ -12,7 +12,7 @@ [package] edition = "2018" name = "kuchikiki" -version = "0.8.2" +version = "0.8.3" authors = [ "Brave Authors", "Ralph Giles ", @@ -31,7 +31,7 @@ doctest = false version = "0.27" [dependencies.html5ever] -version = "0.26.0" +version = "0.25.1" [dependencies.indexmap] version = "1.6.0"