Remove the option to disable macro reexport

This commit is contained in:
Jonas Platte 2020-04-24 21:33:10 +02:00
parent f1789032fd
commit 0efac871bc
No known key found for this signature in database
GPG Key ID: 7D261D771D915378
3 changed files with 4 additions and 14 deletions

View File

@ -17,10 +17,10 @@ edition = "2018"
[dependencies] [dependencies]
http = "0.2.1" http = "0.2.1"
percent-encoding = { version = "2.1.0", optional = true } percent-encoding = "2.1.0"
ruma-api-macros = { version = "=0.16.0-rc.3", path = "ruma-api-macros", optional = true } ruma-api-macros = { version = "=0.16.0-rc.3", path = "ruma-api-macros" }
ruma-identifiers = "0.16.0" ruma-identifiers = "0.16.0"
serde = { version = "1.0.106", features = ["derive"], optional = true } serde = { version = "1.0.106", features = ["derive"] }
serde_json = "1.0.51" serde_json = "1.0.51"
serde_urlencoded = "0.6.1" serde_urlencoded = "0.6.1"
strum = "0.18.0" strum = "0.18.0"
@ -28,14 +28,6 @@ strum = "0.18.0"
[dev-dependencies] [dev-dependencies]
ruma-events = "0.21.0-beta.1" ruma-events = "0.21.0-beta.1"
[features]
default = ["with-ruma-api-macros"]
with-ruma-api-macros = [
"percent-encoding",
"ruma-api-macros",
"serde",
]
[workspace] [workspace]
members = [ members = [
"ruma-api-macros", "ruma-api-macros",

View File

@ -191,13 +191,11 @@ use http::Method;
/// } /// }
/// } /// }
/// ``` /// ```
#[cfg(feature = "with-ruma-api-macros")]
pub use ruma_api_macros::ruma_api; pub use ruma_api_macros::ruma_api;
pub mod error; pub mod error;
/// This module is used to support the generated code from ruma-api-macros. /// This module is used to support the generated code from ruma-api-macros.
/// It is not considered part of ruma-api's public API. /// It is not considered part of ruma-api's public API.
#[cfg(feature = "with-ruma-api-macros")]
#[doc(hidden)] #[doc(hidden)]
pub mod exports { pub mod exports {
pub use http; pub use http;

View File

@ -1,6 +1,6 @@
use std::convert::TryFrom; use std::convert::TryFrom;
use ruma_api_macros::ruma_api; use ruma_api::ruma_api;
ruma_api! { ruma_api! {
metadata { metadata {