From 709231dc46d0bc49e260fc8144a276d5c6d95425 Mon Sep 17 00:00:00 2001
From: theduke <chris@theduke.at>
Date: Sat, 2 Dec 2017 03:55:14 +0100
Subject: [PATCH] Make juniper_codegen dependency non-optional.
---
juniper/Cargo.toml | 4 +---
juniper/src/lib.rs | 8 ++------
2 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/juniper/Cargo.toml b/juniper/Cargo.toml
index e51a2932..6c28d2b0 100644
--- a/juniper/Cargo.toml
+++ b/juniper/Cargo.toml
@@ -20,18 +20,16 @@ harness = false
path = "benches/bench.rs"
[features]
-codegen = ["juniper_codegen"]
nightly = []
expose-test-schema = []
default = [
- "codegen",
"chrono",
"url",
"uuid"
]
[dependencies]
-juniper_codegen = { version = "0.9.0", path = "../juniper_codegen" , optional = true}
+juniper_codegen = { version = "0.9.0", path = "../juniper_codegen" }
fnv = "1.0.3"
ordermap = { version = "0.2.11", features = ["serde-1"] }
diff --git a/juniper/src/lib.rs b/juniper/src/lib.rs
index 3e8610ed..e034d3c7 100644
--- a/juniper/src/lib.rs
+++ b/juniper/src/lib.rs
@@ -134,18 +134,14 @@ extern crate url;
#[cfg(any(test, feature = "uuid"))]
extern crate uuid;
-// If the "codegen" feature is enabled, depend on juniper_codegen and re-export everything in it.
-// This allows users to just depend on juniper and get the derive funcationality automatically.
-#[cfg(feature = "codegen")]
+// Depend on juniper_codegen and re-export everything in it.
+// This allows users to just depend on juniper and get the derive functionality automatically.
#[allow(unused_imports)]
#[macro_use]
extern crate juniper_codegen;
-
-#[cfg(feature = "codegen")]
#[doc(hidden)]
pub use juniper_codegen::*;
-
#[macro_use]
mod value;
#[macro_use]