chris/ruwuma
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use namespaced cargo features where possible

Browse Source
This commit is contained in:
Jonas Platte 2022-06-01 15:24:38 +02:00
parent 07af61d784
commit c50a57387e
No known key found for this signature in database
GPG Key ID: AAA7A61F696C3E0C
3 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
crates/ruma-client/Cargo.toml
View File

@ -20,8 +20,8 @@ client-api = ["ruma-client-api"]
# HTTP clients # HTTP clients
hyper-native-tls = ["hyper", "hyper-tls"] hyper-native-tls = ["hyper", "hyper-tls"]
hyper-rustls = ["hyper", "hyper-rustls-crate"] hyper-rustls = ["hyper", "dep:hyper-rustls"]
isahc = ["isahc-crate", "futures-lite"] isahc = ["dep:isahc", "futures-lite"]
reqwest-native-tls = ["reqwest", "reqwest/native-tls"] reqwest-native-tls = ["reqwest", "reqwest/native-tls"]
reqwest-native-tls-alpn = ["reqwest", "reqwest/native-tls-alpn"] reqwest-native-tls-alpn = ["reqwest", "reqwest/native-tls-alpn"]
reqwest-native-tls-vendored = ["reqwest", "reqwest/native-tls-vendored"] reqwest-native-tls-vendored = ["reqwest", "reqwest/native-tls-vendored"]
@ -38,9 +38,9 @@ futures-core = "0.3.8"
futures-lite = { version = "1.11.3", optional = true } futures-lite = { version = "1.11.3", optional = true }
http = "0.2.2" http = "0.2.2"
hyper = { version = "0.14.2", optional = true, features = ["client", "http1", "http2", "tcp"] } hyper = { version = "0.14.2", optional = true, features = ["client", "http1", "http2", "tcp"] }
hyper-rustls-crate = { package = "hyper-rustls", version = "0.23.0", optional = true, default-features = false } hyper-rustls = { version = "0.23.0", optional = true, default-features = false }
hyper-tls = { version = "0.5.0", optional = true } hyper-tls = { version = "0.5.0", optional = true }
isahc-crate = { package = "isahc", version = "1.3.1", optional = true } isahc = { version = "1.3.1", optional = true }
reqwest = { version = "0.11.4", optional = true, default-features = false } reqwest = { version = "0.11.4", optional = true, default-features = false }
ruma-client-api = { version = "0.14.1", path = "../ruma-client-api", optional = true, features = ["client"] } ruma-client-api = { version = "0.14.1", path = "../ruma-client-api", optional = true, features = ["client"] }
ruma-common = { version = "0.9.2", path = "../ruma-common", features = ["api"] } ruma-common = { version = "0.9.2", path = "../ruma-common", features = ["api"] }

7
crates/ruma-client/src/lib.rs
View File

@ -108,13 +108,6 @@ use ruma_common::{
}; };
use tracing::{info_span, Instrument}; use tracing::{info_span, Instrument};
// "Undo" rename from `Cargo.toml` that only serves to make crate names available as a Cargo
// feature names.
#[cfg(feature = "hyper-rustls")]
extern crate hyper_rustls_crate as hyper_rustls;
#[cfg(feature = "isahc")]
extern crate isahc_crate as isahc;
#[cfg(feature = "client-api")] #[cfg(feature = "client-api")]
mod client; mod client;
mod error; mod error;

2
crates/ruma-common/Cargo.toml
View File

@ -27,6 +27,8 @@ events = ["thiserror"]
# TODO: Use weak dependency features once MSRV >= 1.60 # TODO: Use weak dependency features once MSRV >= 1.60
js = ["js-sys", "getrandom/js", "uuid/js"] js = ["js-sys", "getrandom/js", "uuid/js"]
markdown = ["pulldown-cmark"] markdown = ["pulldown-cmark"]
# Should use dep:rand instead of the dependency being renamed, but that
# breaks trybuild: https://github.com/dtolnay/trybuild/issues/171
rand = ["rand_crate", "uuid"] rand = ["rand_crate", "uuid"]
unstable-exhaustive-types = [] unstable-exhaustive-types = []
unstable-pdu = [] unstable-pdu = []