Bring tide to root, and allow cargo run --example (#247)

Bring tide to root, and allow `cargo run --example`

Author: fairingrey

.travis.yml

@@ -50,7 +50,6 @@ matrix:
         --no-default-features
     - cargo build
         -Zmtime-on-use
-        --manifest-path tide/Cargo.toml
         --no-default-features
 
   - name: cargo test

Cargo.toml

@@ -1,10 +1,63 @@
+[package]
+authors = [
+    "Aaron Turon <[email protected]>",
+    "Yoshua Wuyts <[email protected]>",
+]
+description = "WIP modular web framework"
+documentation = "https://docs.rs/tide"
+keywords = ["tide", "http", "web", "framework", "async"]
+categories = [
+  "network-programming",
+  "asynchronous",
+  "web-programming::http-server"
+]
+edition = "2018"
+license = "MIT OR Apache-2.0"
+name = "tide"
+readme = "README.md"
+repository = "https://github.com/rustasync/tide"
+version = "0.2.0"
+
+[features]
+default = ["hyper", "cookies"]
+cookies = ["tide-cookies"]
+hyper = ["tide-core/http-service-hyper"]
+
+[dependencies]
+futures-preview = "0.3.0-alpha.16"
+http = "0.1"
+http-service = "0.2.0"
+serde = "1.0.91"
+serde_derive = "1.0.91"
+serde_urlencoded = "0.5.5"
+slog = "2.4.1"
+slog-async = "2.3.0"
+slog-term = "2.4.0"
+tide-cookies = { path = "./tide-cookies", optional = true }
+tide-core = { path = "./tide-core" }
+
+[dependencies.multipart]
+default-features = false
+features = ["server"]
+version = "0.16.1"
+
+[dev-dependencies]
+bytes = "0.4.12"
+cookie = { version = "0.12", features = ["percent-encode"] }
+futures-fs = "0.0.5"
+futures-util-preview = { version = "0.3.0-alpha.16", features = ["compat"] }
+http-service-mock = "0.2.0"
+juniper = "0.11.1"
+mime = "0.3.13"
+mime_guess = "2.0.0-alpha.6"
+percent-encoding = "1.0.1"
+serde = { version = "1.0.91", features = ["derive"] }
+
 [workspace]
 members = [
-    "tide",
     "tide-compression",
     "tide-cookies",
     "tide-core",
-    "examples",
 ]
 
 [patch.crates-io]

examples/Cargo.toml

@@ -1,3 +1,4 @@
+#![feature(async_await)]
 use serde::{Deserialize, Serialize};
 use tide::{
     error::ResultExt,
@@ -35,7 +36,7 @@ async fn echo_form(mut cx: Context<()>) -> EndpointResult {
     Ok(forms::form(msg))
 }
 
-pub fn main() {
+fn main() {
     let mut app = App::new();
 
     app.at("/echo/string").post(echo_string);

examples/src/body_types.rs renamed to examples/body_types.rs

@@ -1,11 +1,12 @@
+#![feature(async_await)]
 use tide::Context;
 
 async fn echo_path(cx: Context<()>) -> String {
     let path: String = cx.param("path").unwrap();
     format!("Your path is: {}", path)
 }
 
-pub fn main() {
+fn main() {
     let mut app = tide::App::new();
     app.at("/echo_path/*path").get(echo_path);
     app.run("127.0.0.1:8000").unwrap();

examples/src/catch_all.rs renamed to examples/catch_all.rs

@@ -1,3 +1,4 @@
+#![feature(async_await)]
 use cookie::Cookie;
 use tide::{cookies::ContextExt, middleware::CookiesMiddleware, Context};
 
@@ -14,7 +15,7 @@ async fn remove_cookie(mut cx: Context<()>) {
     cx.remove_cookie(Cookie::named("hello")).unwrap();
 }
 
-pub fn main() {
+fn main() {
     let mut app = tide::App::new();
     app.middleware(CookiesMiddleware::new());
 

examples/src/cookies.rs renamed to examples/cookies.rs

@@ -1,6 +1,8 @@
+#![feature(async_await)]
+
 use tide::middleware::DefaultHeaders;
 
-pub fn main() {
+fn main() {
     let mut app = tide::App::new();
 
     app.middleware(

examples/src/default_headers.rs renamed to examples/default_headers.rs

@@ -2,6 +2,7 @@
 // a look at [the Juniper book].
 //
 // [the Juniper book]: https://graphql-rust.github.io/
+#![feature(async_await)]
 use http::status::StatusCode;
 use juniper::graphql_object;
 use std::sync::{atomic, Arc};
@@ -56,7 +57,7 @@ async fn handle_graphql(mut cx: Context<Data>) -> EndpointResult {
     Ok(resp)
 }
 
-pub fn main() {
+fn main() {
     let mut app = App::with_state(Data::default());
     app.at("/graphql").post(handle_graphql);
     app.run("127.0.0.1:8000").unwrap();

examples/src/graphql.rs renamed to examples/graphql.rs

@@ -1,4 +1,5 @@
-pub fn main() {
+#![feature(async_await)]
+fn main() {
     let mut app = tide::App::new();
     app.at("/").get(async move |_| "Hello, world!");
     app.run("127.0.0.1:8000").unwrap();

examples/src/hello.rs renamed to examples/hello.rs

@@ -1,3 +1,5 @@
+#![feature(async_await)]
+
 use http::status::StatusCode;
 use serde::{Deserialize, Serialize};
 use std::sync::Mutex;
@@ -62,7 +64,7 @@ async fn get_message(cx: Context<Database>) -> EndpointResult {
     }
 }
 
-pub fn main() {
+fn main() {
     let mut app = App::with_state(Database::default());
     app.at("/message").post(new_message);
     app.at("/message/:id").get(get_message).post(set_message);

examples/src/messages.rs renamed to examples/messages.rs

@@ -1,3 +1,4 @@
+#![feature(async_await)]
 use serde::{Deserialize, Serialize};
 use std::io::Read;
 use tide::{forms::ContextExt, response, App, Context, EndpointResult};

examples/src/multipart_form/mod.rs renamed to examples/multipart_form/mod.rs

@@ -1,3 +1,5 @@
+#![feature(async_await)]
+
 use bytes::Bytes;
 use futures_fs::FsPool;
 use futures_util::compat::*;
@@ -119,7 +121,7 @@ async fn handle_path(ctx: Context<StaticFile>) -> EndpointResult {
         })
 }
 
-pub fn main() {
+fn main() {
     let mut app = App::with_state(StaticFile::new("./"));
     app.at("/*").get(handle_path);
     app.run("127.0.0.1:8000").unwrap();

examples/src/multipart_form/test.txt renamed to examples/multipart_form/test.txt

@@ -19,7 +19,7 @@
 //!
 
 #[cfg(test)]
-#[doc(include = "../../README.md")]
+#[doc(include = "../README.md")]
 const _README: () = ();
 
 #[macro_use]

examples/src/lib.rs

@@ -14,7 +14,7 @@ repository = "https://github.com/rustasync/tide"
 version = "0.1.0"
 
 [dependencies]
-tide = { path = "../tide" }
+tide = { path = "../" }
 accept-encoding = "0.2.0-alpha.2"
 bytes = "0.4.12"
 futures-preview = "0.3.0-alpha.16"

examples/src/staticfile.rs renamed to examples/staticfile.rs

@@ -12,7 +12,7 @@ async fn echo_bytes(mut cx: Context<()>) -> Vec<u8> {
     cx.body_bytes().await.unwrap()
 }
 
-pub fn main() {
+fn main() {
     let mut app = App::new();
     app.at("/").get(lorem_ipsum);
     app.at("/echo").post(echo_bytes);

tide/src/error.rs renamed to src/error.rs

@@ -24,7 +24,7 @@ optional = true
 version = "0.2.0"
 
 [dev-dependencies]
-tide = { path = "../tide" }
+tide = { path = "../" }
 serde_derive = "1.0.91"
 
 [features]