From b6b438172297f12a53774dbee28850b7263c91e3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Nov 2024 10:28:53 +0000 Subject: [PATCH] cargo: bump the minor group across 1 directory with 3 updates (#2459) Bumps the minor group with 3 updates in the / directory: [tokio](https://github.com/tokio-rs/tokio), [zerocopy](https://github.com/google/zerocopy) and [scraper](https://github.com/causal-agent/scraper). --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Andrew Walbran --- Cargo.lock | 116 +++++++++++------- mdbook-slide-evaluator/Cargo.toml | 2 +- .../useful-crates/zerocopy-example/Cargo.toml | 2 +- .../zerocopy-example/src/main.rs | 6 +- .../async-exercises/chat-async/Cargo.toml | 2 +- src/concurrency/sync-exercises/Cargo.toml | 2 +- 6 files changed, 79 insertions(+), 51 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c621a9cf3ee..6547c2eceee 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -27,7 +27,7 @@ dependencies = [ "getrandom", "once_cell", "version_check", - "zerocopy", + "zerocopy 0.7.35", ] [[package]] @@ -52,7 +52,7 @@ version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ab99eae5ee58501ab236beb6f20f6ca39be615267b014899c89b2f0bc18a459" dependencies = [ - "html5ever", + "html5ever 0.27.0", "maplit", "once_cell", "tendril", @@ -439,14 +439,14 @@ dependencies = [ [[package]] name = "cssparser" -version = "0.31.2" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b3df4f93e5fbbe73ec01ec8d3f68bba73107993a5b1e7519273c32db9b0d5be" +checksum = "b7c66d1cd8ed61bf80b38432613a7a2f09401ab8d0501110655f8b341484a3e3" dependencies = [ "cssparser-macros", "dtoa-short", "itoa", - "phf 0.11.2", + "phf", "smallvec", ] @@ -603,9 +603,9 @@ dependencies = [ [[package]] name = "ego-tree" -version = "0.6.2" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a68a4904193147e0a8dec3314640e6db742afd5f6e634f428a6af230d9b3591" +checksum = "7c6ba7d4eec39eaa9ab24d44a0e73a7949a1095a8b3f3abb11eddf27dbb56a53" [[package]] name = "either" @@ -1046,7 +1046,21 @@ checksum = "c13771afe0e6e846f1e67d038d4cb29998a6779f93c809212e4e9c32efd244d4" dependencies = [ "log", "mac", - "markup5ever", + "markup5ever 0.12.1", + "proc-macro2", + "quote", + "syn 2.0.86", +] + +[[package]] +name = "html5ever" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e15626aaf9c351bc696217cbe29cb9b5e86c43f8a46b5e2f5c6c5cf7cb904ce" +dependencies = [ + "log", + "mac", + "markup5ever 0.14.0", "proc-macro2", "quote", "syn 2.0.86", @@ -1446,8 +1460,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "16ce3abbeba692c8b8441d036ef91aea6df8da2c6b6e21c7e14d3c18e526be45" dependencies = [ "log", - "phf 0.11.2", - "phf_codegen 0.11.2", + "phf", + "phf_codegen", + "string_cache", + "string_cache_codegen", + "tendril", +] + +[[package]] +name = "markup5ever" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82c88c6129bd24319e62a0359cb6b958fa7e8be6e19bb1663bc396b90883aca5" +dependencies = [ + "log", + "phf", + "phf_codegen", "string_cache", "string_cache_codegen", "tendril", @@ -1880,15 +1908,6 @@ dependencies = [ "sha2", ] -[[package]] -name = "phf" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259" -dependencies = [ - "phf_shared 0.10.0", -] - [[package]] name = "phf" version = "0.11.2" @@ -1899,16 +1918,6 @@ dependencies = [ "phf_shared 0.11.2", ] -[[package]] -name = "phf_codegen" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb1c3a8bc4dd4e5cfce29b44ffc14bedd2ee294559a294e2a4d4c9e9a6a13cd" -dependencies = [ - "phf_generator 0.10.0", - "phf_shared 0.10.0", -] - [[package]] name = "phf_codegen" version = "0.11.2" @@ -2353,16 +2362,16 @@ 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", "ego-tree", "getopts", - "html5ever", - "once_cell", + "html5ever 0.29.0", + "precomputed-hash", "selectors", "tendril", ] @@ -2398,9 +2407,9 @@ 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.4.1", "cssparser", @@ -2408,8 +2417,8 @@ dependencies = [ "fxhash", "log", "new_debug_unreachable", - "phf 0.10.1", - "phf_codegen 0.10.0", + "phf", + "phf_codegen", "precomputed-hash", "servo_arc", "smallvec", @@ -2474,9 +2483,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", ] @@ -2825,9 +2834,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.40.0" +version = "1.41.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" +checksum = "145f3413504347a2be84393cc8a7d2fb4d863b375909ea59f2158261aa258bbb" dependencies = [ "backtrace", "bytes", @@ -3510,8 +3519,16 @@ version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ - "byteorder", - "zerocopy-derive", + "zerocopy-derive 0.7.35", +] + +[[package]] +name = "zerocopy" +version = "0.8.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a4e33e6dce36f2adba29746927f8e848ba70989fdb61c772773bbdda8b5d6a7" +dependencies = [ + "zerocopy-derive 0.8.8", ] [[package]] @@ -3525,11 +3542,22 @@ dependencies = [ "syn 2.0.86", ] +[[package]] +name = "zerocopy-derive" +version = "0.8.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3cd137b4cc21bde6ecce3bbbb3350130872cda0be2c6888874279ea76e17d4c1" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.86", +] + [[package]] name = "zerocopy-example" version = "0.1.0" dependencies = [ - "zerocopy", + "zerocopy 0.8.8", ] [[package]] diff --git a/mdbook-slide-evaluator/Cargo.toml b/mdbook-slide-evaluator/Cargo.toml index 5237e35761a..8969a083c22 100644 --- a/mdbook-slide-evaluator/Cargo.toml +++ b/mdbook-slide-evaluator/Cargo.toml @@ -17,6 +17,6 @@ log = "0.4.22" pretty_env_logger = "0.5.0" serde = { version = "1.0.214", features = ["derive"] } strum = { version = "0.26.3", features = ["derive"] } -tokio = { version = "1.40.0", features = ["full"] } +tokio = { version = "1.41.0", features = ["full"] } tokio-util = "0.7.12" url = "2.5.2" diff --git a/src/bare-metal/useful-crates/zerocopy-example/Cargo.toml b/src/bare-metal/useful-crates/zerocopy-example/Cargo.toml index 5ea6f1e43d6..6d7784a72bd 100644 --- a/src/bare-metal/useful-crates/zerocopy-example/Cargo.toml +++ b/src/bare-metal/useful-crates/zerocopy-example/Cargo.toml @@ -5,4 +5,4 @@ edition = "2021" publish = false [dependencies] -zerocopy = { version = "0.7.35", features = ["derive"] } +zerocopy = { version = "0.8.8", features = ["derive"] } diff --git a/src/bare-metal/useful-crates/zerocopy-example/src/main.rs b/src/bare-metal/useful-crates/zerocopy-example/src/main.rs index 58c676b43c9..4a00b9177ee 100644 --- a/src/bare-metal/useful-crates/zerocopy-example/src/main.rs +++ b/src/bare-metal/useful-crates/zerocopy-example/src/main.rs @@ -15,10 +15,10 @@ #![allow(dead_code)] // ANCHOR: main -use zerocopy::AsBytes; +use zerocopy::{Immutable, IntoBytes}; #[repr(u32)] -#[derive(AsBytes, Debug, Default)] +#[derive(Debug, Default, Immutable, IntoBytes)] enum RequestType { #[default] In = 0, @@ -27,7 +27,7 @@ enum RequestType { } #[repr(C)] -#[derive(AsBytes, Debug, Default)] +#[derive(Debug, Default, Immutable, IntoBytes)] struct VirtioBlockRequest { request_type: RequestType, reserved: u32, diff --git a/src/concurrency/async-exercises/chat-async/Cargo.toml b/src/concurrency/async-exercises/chat-async/Cargo.toml index 50c19e8e4c4..79ec8552a29 100644 --- a/src/concurrency/async-exercises/chat-async/Cargo.toml +++ b/src/concurrency/async-exercises/chat-async/Cargo.toml @@ -6,5 +6,5 @@ edition = "2021" [dependencies] futures-util = { version = "0.3.31", features = ["sink"] } http = "1.1.0" -tokio = { version = "1.40.0", features = ["full"] } +tokio = { version = "1.41.0", features = ["full"] } tokio-websockets = { version = "0.10.1", features = ["client", "fastrand", "server", "sha1_smol"] } diff --git a/src/concurrency/sync-exercises/Cargo.toml b/src/concurrency/sync-exercises/Cargo.toml index c7bd33e3ba7..46564981bd2 100644 --- a/src/concurrency/sync-exercises/Cargo.toml +++ b/src/concurrency/sync-exercises/Cargo.toml @@ -14,7 +14,7 @@ path = "link-checker.rs" [dependencies] reqwest = { version = "0.12.9", features = ["blocking"] } -scraper = "0.20.0" +scraper = "0.21.0" thiserror = "1.0.66" [dev-dependencies]