From 661c124b22b8bebc0ae5f84f1aac092f45968733 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Mar 2024 22:49:33 +0000 Subject: [PATCH 1/2] [chore(cargo)](deps): Bump hyper from 0.14.28 to 1.2.0 Bumps [hyper](https://github.com/hyperium/hyper) from 0.14.28 to 1.2.0. - [Release notes](https://github.com/hyperium/hyper/releases) - [Changelog](https://github.com/hyperium/hyper/blob/master/CHANGELOG.md) - [Commits](https://github.com/hyperium/hyper/compare/v0.14.28...v1.2.0) --- updated-dependencies: - dependency-name: hyper dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- Cargo.lock | 96 +++++++++++++++++++++++------- homestar-runtime/Cargo.toml | 2 +- homestar-workspace-hack/Cargo.toml | 4 +- 3 files changed, 76 insertions(+), 26 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 13f2ad2d..d7230c9d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -416,8 +416,8 @@ dependencies = [ "bytes", "futures-util", "http 0.2.11", - "http-body", - "hyper", + "http-body 0.4.6", + "hyper 0.14.28", "itoa", "matchit", "memchr", @@ -442,7 +442,7 @@ dependencies = [ "bytes", "futures-util", "http 0.2.11", - "http-body", + "http-body 0.4.6", "mime", "rustversion", "tower-layer", @@ -2434,6 +2434,25 @@ dependencies = [ "tracing", ] +[[package]] +name = "h2" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51ee2dd2e4f378392eeff5d51618cd9a63166a2513846bbc55f21cfacd9199d4" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http 1.0.0", + "indexmap 2.2.3", + "slab", + "tokio", + "tokio-util", + "tracing", +] + [[package]] name = "half" version = "2.3.1" @@ -2685,7 +2704,7 @@ dependencies = [ "http 0.2.11", "http-serde", "humantime", - "hyper", + "hyper 1.2.0", "indexmap 2.2.3", "inquire", "ipfs-api", @@ -2855,7 +2874,7 @@ dependencies = [ "generic-array 0.14.7", "gimli", "hashbrown 0.14.3", - "hyper", + "hyper 1.2.0", "iana-time-zone", "indexmap 1.9.3", "indexmap 2.2.3", @@ -2954,6 +2973,16 @@ dependencies = [ "pin-project-lite", ] +[[package]] +name = "http-body" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" +dependencies = [ + "bytes", + "http 1.0.0", +] + [[package]] name = "http-range-header" version = "0.3.1" @@ -2998,9 +3027,9 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "h2", + "h2 0.3.24", "http 0.2.11", - "http-body", + "http-body 0.4.6", "httparse", "httpdate", "itoa", @@ -3012,6 +3041,27 @@ dependencies = [ "want", ] +[[package]] +name = "hyper" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "186548d73ac615b32a73aafe38fb4f56c0d340e110e5a200bcadbaf2e199263a" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "h2 0.4.3", + "http 1.0.0", + "http-body 1.0.0", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "smallvec", + "tokio", + "want", +] + [[package]] name = "hyper-multipart-rfc7578" version = "0.8.0" @@ -3022,7 +3072,7 @@ dependencies = [ "common-multipart-rfc7578", "futures-core", "http 0.2.11", - "hyper", + "hyper 0.14.28", ] [[package]] @@ -3033,7 +3083,7 @@ checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ "futures-util", "http 0.2.11", - "hyper", + "hyper 0.14.28", "log", "rustls 0.21.10", "rustls-native-certs 0.6.3", @@ -3047,7 +3097,7 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" dependencies = [ - "hyper", + "hyper 0.14.28", "pin-project-lite", "tokio", "tokio-io-timeout", @@ -3148,7 +3198,7 @@ dependencies = [ "bytes", "futures", "http 0.2.11", - "hyper", + "hyper 0.14.28", "log", "rand", "tokio", @@ -3284,7 +3334,7 @@ dependencies = [ "bytes", "futures", "http 0.2.11", - "hyper", + "hyper 0.14.28", "hyper-multipart-rfc7578", "ipfs-api-prelude", "thiserror", @@ -3465,7 +3515,7 @@ dependencies = [ "beef", "futures-timer", "futures-util", - "hyper", + "hyper 0.14.28", "jsonrpsee-types", "parking_lot", "pin-project", @@ -3487,7 +3537,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78b7de9f3219d95985eb77fd03194d7c1b56c19bce1abfcc9d07462574b15572" dependencies = [ "async-trait", - "hyper", + "hyper 0.14.28", "hyper-rustls", "jsonrpsee-core", "jsonrpsee-types", @@ -3508,7 +3558,7 @@ checksum = "5cc7c6d1a2c58f6135810284a390d9f823d0f508db74cd914d8237802de80f98" dependencies = [ "futures-util", "http 0.2.11", - "hyper", + "hyper 0.14.28", "jsonrpsee-core", "jsonrpsee-types", "pin-project", @@ -4368,7 +4418,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d4fa7ce7c4862db464a37b0b31d89bca874562f034bd7993895572783d02950" dependencies = [ "base64 0.21.7", - "hyper", + "hyper 0.14.28", "indexmap 1.9.3", "ipnet", "metrics", @@ -5730,10 +5780,10 @@ dependencies = [ "encoding_rs", "futures-core", "futures-util", - "h2", + "h2 0.3.24", "http 0.2.11", - "http-body", - "hyper", + "http-body 0.4.6", + "hyper 0.14.28", "ipnet", "js-sys", "log", @@ -7205,10 +7255,10 @@ dependencies = [ "axum", "base64 0.21.7", "bytes", - "h2", + "h2 0.3.24", "http 0.2.11", - "http-body", - "hyper", + "http-body 0.4.6", + "hyper 0.14.28", "hyper-timeout", "percent-encoding", "pin-project", @@ -7252,7 +7302,7 @@ dependencies = [ "futures-core", "futures-util", "http 0.2.11", - "http-body", + "http-body 0.4.6", "http-range-header", "pin-project-lite", "tower-layer", diff --git a/homestar-runtime/Cargo.toml b/homestar-runtime/Cargo.toml index 1884eeeb..30378a94 100644 --- a/homestar-runtime/Cargo.toml +++ b/homestar-runtime/Cargo.toml @@ -83,7 +83,7 @@ homestar-workspace-hack = { workspace = true } http = "0.2" http-serde = "1.1" humantime = { workspace = true } -hyper = { version = "0.14", default-features = false } +hyper = { version = "1.2", default-features = false } indexmap = { workspace = true } inquire = "0.6" ipfs-api = { version = "0.17", optional = true } diff --git a/homestar-workspace-hack/Cargo.toml b/homestar-workspace-hack/Cargo.toml index 8bd36619..f76ad98e 100644 --- a/homestar-workspace-hack/Cargo.toml +++ b/homestar-workspace-hack/Cargo.toml @@ -45,7 +45,7 @@ futures-timer = { version = "3.0.3", default-features = false, features = ["wasm futures-util = { version = "0.3.30", features = ["bilock", "channel", "io", "sink", "unstable"] } generic-array = { version = "0.14.7", default-features = false, features = ["more_lengths"] } hashbrown = { version = "0.14.3", features = ["raw"] } -hyper = { version = "0.14.28", features = ["full"] } +hyper = { version = "1.2.0", features = ["full"] } indexmap-dff4ba8e3ae991db = { package = "indexmap", version = "1.9.3", default-features = false, features = ["serde"] } indexmap-f595c2ba2a3f28df = { package = "indexmap", version = "2.2.3", features = ["serde"] } jsonrpsee = { version = "0.21.0", default-features = false, features = ["client", "server"] } @@ -117,7 +117,7 @@ futures-timer = { version = "3.0.3", default-features = false, features = ["wasm futures-util = { version = "0.3.30", features = ["bilock", "channel", "io", "sink", "unstable"] } generic-array = { version = "0.14.7", default-features = false, features = ["more_lengths"] } hashbrown = { version = "0.14.3", features = ["raw"] } -hyper = { version = "0.14.28", features = ["full"] } +hyper = { version = "1.2.0", features = ["full"] } indexmap-dff4ba8e3ae991db = { package = "indexmap", version = "1.9.3", default-features = false, features = ["serde"] } indexmap-f595c2ba2a3f28df = { package = "indexmap", version = "2.2.3", features = ["serde"] } jsonrpsee = { version = "0.21.0", default-features = false, features = ["client", "server"] } From 12fe723f40efd2e3d2bce84253375a34b7336d6e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Mon, 18 Mar 2024 22:50:13 +0000 Subject: [PATCH 2/2] chore(deps): cargo hakari --- Cargo.lock | 36 ++++-------------------------- homestar-workspace-hack/Cargo.toml | 4 ++-- 2 files changed, 6 insertions(+), 34 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d7230c9d..152b991d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2434,25 +2434,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "h2" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51ee2dd2e4f378392eeff5d51618cd9a63166a2513846bbc55f21cfacd9199d4" -dependencies = [ - "bytes", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http 1.0.0", - "indexmap 2.2.3", - "slab", - "tokio", - "tokio-util", - "tracing", -] - [[package]] name = "half" version = "2.3.1" @@ -2874,7 +2855,7 @@ dependencies = [ "generic-array 0.14.7", "gimli", "hashbrown 0.14.3", - "hyper 1.2.0", + "hyper 0.14.28", "iana-time-zone", "indexmap 1.9.3", "indexmap 2.2.3", @@ -3027,7 +3008,7 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "h2 0.3.24", + "h2", "http 0.2.11", "http-body 0.4.6", "httparse", @@ -3048,18 +3029,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "186548d73ac615b32a73aafe38fb4f56c0d340e110e5a200bcadbaf2e199263a" dependencies = [ "bytes", - "futures-channel", - "futures-util", - "h2 0.4.3", "http 1.0.0", "http-body 1.0.0", - "httparse", - "httpdate", - "itoa", - "pin-project-lite", - "smallvec", "tokio", - "want", ] [[package]] @@ -5780,7 +5752,7 @@ dependencies = [ "encoding_rs", "futures-core", "futures-util", - "h2 0.3.24", + "h2", "http 0.2.11", "http-body 0.4.6", "hyper 0.14.28", @@ -7255,7 +7227,7 @@ dependencies = [ "axum", "base64 0.21.7", "bytes", - "h2 0.3.24", + "h2", "http 0.2.11", "http-body 0.4.6", "hyper 0.14.28", diff --git a/homestar-workspace-hack/Cargo.toml b/homestar-workspace-hack/Cargo.toml index f76ad98e..8bd36619 100644 --- a/homestar-workspace-hack/Cargo.toml +++ b/homestar-workspace-hack/Cargo.toml @@ -45,7 +45,7 @@ futures-timer = { version = "3.0.3", default-features = false, features = ["wasm futures-util = { version = "0.3.30", features = ["bilock", "channel", "io", "sink", "unstable"] } generic-array = { version = "0.14.7", default-features = false, features = ["more_lengths"] } hashbrown = { version = "0.14.3", features = ["raw"] } -hyper = { version = "1.2.0", features = ["full"] } +hyper = { version = "0.14.28", features = ["full"] } indexmap-dff4ba8e3ae991db = { package = "indexmap", version = "1.9.3", default-features = false, features = ["serde"] } indexmap-f595c2ba2a3f28df = { package = "indexmap", version = "2.2.3", features = ["serde"] } jsonrpsee = { version = "0.21.0", default-features = false, features = ["client", "server"] } @@ -117,7 +117,7 @@ futures-timer = { version = "3.0.3", default-features = false, features = ["wasm futures-util = { version = "0.3.30", features = ["bilock", "channel", "io", "sink", "unstable"] } generic-array = { version = "0.14.7", default-features = false, features = ["more_lengths"] } hashbrown = { version = "0.14.3", features = ["raw"] } -hyper = { version = "1.2.0", features = ["full"] } +hyper = { version = "0.14.28", features = ["full"] } indexmap-dff4ba8e3ae991db = { package = "indexmap", version = "1.9.3", default-features = false, features = ["serde"] } indexmap-f595c2ba2a3f28df = { package = "indexmap", version = "2.2.3", features = ["serde"] } jsonrpsee = { version = "0.21.0", default-features = false, features = ["client", "server"] }