Skip to content

Commit

Permalink
Remove the OS limit for rustls targets (#43)
Browse files Browse the repository at this point in the history 
It doesn't make sense to limit the OS to Linux, macOS, and Windows
because `rustls` supports more than that.
  • Loading branch information
@CryZe
CryZe committed Oct 24, 2023
1 parent 4178f59 commit 778e60f
Show file tree
Hide file tree
Showing 2 changed files with 51 additions and 63 deletions.
6 changes: 3 additions & 3 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "splits-io-api"
version = "0.3.1"
version = "0.3.2"
authors = ["Christopher Serr <christopher.serr@gmail.com>"]
edition = "2021"
documentation = "https://docs.rs/splits-io-api/"
Expand Down Expand Up @@ -31,10 +31,10 @@ uuid = { version = "1.1.2", default-features = false, features = ["serde"] }
[target.'cfg(not(target_family = "wasm"))'.dependencies]
hyper = { version = "0.14.1", default-features = false, features = ["tcp", "client", "http2"] }

[target.'cfg(all(any(target_os = "linux", target_family = "windows", target_os = "macos"), any(target_arch = "arm", target_arch = "aarch64", target_arch = "x86", target_arch = "x86_64", target_arch = "loongarch64", all(target_arch = "mips", target_endian = "little"), all(target_arch = "mips64", target_endian = "little"), all(target_arch = "powerpc", target_endian = "big"), target_arch = "powerpc64", target_arch = "riscv64", target_arch = "s390x")))'.dependencies]
[target.'cfg(any(target_arch = "arm", target_arch = "aarch64", target_arch = "x86", target_arch = "x86_64", target_arch = "loongarch64", all(target_arch = "mips", target_endian = "little"), all(target_arch = "mips64", target_endian = "little"), all(target_arch = "powerpc", target_endian = "big"), target_arch = "powerpc64", target_arch = "riscv64", target_arch = "s390x"))'.dependencies]
hyper-rustls = { version = "0.24.1", default-features = false, features = ["native-tokio", "http2", "tls12"] }

[target.'cfg(all(not(target_family = "wasm"), not(all(any(target_os = "linux", target_family = "windows", target_os = "macos"), any(target_arch = "arm", target_arch = "aarch64", target_arch = "x86", target_arch = "x86_64", target_arch = "loongarch64", all(target_arch = "mips", target_endian = "little"), all(target_arch = "mips64", target_endian = "little"), all(target_arch = "powerpc", target_endian = "big"), target_arch = "powerpc64", target_arch = "riscv64", target_arch = "s390x")))))'.dependencies]
[target.'cfg(all(not(target_family = "wasm"), not(any(target_arch = "arm", target_arch = "aarch64", target_arch = "x86", target_arch = "x86_64", target_arch = "loongarch64", all(target_arch = "mips", target_endian = "little"), all(target_arch = "mips64", target_endian = "little"), all(target_arch = "powerpc", target_endian = "big"), target_arch = "powerpc64", target_arch = "riscv64", target_arch = "s390x"))))'.dependencies]
hyper-tls = "0.5.0"

[target.'cfg(target_family = "wasm")'.dependencies]
Expand Down
108 changes: 48 additions & 60 deletions src/platform/native.rs
View file
Original file line number Diff line number Diff line change
@@ -1,38 +1,32 @@
use http::{Request, Response};
use hyper::body::Buf;

#[cfg(all(
any(target_os = "linux", target_family = "windows", target_os = "macos"),
any(
target_arch = "arm",
target_arch = "aarch64",
target_arch = "x86",
target_arch = "x86_64",
target_arch = "loongarch64",
all(target_arch = "mips", target_endian = "little"),
all(target_arch = "mips64", target_endian = "little"),
all(target_arch = "powerpc", target_endian = "big"),
target_arch = "powerpc64",
target_arch = "riscv64",
target_arch = "s390x",
),
#[cfg(any(
target_arch = "arm",
target_arch = "aarch64",
target_arch = "x86",
target_arch = "x86_64",
target_arch = "loongarch64",
all(target_arch = "mips", target_endian = "little"),
all(target_arch = "mips64", target_endian = "little"),
all(target_arch = "powerpc", target_endian = "big"),
target_arch = "powerpc64",
target_arch = "riscv64",
target_arch = "s390x",
))]
use hyper_rustls::{HttpsConnector, HttpsConnectorBuilder};
#[cfg(not(all(
any(target_os = "linux", target_family = "windows", target_os = "macos"),
any(
target_arch = "arm",
target_arch = "aarch64",
target_arch = "x86",
target_arch = "x86_64",
target_arch = "loongarch64",
all(target_arch = "mips", target_endian = "little"),
all(target_arch = "mips64", target_endian = "little"),
all(target_arch = "powerpc", target_endian = "big"),
target_arch = "powerpc64",
target_arch = "riscv64",
target_arch = "s390x",
),
#[cfg(not(any(
target_arch = "arm",
target_arch = "aarch64",
target_arch = "x86",
target_arch = "x86_64",
target_arch = "loongarch64",
all(target_arch = "mips", target_endian = "little"),
all(target_arch = "mips64", target_endian = "little"),
all(target_arch = "powerpc", target_endian = "big"),
target_arch = "powerpc64",
target_arch = "riscv64",
target_arch = "s390x",
)))]
use hyper_tls::HttpsConnector;
use std::{io::Read, ops::Deref};
Expand All @@ -53,42 +47,36 @@ pub struct Client {

impl Client {
pub fn new() -> Self {
#[cfg(all(
any(target_os = "linux", target_family = "windows", target_os = "macos"),
any(
target_arch = "arm",
target_arch = "aarch64",
target_arch = "x86",
target_arch = "x86_64",
target_arch = "loongarch64",
all(target_arch = "mips", target_endian = "little"),
all(target_arch = "mips64", target_endian = "little"),
all(target_arch = "powerpc", target_endian = "big"),
target_arch = "powerpc64",
target_arch = "riscv64",
target_arch = "s390x",
),
#[cfg(any(
target_arch = "arm",
target_arch = "aarch64",
target_arch = "x86",
target_arch = "x86_64",
target_arch = "loongarch64",
all(target_arch = "mips", target_endian = "little"),
all(target_arch = "mips64", target_endian = "little"),
all(target_arch = "powerpc", target_endian = "big"),
target_arch = "powerpc64",
target_arch = "riscv64",
target_arch = "s390x",
))]
let https = HttpsConnectorBuilder::new()
.with_native_roots()
.https_only()
.enable_http2()
.build();
#[cfg(not(all(
any(target_os = "linux", target_family = "windows", target_os = "macos"),
any(
target_arch = "arm",
target_arch = "aarch64",
target_arch = "x86",
target_arch = "x86_64",
target_arch = "loongarch64",
all(target_arch = "mips", target_endian = "little"),
all(target_arch = "mips64", target_endian = "little"),
all(target_arch = "powerpc", target_endian = "big"),
target_arch = "powerpc64",
target_arch = "riscv64",
target_arch = "s390x",
),
#[cfg(not(any(
target_arch = "arm",
target_arch = "aarch64",
target_arch = "x86",
target_arch = "x86_64",
target_arch = "loongarch64",
all(target_arch = "mips", target_endian = "little"),
all(target_arch = "mips64", target_endian = "little"),
all(target_arch = "powerpc", target_endian = "big"),
target_arch = "powerpc64",
target_arch = "riscv64",
target_arch = "s390x",
)))]
let https = HttpsConnector::new();
let client = hyper::Client::builder().build::<_, hyper::Body>(https);
Expand Down

0 comments on commit 778e60f

Please sign in to comment.