0
0
mirror of https://github.com/neon-mmd/websurfx.git synced 2024-12-22 04:18:21 -05:00

Merge branch 'rolling' into wikipedia

This commit is contained in:
mergify[bot] 2024-12-02 20:36:29 +00:00 committed by GitHub
commit 4b645505d9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 101 additions and 96 deletions

View File

@ -1,13 +1,14 @@
pull_request_rules:
- name: Automatic merge on approval
conditions:
queue_rules:
- name: default
queue_conditions:
- "#approved-reviews-by>=2"
- check-success=build (stable)
- check-success=CodeFactor
- check-success=Rust project
actions:
queue:
method: squash
merge_conditions: []
merge_method: squash
pull_request_rules:
- name: automatic update of pull requests where more 5 commits behind
conditions:
- "#commits-behind>5"
@ -17,4 +18,8 @@ pull_request_rules:
conditions:
- merged
actions:
delete_head_branch: {}
delete_head_branch: {}
- name: Automatic merge on approval
conditions: []
actions:
queue:

168
Cargo.lock generated
View File

@ -112,7 +112,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e01ed3140b2f8d422c68afa1ed2e85d996ea619c988ac834d255db32138655cb"
dependencies = [
"quote 1.0.37",
"syn 2.0.79",
"syn 2.0.90",
]
[[package]]
@ -227,9 +227,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f591380e2e68490b5dfaf1dd1aa0ebe78d84ba7067078512b4ea6e4492d622b8"
dependencies = [
"actix-router",
"proc-macro2 1.0.86",
"proc-macro2 1.0.92",
"quote 1.0.37",
"syn 2.0.79",
"syn 2.0.90",
]
[[package]]
@ -382,9 +382,9 @@ version = "0.1.83"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd"
dependencies = [
"proc-macro2 1.0.86",
"proc-macro2 1.0.92",
"quote 1.0.37",
"syn 2.0.79",
"syn 2.0.90",
]
[[package]]
@ -482,9 +482,9 @@ checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
[[package]]
name = "blake3"
version = "1.5.4"
version = "1.5.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d82033247fd8e890df8f740e407ad4d038debb9eb1f40533fffb32e7d17dc6f7"
checksum = "b8ee0c1824c4dea5b5f81736aff91bae041d2c07ee1192bec91054e10e3e601e"
dependencies = [
"arrayref",
"arrayvec",
@ -741,7 +741,7 @@ version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5e1e0fdd2e5d3041e530e1b21158aeeef8b5d0e306bc5c1e3d6cf0930d10e25a"
dependencies = [
"proc-macro2 1.0.86",
"proc-macro2 1.0.92",
"quote 1.0.37",
"syn 1.0.109",
]
@ -975,9 +975,9 @@ dependencies = [
[[package]]
name = "cssparser"
version = "0.31.2"
version = "0.33.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5b3df4f93e5fbbe73ec01ec8d3f68bba73107993a5b1e7519273c32db9b0d5be"
checksum = "9be934d936a0fbed5bcdc01042b770de1398bf79d0e192f49fa7faea0e99281e"
dependencies = [
"cssparser-macros",
"dtoa-short",
@ -988,9 +988,9 @@ dependencies = [
[[package]]
name = "cssparser"
version = "0.33.0"
version = "0.34.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9be934d936a0fbed5bcdc01042b770de1398bf79d0e192f49fa7faea0e99281e"
checksum = "b7c66d1cd8ed61bf80b38432613a7a2f09401ab8d0501110655f8b341484a3e3"
dependencies = [
"cssparser-macros",
"dtoa-short",
@ -1015,7 +1015,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331"
dependencies = [
"quote 1.0.37",
"syn 2.0.79",
"syn 2.0.90",
]
[[package]]
@ -1054,10 +1054,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce"
dependencies = [
"convert_case 0.4.0",
"proc-macro2 1.0.86",
"proc-macro2 1.0.92",
"quote 1.0.37",
"rustc_version 0.4.1",
"syn 2.0.79",
"syn 2.0.90",
]
[[package]]
@ -1109,9 +1109,9 @@ dependencies = [
[[package]]
name = "ego-tree"
version = "0.6.3"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "12a0bb14ac04a9fcf170d0bbbef949b44cc492f4452bd20c095636956f653642"
checksum = "7c6ba7d4eec39eaa9ab24d44a0e73a7949a1095a8b3f3abb11eddf27dbb56a53"
[[package]]
name = "either"
@ -1220,7 +1220,7 @@ version = "0.1.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4"
dependencies = [
"proc-macro2 1.0.86",
"proc-macro2 1.0.92",
"quote 1.0.37",
"syn 1.0.109",
"synstructure",
@ -1391,9 +1391,9 @@ version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
dependencies = [
"proc-macro2 1.0.86",
"proc-macro2 1.0.92",
"quote 1.0.37",
"syn 2.0.79",
"syn 2.0.90",
]
[[package]]
@ -1604,16 +1604,16 @@ dependencies = [
[[package]]
name = "html5ever"
version = "0.27.0"
version = "0.29.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c13771afe0e6e846f1e67d038d4cb29998a6779f93c809212e4e9c32efd244d4"
checksum = "2e15626aaf9c351bc696217cbe29cb9b5e86c43f8a46b5e2f5c6c5cf7cb904ce"
dependencies = [
"log",
"mac",
"markup5ever 0.12.1",
"proc-macro2 1.0.86",
"markup5ever 0.14.0",
"proc-macro2 1.0.92",
"quote 1.0.37",
"syn 2.0.79",
"syn 2.0.90",
]
[[package]]
@ -1956,9 +1956,9 @@ dependencies = [
[[package]]
name = "keyword_extraction"
version = "1.4.3"
version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f0efa28e79b3a5f72586318c07c24477a169c688e5065fde647c71b3952a2d42"
checksum = "bab83c382982b79063036f88b9e722b899c23e750f1318ceead83ccd7413f874"
dependencies = [
"rayon",
"regex",
@ -1979,9 +1979,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
[[package]]
name = "libc"
version = "0.2.159"
version = "0.2.167"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5"
checksum = "09d6582e104315a817dff97f75133544b2e094ee22447d2acf4a74e189ba06fc"
[[package]]
name = "libflate"
@ -2042,7 +2042,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "84c12744d1279367caed41739ef094c325d53fb0ffcd4f9b84a368796f870252"
dependencies = [
"convert_case 0.6.0",
"proc-macro2 1.0.86",
"proc-macro2 1.0.92",
"quote 1.0.37",
"syn 1.0.109",
]
@ -2139,9 +2139,9 @@ dependencies = [
[[package]]
name = "markup5ever"
version = "0.12.1"
version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "16ce3abbeba692c8b8441d036ef91aea6df8da2c6b6e21c7e14d3c18e526be45"
checksum = "82c88c6129bd24319e62a0359cb6b958fa7e8be6e19bb1663bc396b90883aca5"
dependencies = [
"log",
"phf 0.11.2",
@ -2176,9 +2176,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fa453238ec218da0af6b11fc5978d3b5c3a45ed97b722391a2a11f3306274e18"
dependencies = [
"proc-macro-error",
"proc-macro2 1.0.86",
"proc-macro2 1.0.92",
"quote 1.0.37",
"syn 2.0.79",
"syn 2.0.90",
]
[[package]]
@ -2492,9 +2492,9 @@ version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
dependencies = [
"proc-macro2 1.0.86",
"proc-macro2 1.0.92",
"quote 1.0.37",
"syn 2.0.79",
"syn 2.0.90",
]
[[package]]
@ -2719,9 +2719,9 @@ checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b"
dependencies = [
"phf_generator 0.11.2",
"phf_shared 0.11.2",
"proc-macro2 1.0.86",
"proc-macro2 1.0.92",
"quote 1.0.37",
"syn 2.0.79",
"syn 2.0.90",
]
[[package]]
@ -2766,9 +2766,9 @@ version = "1.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
dependencies = [
"proc-macro2 1.0.86",
"proc-macro2 1.0.92",
"quote 1.0.37",
"syn 2.0.79",
"syn 2.0.90",
]
[[package]]
@ -2834,7 +2834,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
dependencies = [
"proc-macro-error-attr",
"proc-macro2 1.0.86",
"proc-macro2 1.0.92",
"quote 1.0.37",
"version_check",
]
@ -2845,7 +2845,7 @@ version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
dependencies = [
"proc-macro2 1.0.86",
"proc-macro2 1.0.92",
"quote 1.0.37",
"version_check",
]
@ -2861,9 +2861,9 @@ dependencies = [
[[package]]
name = "proc-macro2"
version = "1.0.86"
version = "1.0.92"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0"
dependencies = [
"unicode-ident",
]
@ -2956,7 +2956,7 @@ version = "1.0.37"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
dependencies = [
"proc-macro2 1.0.86",
"proc-macro2 1.0.92",
]
[[package]]
@ -3345,9 +3345,9 @@ dependencies = [
[[package]]
name = "rustix"
version = "0.38.37"
version = "0.38.41"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811"
checksum = "d7f649912bc1495e167a6edee79151c84b1bad49748cb4f1f1167f459f6224f6"
dependencies = [
"bitflags 2.6.0",
"errno",
@ -3441,15 +3441,15 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
[[package]]
name = "scraper"
version = "0.20.0"
version = "0.21.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b90460b31bfe1fc07be8262e42c665ad97118d4585869de9345a84d501a9eaf0"
checksum = "b0e749d29b2064585327af5038a5a8eb73aeebad4a3472e83531a436563f7208"
dependencies = [
"ahash",
"cssparser 0.31.2",
"cssparser 0.34.0",
"ego-tree",
"html5ever 0.27.0",
"once_cell",
"html5ever 0.29.0",
"precomputed-hash",
"selectors",
"tendril",
]
@ -3489,18 +3489,18 @@ dependencies = [
[[package]]
name = "selectors"
version = "0.25.0"
version = "0.26.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4eb30575f3638fc8f6815f448d50cb1a2e255b0897985c8c59f4d37b72a07b06"
checksum = "fd568a4c9bb598e291a08244a5c1f5a8a6650bee243b5b0f8dbb3d9cc1d87fe8"
dependencies = [
"bitflags 2.6.0",
"cssparser 0.31.2",
"cssparser 0.34.0",
"derive_more",
"fxhash",
"log",
"new_debug_unreachable",
"phf 0.10.1",
"phf_codegen 0.10.0",
"phf 0.11.2",
"phf_codegen 0.11.2",
"precomputed-hash",
"servo_arc",
"smallvec 1.13.2",
@ -3529,22 +3529,22 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
[[package]]
name = "serde"
version = "1.0.210"
version = "1.0.215"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
version = "1.0.210"
version = "1.0.215"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0"
dependencies = [
"proc-macro2 1.0.86",
"proc-macro2 1.0.92",
"quote 1.0.37",
"syn 2.0.79",
"syn 2.0.90",
]
[[package]]
@ -3585,9 +3585,9 @@ dependencies = [
[[package]]
name = "servo_arc"
version = "0.3.0"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d036d71a959e00c77a63538b90a6c2390969f9772b096ea837205c6bd0491a44"
checksum = "ae65c4249478a2647db249fb43e23cec56a2c8974a427e7bd8cb5a1d0964921a"
dependencies = [
"stable_deref_trait",
]
@ -3750,7 +3750,7 @@ checksum = "f0f45ed1b65bf9a4bf2f7b7dc59212d1926e9eaf00fa998988e420fd124467c6"
dependencies = [
"phf_generator 0.7.24",
"phf_shared 0.7.24",
"proc-macro2 1.0.86",
"proc-macro2 1.0.92",
"quote 1.0.37",
"string_cache_shared",
]
@ -3763,7 +3763,7 @@ checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988"
dependencies = [
"phf_generator 0.10.0",
"phf_shared 0.10.0",
"proc-macro2 1.0.86",
"proc-macro2 1.0.92",
"quote 1.0.37",
]
@ -3796,18 +3796,18 @@ version = "1.0.109"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
dependencies = [
"proc-macro2 1.0.86",
"proc-macro2 1.0.92",
"quote 1.0.37",
"unicode-ident",
]
[[package]]
name = "syn"
version = "2.0.79"
version = "2.0.90"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590"
checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31"
dependencies = [
"proc-macro2 1.0.86",
"proc-macro2 1.0.92",
"quote 1.0.37",
"unicode-ident",
]
@ -3827,7 +3827,7 @@ version = "0.12.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f"
dependencies = [
"proc-macro2 1.0.86",
"proc-macro2 1.0.92",
"quote 1.0.37",
"syn 1.0.109",
"unicode-xid 0.2.6",
@ -3841,9 +3841,9 @@ checksum = "7b2093cf4c8eb1e67749a6762251bc9cd836b6fc171623bd0a9d324d37af2417"
[[package]]
name = "tempfile"
version = "3.13.0"
version = "3.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b"
checksum = "28cce251fcbc87fac86a866eeb0d6c2d536fc16d06f184bb61aeae11aa4cee0c"
dependencies = [
"cfg-if 1.0.0",
"fastrand",
@ -3897,9 +3897,9 @@ version = "1.0.64"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3"
dependencies = [
"proc-macro2 1.0.86",
"proc-macro2 1.0.92",
"quote 1.0.37",
"syn 2.0.79",
"syn 2.0.90",
]
[[package]]
@ -4060,9 +4060,9 @@ version = "2.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
dependencies = [
"proc-macro2 1.0.86",
"proc-macro2 1.0.92",
"quote 1.0.37",
"syn 2.0.79",
"syn 2.0.90",
]
[[package]]
@ -4456,9 +4456,9 @@ dependencies = [
"bumpalo",
"log",
"once_cell",
"proc-macro2 1.0.86",
"proc-macro2 1.0.92",
"quote 1.0.37",
"syn 2.0.79",
"syn 2.0.90",
"wasm-bindgen-shared",
]
@ -4490,9 +4490,9 @@ version = "0.2.93"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
dependencies = [
"proc-macro2 1.0.86",
"proc-macro2 1.0.92",
"quote 1.0.37",
"syn 2.0.79",
"syn 2.0.90",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
@ -4775,9 +4775,9 @@ version = "0.7.35"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
dependencies = [
"proc-macro2 1.0.86",
"proc-macro2 1.0.92",
"quote 1.0.37",
"syn 2.0.79",
"syn 2.0.90",
]
[[package]]

View File

@ -26,13 +26,13 @@ tokio = { version = "1.41.0", features = [
"fs",
"io-util",
], default-features = false }
serde = { version = "1.0.209", default-features = false, features = ["derive"] }
serde = { version = "1.0.215", default-features = false, features = ["derive"] }
serde_json = { version = "1.0.122", default-features = false }
bincode = {version="1.3.3", default-features=false}
maud = { version = "0.26.0", default-features = false, features = [
"actix-web",
] }
scraper = { version = "0.20.0", default-features = false }
scraper = { version = "0.21.0", default-features = false }
actix-web = { version = "4.9.0", features = [
"cookies",
"macros",
@ -52,7 +52,7 @@ redis = { version = "0.27.5", features = [
"connection-manager",
"tcp_nodelay"
], default-features = false, optional = true }
blake3 = { version = "1.5.4", default-features = false }
blake3 = { version = "1.5.5", default-features = false }
error-stack = { version = "0.5.0", default-features = false, features = [
"std",
] }
@ -79,7 +79,7 @@ base64 = { version = "0.21.5", default-features = false, features = [
"std",
], optional = true }
cfg-if = { version = "1.0.0", default-features = false, optional = true }
keyword_extraction = { version = "1.4.3", default-features = false, features = [
keyword_extraction = { version = "1.5.0", default-features = false, features = [
"tf_idf",
"rayon",
] }
@ -92,7 +92,7 @@ itertools = {version = "0.13.0", default-features = false}
[dev-dependencies]
rusty-hook = { version = "^0.11.2", default-features = false }
criterion = { version = "0.5.1", default-features = false }
tempfile = { version = "3.13.0", default-features = false }
tempfile = { version = "3.14.0", default-features = false }
[build-dependencies]
lightningcss = { version = "1.0.0-alpha.57", default-features = false, features = [