Skip to content

Commit

Permalink
Merge branch 'rumenov/hyfesc' into 'master'
Browse files Browse the repository at this point in the history 
build: remove the unused hyper-socks external dep and remove the socks and the rustls-tls-native-roots feature from the reqwest crate

 

See merge request dfinity-lab/public/ic!18725
  • Loading branch information
@rumenov
rumenov committed Apr 17, 2024
2 parents 53447bf + 2d56a83 commit abcea3e
Show file tree
Hide file tree
Showing 8 changed files with 29 additions and 320 deletions.
94 changes: 7 additions & 87 deletions Cargo.Bazel.Fuzzing.json.lock
View file
@@ -1,5 +1,5 @@
{
"checksum": "2ab547b3efa5f5f22cd5c3ae044a513444a7587035cebfcc3bf3e52a526ef17c",
"checksum": "bd05438f275860196263dabd0d2a1f415b65bd6cef37eca0c1506bbd1f4746f9",
"crates": {
"abnf 0.12.0": {
"name": "abnf",
Expand Down Expand Up @@ -14684,10 +14684,6 @@
"target": "hyper_rustls",
"alias": "hyper_rustls_0_26_0"
},
{
"id": "hyper-socks2 0.8.0",
"target": "hyper_socks2"
},
{
"id": "hyper-util 0.1.3",
"target": "hyper_util"
Expand Down Expand Up @@ -23071,87 +23067,6 @@
},
"license": "Apache-2.0 OR ISC OR MIT"
},
"hyper-socks2 0.8.0": {
"name": "hyper-socks2",
"version": "0.8.0",
"repository": {
"Http": {
"url": "https://static.crates.io/crates/hyper-socks2/0.8.0/download",
"sha256": "cc38166fc2732d450e9372388d269eb38ff0b75a3cfb4c542e65b2f6893629c4"
}
},
"targets": [
{
"Library": {
"crate_name": "hyper_socks2",
"crate_root": "src/lib.rs",
"srcs": [
"**/*.rs"
]
}
}
],
"library_target_name": "hyper_socks2",
"common_attrs": {
"compile_data_glob": [
"**"
],
"crate_features": {
"common": [
"hyper-rustls",
"rustls",
"rustls-native-certs",
"rusttls"
],
"selects": {}
},
"deps": {
"common": [
{
"id": "async-socks5 0.5.1",
"target": "async_socks5"
},
{
"id": "futures 0.3.30",
"target": "futures"
},
{
"id": "http 0.2.9",
"target": "http"
},
{
"id": "hyper 0.14.27",
"target": "hyper"
},
{
"id": "hyper-rustls 0.24.2",
"target": "hyper_rustls"
},
{
"id": "rustls 0.21.10",
"target": "rustls",
"alias": "rusttls"
},
{
"id": "rustls-native-certs 0.6.3",
"target": "rustls_native_certs"
},
{
"id": "thiserror 1.0.57",
"target": "thiserror"
},
{
"id": "tokio 1.36.0",
"target": "tokio"
}
],
"selects": {}
},
"edition": "2018",
"version": "0.8.0"
},
"license": "Apache-2.0 OR MIT"
},
"hyper-timeout 0.4.1": {
"name": "hyper-timeout",
"version": "0.4.1",
Expand Down Expand Up @@ -43782,8 +43697,10 @@
"rustls-tls",
"rustls-tls-webpki-roots",
"serde_json",
"socks",
"stream",
"tokio-rustls",
"tokio-socks",
"tokio-util",
"wasm-streams",
"webpki-roots"
Expand Down Expand Up @@ -43903,6 +43820,10 @@
"id": "tokio-rustls 0.24.1",
"target": "tokio_rustls"
},
{
"id": "tokio-socks 0.5.1",
"target": "tokio_socks"
},
{
"id": "tokio-util 0.7.10",
"target": "tokio_util"
Expand Down Expand Up @@ -65513,7 +65434,6 @@
"hyper 1.2.0",
"hyper-rustls 0.24.2",
"hyper-rustls 0.26.0",
"hyper-socks2 0.8.0",
"hyper-util 0.1.3",
"hyperlocal-next 0.9.0",
"ic-agent 0.34.0",
Expand Down
19 changes: 1 addition & 18 deletions Cargo.Bazel.Fuzzing.toml.lock
View file
Expand Up @@ -2908,7 +2908,6 @@ dependencies = [
"hyper 1.2.0",
"hyper-rustls 0.24.2",
"hyper-rustls 0.26.0",
"hyper-socks2",
"hyper-util",
"hyperlocal-next",
"ic-agent",
Expand Down Expand Up @@ -4598,23 +4597,6 @@ dependencies = [
"webpki-roots 0.26.1",
]

[[package]]
name = "hyper-socks2"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cc38166fc2732d450e9372388d269eb38ff0b75a3cfb4c542e65b2f6893629c4"
dependencies = [
"async-socks5",
"futures",
"http 0.2.9",
"hyper 0.14.27",
"hyper-rustls 0.24.2",
"rustls 0.21.10",
"rustls-native-certs 0.6.3",
"thiserror",
"tokio",
]

[[package]]
name = "hyper-timeout"
version = "0.4.1"
Expand Down Expand Up @@ -8594,6 +8576,7 @@ dependencies = [
"system-configuration",
"tokio",
"tokio-rustls 0.24.1",
"tokio-socks",
"tokio-util",
"tower-service",
"url",
Expand Down
94 changes: 7 additions & 87 deletions Cargo.Bazel.json.lock
View file
@@ -1,5 +1,5 @@
{
"checksum": "28f219be114910760e6506125a504fe1bdb39ecb885c2c0ae20814d9bd023155",
"checksum": "ba6093042aec5d355380d1b7dee8f9d1b429fd528f7f264cabb181abd50de21b",
"crates": {
"abnf 0.12.0": {
"name": "abnf",
Expand Down Expand Up @@ -14560,10 +14560,6 @@
"target": "hyper_rustls",
"alias": "hyper_rustls_0_26_0"
},
{
"id": "hyper-socks2 0.8.0",
"target": "hyper_socks2"
},
{
"id": "hyper-util 0.1.3",
"target": "hyper_util"
Expand Down Expand Up @@ -22966,87 +22962,6 @@
},
"license": "Apache-2.0 OR ISC OR MIT"
},
"hyper-socks2 0.8.0": {
"name": "hyper-socks2",
"version": "0.8.0",
"repository": {
"Http": {
"url": "https://static.crates.io/crates/hyper-socks2/0.8.0/download",
"sha256": "cc38166fc2732d450e9372388d269eb38ff0b75a3cfb4c542e65b2f6893629c4"
}
},
"targets": [
{
"Library": {
"crate_name": "hyper_socks2",
"crate_root": "src/lib.rs",
"srcs": [
"**/*.rs"
]
}
}
],
"library_target_name": "hyper_socks2",
"common_attrs": {
"compile_data_glob": [
"**"
],
"crate_features": {
"common": [
"hyper-rustls",
"rustls",
"rustls-native-certs",
"rusttls"
],
"selects": {}
},
"deps": {
"common": [
{
"id": "async-socks5 0.5.1",
"target": "async_socks5"
},
{
"id": "futures 0.3.30",
"target": "futures"
},
{
"id": "http 0.2.9",
"target": "http"
},
{
"id": "hyper 0.14.27",
"target": "hyper"
},
{
"id": "hyper-rustls 0.24.2",
"target": "hyper_rustls"
},
{
"id": "rustls 0.21.10",
"target": "rustls",
"alias": "rusttls"
},
{
"id": "rustls-native-certs 0.6.3",
"target": "rustls_native_certs"
},
{
"id": "thiserror 1.0.57",
"target": "thiserror"
},
{
"id": "tokio 1.36.0",
"target": "tokio"
}
],
"selects": {}
},
"edition": "2018",
"version": "0.8.0"
},
"license": "Apache-2.0 OR MIT"
},
"hyper-timeout 0.4.1": {
"name": "hyper-timeout",
"version": "0.4.1",
Expand Down Expand Up @@ -43637,8 +43552,10 @@
"rustls-tls",
"rustls-tls-webpki-roots",
"serde_json",
"socks",
"stream",
"tokio-rustls",
"tokio-socks",
"tokio-util",
"wasm-streams",
"webpki-roots"
Expand Down Expand Up @@ -43758,6 +43675,10 @@
"id": "tokio-rustls 0.24.1",
"target": "tokio_rustls"
},
{
"id": "tokio-socks 0.5.1",
"target": "tokio_socks"
},
{
"id": "tokio-util 0.7.10",
"target": "tokio_util"
Expand Down Expand Up @@ -65432,7 +65353,6 @@
"hyper 1.2.0",
"hyper-rustls 0.24.2",
"hyper-rustls 0.26.0",
"hyper-socks2 0.8.0",
"hyper-util 0.1.3",
"hyperlocal-next 0.9.0",
"ic-agent 0.34.0",
Expand Down
19 changes: 1 addition & 18 deletions Cargo.Bazel.toml.lock
View file
Expand Up @@ -2898,7 +2898,6 @@ dependencies = [
"hyper 1.2.0",
"hyper-rustls 0.24.2",
"hyper-rustls 0.26.0",
"hyper-socks2",
"hyper-util",
"hyperlocal-next",
"ic-agent",
Expand Down Expand Up @@ -4589,23 +4588,6 @@ dependencies = [
"webpki-roots 0.26.1",
]

[[package]]
name = "hyper-socks2"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cc38166fc2732d450e9372388d269eb38ff0b75a3cfb4c542e65b2f6893629c4"
dependencies = [
"async-socks5",
"futures",
"http 0.2.9",
"hyper 0.14.27",
"hyper-rustls 0.24.2",
"rustls 0.21.10",
"rustls-native-certs 0.6.3",
"thiserror",
"tokio",
]

[[package]]
name = "hyper-timeout"
version = "0.4.1"
Expand Down Expand Up @@ -8596,6 +8578,7 @@ dependencies = [
"system-configuration",
"tokio",
"tokio-rustls 0.24.1",
"tokio-socks",
"tokio-util",
"tower-service",
"url",
Expand Down

0 comments on commit abcea3e

Please sign in to comment.