From 3ce3b21eb10407e84a9d5baf73fb270cd54972ad Mon Sep 17 00:00:00 2001
From: Christian Legnitto <LegNeato@users.noreply.github.com>
Date: Sat, 8 Dec 2018 20:27:23 -0700
Subject: [PATCH] Flatten juniper_warp example (#289)
This isn't needed, as examples by default are built when the
containing crate is tested.
I also confirmed that `cargo run --example warp_server` still works.
---
Cargo.toml | 1 -
juniper_warp/Cargo.toml | 2 ++
.../{warp_server/src/main.rs => warp_server.rs} | 0
juniper_warp/examples/warp_server/Cargo.toml | 11 -----------
juniper_warp/examples/warp_server/Makefile.toml | 17 -----------------
5 files changed, 2 insertions(+), 29 deletions(-)
rename juniper_warp/examples/{warp_server/src/main.rs => warp_server.rs} (100%)
delete mode 100644 juniper_warp/examples/warp_server/Cargo.toml
delete mode 100644 juniper_warp/examples/warp_server/Makefile.toml
diff --git a/Cargo.toml b/Cargo.toml
index 48508f84..60cc11b7 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -7,5 +7,4 @@ members = [
"juniper_iron",
"juniper_rocket",
"juniper_warp",
- "juniper_warp/examples/warp_server/",
]
diff --git a/juniper_warp/Cargo.toml b/juniper_warp/Cargo.toml
index db0a84eb..9d556d99 100644
--- a/juniper_warp/Cargo.toml
+++ b/juniper_warp/Cargo.toml
@@ -19,4 +19,6 @@ tokio-threadpool = "0.1.7"
[dev-dependencies]
juniper = { path = "../juniper", version = "0.10.0", features = ["expose-test-schema", "serde_json"] }
+env_logger = "0.5.11"
+log = "0.4.3"
percent-encoding = "1.0"
diff --git a/juniper_warp/examples/warp_server/src/main.rs b/juniper_warp/examples/warp_server.rs
similarity index 100%
rename from juniper_warp/examples/warp_server/src/main.rs
rename to juniper_warp/examples/warp_server.rs
diff --git a/juniper_warp/examples/warp_server/Cargo.toml b/juniper_warp/examples/warp_server/Cargo.toml
deleted file mode 100644
index b1149ad5..00000000
--- a/juniper_warp/examples/warp_server/Cargo.toml
+++ /dev/null
@@ -1,11 +0,0 @@
-[package]
-name = "warp_server"
-version = "0.1.0"
-authors = ["Tom Houlé <tom@tomhoule.com>"]
-
-[dependencies]
-warp = "0.1.0"
-juniper_warp = { path = "../.." }
-env_logger = "0.5.11"
-log = "0.4.3"
-juniper = { path = "../../../juniper", version = ">=0.9, 0.10.0", features = ["expose-test-schema", "serde_json"] }
diff --git a/juniper_warp/examples/warp_server/Makefile.toml b/juniper_warp/examples/warp_server/Makefile.toml
deleted file mode 100644
index 94c3ecad..00000000
--- a/juniper_warp/examples/warp_server/Makefile.toml
+++ /dev/null
@@ -1,17 +0,0 @@
-[tasks.build-verbose]
-condition = { rust_version = { min = "1.29.0" } }
-
-[tasks.build-verbose.windows]
-condition = { rust_version = { min = "1.29.0" }, env = { "TARGET" = "x86_64-pc-windows-msvc" } }
-
-[tasks.test-verbose]
-condition = { rust_version = { min = "1.29.0" } }
-
-[tasks.test-verbose.windows]
-condition = { rust_version = { min = "1.29.0" }, env = { "TARGET" = "x86_64-pc-windows-msvc" } }
-
-[tasks.ci-coverage-flow]
-condition = { rust_version = { min = "1.29.0" } }
-
-[tasks.ci-coverage-flow.windows]
-disabled = true
\ No newline at end of file