NyxErinys/crunchy-cli
1
0
Fork 0
mirror of https://github.com/crunchy-labs/crunchy-cli.git synced 2026-01-21 04:02:00 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove duplicated native-tls entry (#235)

Browse source
This commit is contained in:
bytedream 2023-08-16 16:55:16 +02:00
parent 6da292f013
commit f45bb19cd7
3 changed files with 7 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Cargo.lock generated
View file

@ -399,7 +399,6 @@ dependencies = [
"indicatif", "indicatif",
"lazy_static", "lazy_static",
"log", "log",
"native-tls 0.2.11 (git+https://github.com/crunchy-labs/rust-not-so-native-tls.git?rev=570100d)",
"num_cpus", "num_cpus",
"regex", "regex",
"reqwest", "reqwest",
@ -888,7 +887,7 @@ checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
dependencies = [ dependencies = [
"bytes", "bytes",
"hyper", "hyper",
"native-tls 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "native-tls",
"tokio", "tokio",
"tokio-native-tls", "tokio-native-tls",
] ]
@ -1144,17 +1143,6 @@ dependencies = [
"tempfile", "tempfile",
] ]
[[package]]
name = "native-tls"
version = "0.2.11"
source = "git+https://github.com/crunchy-labs/rust-not-so-native-tls.git?rev=570100d#570100d3391bd9aab7a390cfef0d1a28e8efe200"
dependencies = [
"log",
"openssl",
"openssl-probe",
"openssl-sys",
]
[[package]] [[package]]
name = "nix" name = "nix"
version = "0.26.2" version = "0.26.2"
@ -1432,7 +1420,7 @@ dependencies = [
"js-sys", "js-sys",
"log", "log",
"mime", "mime",
"native-tls 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "native-tls",
"once_cell", "once_cell",
"percent-encoding", "percent-encoding",
"pin-project-lite", "pin-project-lite",
@ -1876,7 +1864,7 @@ version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2"
dependencies = [ dependencies = [
"native-tls 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "native-tls",
"tokio", "tokio",
] ]

1
crunchy-cli-core/Cargo.lock generated
View file

@ -358,7 +358,6 @@ dependencies = [
"indicatif", "indicatif",
"lazy_static", "lazy_static",
"log", "log",
"native-tls",
"num_cpus", "num_cpus",
"regex", "regex",
"reqwest", "reqwest",

10
crunchy-cli-core/Cargo.toml
View file

@ -6,8 +6,8 @@ edition = "2021"
license = "MIT" license = "MIT"
[features] [features]
openssl = ["dep:native-tls", "reqwest/native-tls-alpn"] openssl = ["reqwest/native-tls-alpn"]
openssl-static = ["dep:native-tls", "native-tls?/vendored", "reqwest/native-tls-alpn", "reqwest/native-tls-vendored"] openssl-static = ["reqwest/native-tls-alpn", "reqwest/native-tls-vendored"]
[dependencies] [dependencies]
anyhow = "1.0" anyhow = "1.0"
@ -35,12 +35,10 @@ tempfile = "3.7"
tokio = { version = "1.31", features = ["macros", "rt-multi-thread", "time"] } tokio = { version = "1.31", features = ["macros", "rt-multi-thread", "time"] }
sys-locale = "0.3" sys-locale = "0.3"
# fork of the `native-tls` crate which uses openssl as backend on every platform. this is done as `reqwest` only supports
# `rustls` and `native-tls` as tls backend
native-tls = { git = "https://github.com/crunchy-labs/rust-not-so-native-tls.git", rev = "570100d", features = ["alpn"], optional = true }
[build-dependencies] [build-dependencies]
chrono = "0.4" chrono = "0.4"
[patch.crates-io] [patch.crates-io]
# fork of the `native-tls` crate which uses openssl as backend on every platform. this is done as `reqwest` only supports
# `rustls` and `native-tls` as tls backend
native-tls = { git = "https://github.com/crunchy-labs/rust-not-so-native-tls.git", rev = "570100d" } native-tls = { git = "https://github.com/crunchy-labs/rust-not-so-native-tls.git", rev = "570100d" }