aboutsummaryrefslogtreecommitdiff
path: root/src/internal
diff options
context:
space:
mode:
authorZeyla Hellyer <[email protected]>2018-08-07 09:24:07 -0700
committerZeyla Hellyer <[email protected]>2018-08-07 09:25:06 -0700
commit39bb75cc6759ceb972c0caca0b03c7971a445eb8 (patch)
tree343d97399ea597804f0cd30016034c4adb8efebe /src/internal
parentFix some documentation spacing (diff)
downloadserenity-39bb75cc6759ceb972c0caca0b03c7971a445eb8.tar.xz
serenity-39bb75cc6759ceb972c0caca0b03c7971a445eb8.zip
Fix compilation + tests on certain feature combos
On certain feature combinations, compilation and tests would not function correctly. This commit goes through a number of feature combinations and gates some tests behind the required features and fixes other compilation errors.
Diffstat (limited to 'src/internal')
-rw-r--r--src/internal/macros.rs11
1 files changed, 1 insertions, 10 deletions
diff --git a/src/internal/macros.rs b/src/internal/macros.rs
index 31b6b7d..a03e9bd 100644
--- a/src/internal/macros.rs
+++ b/src/internal/macros.rs
@@ -1,6 +1,6 @@
//! A set of macros for easily working with internals.
-#[cfg(feature = "http")]
+#[cfg(feature = "model")]
macro_rules! request_client {
() => {{
use hyper::net::HttpsConnector;
@@ -59,15 +59,6 @@ macro_rules! feature_cache {
}
}
-#[cfg(all(feature = "client", not(feature = "framework")))]
-macro_rules! feature_framework {
- ($enabled:block else $disabled:block) => {
- {
- $disabled
- }
- }
-}
-
macro_rules! enum_number {
($name:ident { $($variant:ident, )* }) => {
impl ::serde::Serialize for $name {