From f9d6f2c83f9814cf41bf8c32a45d4b36aec567fb Mon Sep 17 00:00:00 2001
From: theduke <chris@theduke.at>
Date: Tue, 12 Sep 2017 11:01:56 +0200
Subject: [PATCH] Revert "(juniper) Clean up uuid and url features."
This reverts commit dcdc03a9b91fe37533bc93ce115cc23aecc286bd.
---
juniper/Cargo.toml | 3 ++-
juniper/Makefile.toml | 9 ---------
juniper/src/lib.rs | 4 ++--
3 files changed, 4 insertions(+), 12 deletions(-)
delete mode 100644 juniper/Makefile.toml
diff --git a/juniper/Cargo.toml b/juniper/Cargo.toml
index 77f8a269..66a796a7 100644
--- a/juniper/Cargo.toml
+++ b/juniper/Cargo.toml
@@ -22,13 +22,14 @@ path = "benches/bench.rs"
[features]
nightly = []
expose-test-schema = []
+default = ["url", "uuid"]
[dependencies]
ordermap = { version = "^0.2.11", features = ["serde-1"] }
serde = { version = "^1.0.8" }
serde_derive = {version="^1.0.8" }
serde_json = { version="^1.0.2", optional = true }
-url = { version = "1.5.1", optional = true }
+url = { version = "^1.5.1", optional = true }
uuid = { version = "0.5.1", optional = true }
[dev-dependencies]
diff --git a/juniper/Makefile.toml b/juniper/Makefile.toml
deleted file mode 100644
index 7aee2a86..00000000
--- a/juniper/Makefile.toml
+++ /dev/null
@@ -1,9 +0,0 @@
-[tasks.build-verbose]
-description = "Runs the rust compiler with verbose output."
-command = "cargo"
-args = ["build", "--verbose", "--all-features"]
-
-[tasks.test-verbose]
-description = "Runs all available tests with verbose output."
-command = "cargo"
-args = ["test", "--verbose", "--all-features"]
diff --git a/juniper/src/lib.rs b/juniper/src/lib.rs
index 3abd8254..9a98e345 100644
--- a/juniper/src/lib.rs
+++ b/juniper/src/lib.rs
@@ -124,10 +124,10 @@ extern crate serde_json;
extern crate ordermap;
-#[cfg(feature = "url")]
+#[cfg(any(test, feature = "url"))]
extern crate url;
-#[cfg(feature = "uuid")]
+#[cfg(any(test, feature = "uuid"))]
extern crate uuid;
use std::borrow::Cow;