Rename proc-macro related crates

mehcode · Sep 8, 2017 · 9119358 · 9119358
1 parent 1570732
commit 9119358
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 14 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -4,13 +4,13 @@ lto = true
 [workspace]
 members = [
   "lib/",
-  "shio-macro",
+  "macros/",
   "examples/hello",
   "examples/json",
   "examples/proxy",
   "examples/stateful",
   "examples/redirect",
   "examples/templates_askama",
   "examples/postgres",
-  "examples/hello_macro",
+  "examples/hello_macros",
 ]
diff --git a/examples/hello_macro/Cargo.toml b/examples/hello_macro/Cargo.toml
diff --git a/examples/hello_macros/Cargo.toml b/examples/hello_macros/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "hello_macros"
+version = "0.0.0"
+workspace = "../.."
+
+[dependencies]
+shio = { path = "../../lib", features=["nightly"] }
diff --git a/examples/hello_macro/src/main.rs → examples/hello_macros/src/main.rs b/examples/hello_macro/src/main.rs → examples/hello_macros/src/main.rs
@@ -1,8 +1,6 @@
 #![feature(proc_macro)]
 
 extern crate shio;
-extern crate shio_macro;
-use shio_macro::*;
 
 use shio::prelude::*;
 

diff --git a/lib/Cargo.toml b/lib/Cargo.toml
@@ -22,6 +22,8 @@ regex = "0.2"
 log = "0.3"
 typemap = "0.3"
 
+shio_macros = { path="../macros", optional=true }
+
 [features]
 default = []
-nightly = []
+nightly = ["shio_macros"]
diff --git a/lib/src/lib.rs b/lib/src/lib.rs
@@ -1,5 +1,6 @@
 #![cfg_attr(feature = "cargo-clippy", warn(clippy, clippy_pedantic))]
 #![cfg_attr(feature = "cargo-clippy", allow(missing_docs_in_private_items))]
+#![cfg_attr(feature = "nightly", feature(proc_macro))]
 
 extern crate futures;
 extern crate hyper;
@@ -12,6 +13,9 @@ extern crate tokio_core;
 extern crate tokio_io;
 extern crate typemap;
 
+#[cfg(feature = "nightly")]
+extern crate shio_macros;
+
 pub mod context;
 mod handler;
 mod shio;
@@ -30,11 +34,17 @@ pub use shio::Shio;
 pub use context::Context;
 pub use handler::Handler;
 
+#[cfg(feature = "nightly")]
+pub use shio_macros::{get, post};
+
 /// Re-exports important traits and types. Meant to be glob imported when using Shio.
 pub mod prelude {
     pub use super::{header, Context, Method, Request, Response, Shio, StatusCode};
     pub use super::router::Parameters;
 
     pub use futures::{Future, IntoFuture};
     pub use ext::{BoxFuture, FutureExt};
+
+    #[cfg(feature = "nightly")]
+    pub use shio_macros::{get, post};
 }
diff --git a/shio-macro/Cargo.toml → macros/Cargo.toml b/shio-macro/Cargo.toml → macros/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "shio-macro"
+name = "shio_macros"
 version = "0.1.0"
 authors = ["Quentin Laveau <qlaveau@gmail.com>"]
 workspace = ".."

diff --git a/shio-macro/src/lib.rs → macros/src/lib.rs b/shio-macro/src/lib.rs → macros/src/lib.rs