From 0efac871bc3bd5a6734b118e2a2e9f4fd589e8b1 Mon Sep 17 00:00:00 2001
From: Jonas Platte <jplatte+git@posteo.de>
Date: Fri, 24 Apr 2020 21:33:10 +0200
Subject: [PATCH] Remove the option to disable macro reexport

---
 Cargo.toml         | 14 +++-----------
 src/lib.rs         |  2 --
 tests/no_fields.rs |  2 +-
 3 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index ecb85c39..f6e95da2 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -17,10 +17,10 @@ edition = "2018"
 
 [dependencies]
 http = "0.2.1"
-percent-encoding = { version = "2.1.0", optional = true }
-ruma-api-macros = { version = "=0.16.0-rc.3", path = "ruma-api-macros", optional = true }
+percent-encoding = "2.1.0"
+ruma-api-macros = { version = "=0.16.0-rc.3", path = "ruma-api-macros" }
 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_urlencoded = "0.6.1"
 strum = "0.18.0"
@@ -28,14 +28,6 @@ strum = "0.18.0"
 [dev-dependencies]
 ruma-events = "0.21.0-beta.1"
 
-[features]
-default = ["with-ruma-api-macros"]
-with-ruma-api-macros = [
-  "percent-encoding",
-  "ruma-api-macros",
-  "serde",
-]
-
 [workspace]
 members = [
   "ruma-api-macros",
diff --git a/src/lib.rs b/src/lib.rs
index 0d0f1069..2d7e97bd 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -191,13 +191,11 @@ use http::Method;
 ///     }
 /// }
 /// ```
-#[cfg(feature = "with-ruma-api-macros")]
 pub use ruma_api_macros::ruma_api;
 
 pub mod error;
 /// This module is used to support the generated code from ruma-api-macros.
 /// It is not considered part of ruma-api's public API.
-#[cfg(feature = "with-ruma-api-macros")]
 #[doc(hidden)]
 pub mod exports {
     pub use http;
diff --git a/tests/no_fields.rs b/tests/no_fields.rs
index 50e0227d..e2508737 100644
--- a/tests/no_fields.rs
+++ b/tests/no_fields.rs
@@ -1,6 +1,6 @@
 use std::convert::TryFrom;
 
-use ruma_api_macros::ruma_api;
+use ruma_api::ruma_api;
 
 ruma_api! {
     metadata {