Merge branch 'rustup' into rustbeta

rpc/Cargo.toml

@@ -4,22 +4,28 @@ name = "ethcore-rpc"
 version = "0.9.99"
 license = "GPL-3.0"
 authors = ["Ethcore <admin@ethcore.io"]
+build = "build.rs"
 
 [lib]
 
 [dependencies]
 serde = "0.6.7"
-serde_macros = "0.6.13"
 serde_json = "0.6.0"
-jsonrpc-core = "1.1.2"
-jsonrpc-http-server = "1.1.2"
+jsonrpc-core = "1.1"
+jsonrpc-http-server = "1.1"
 ethcore-util = { path = "../util" }
 ethcore = { path = "../ethcore" }
 ethsync = { path = "../sync" }
-clippy = { version = "0.0.41", optional = true }
+clippy = { version = "0.0.42", optional = true }
 target_info = "0.1.0"
 rustc-serialize = "0.3"
+serde_macros = { version = "0.6.13", optional = true }
+
+[build-dependencies]
+serde_codegen = { "version" = "0.6.13", "optional" = true }
+syntex = "0.28.0"
 
 [features]
-default = []
+default = ["serde_codegen"]
+nightly = ["serde_macros"]
 dev = ["clippy", "ethcore/dev", "ethcore-util/dev", "ethsync/dev"]

rpc/build.rs

@@ -0,0 +1,29 @@
+#[cfg(not(feature = "serde_macros"))]
+mod inner {
+    extern crate syntex;
+    extern crate serde_codegen;
+
+    use std::env;
+    use std::path::Path;
+
+    pub fn main() {
+        let out_dir = env::var_os("OUT_DIR").unwrap();
+
+        let src = Path::new("src/lib.rs.in");
+        let dst = Path::new(&out_dir).join("lib.rs");
+
+        let mut registry = syntex::Registry::new();
+
+        serde_codegen::register(&mut registry);
+        registry.expand("", &src, &dst).unwrap();
+    }
+}
+
+#[cfg(feature = "serde_macros")]
+mod inner {
+    pub fn main() {}
+}
+
+fn main() {
+    inner::main();
+}

rpc/src/lib.rs

@@ -16,9 +16,8 @@
 
 //! Ethcore rpc.
 #![warn(missing_docs)]
-#![feature(custom_derive, custom_attribute, plugin)]
-#![plugin(serde_macros)]
-#![cfg_attr(feature="dev", plugin(clippy))]
+#![cfg_attr(nightly, feature(custom_derive, custom_attribute, plugin))]
+#![cfg_attr(nightly, plugin(serde_macros, clippy))]
 
 extern crate rustc_serialize;
 extern crate target_info;
@@ -30,38 +29,8 @@ extern crate ethcore_util as util;
 extern crate ethcore;
 extern crate ethsync;
 
-use self::jsonrpc_core::{IoHandler, IoDelegate};
+#[cfg(feature = "serde_macros")]
+include!("lib.rs.in");
 
-pub mod v1;
-
-/// Http server.
-pub struct HttpServer {
-	handler: IoHandler,
-	threads: usize
-}
-
-impl HttpServer {
-	/// Construct new http server object with given number of threads.
-	pub fn new(threads: usize) -> HttpServer {
-		HttpServer {
-			handler: IoHandler::new(),
-			threads: threads
-		}
-	}
-
-	/// Add io delegate.
-	pub fn add_delegate<D>(&mut self, delegate: IoDelegate<D>) where D: Send + Sync + 'static {
-		self.handler.add_delegate(delegate);
-	}
-
-	/// Start server asynchronously in new thread
-	pub fn start_async(self, addr: &str) {
-		let server = jsonrpc_http_server::Server::new(self.handler, self.threads);
-		server.start_async(addr)
-	}
-}
-
-/// Lib needs at least 1 test to generate coverage reports correctly.
-#[test]
-fn if_works() {
-}
+#[cfg(not(feature = "serde_macros"))]
+include!(concat!(env!("OUT_DIR"), "/lib.rs"));

rpc/src/lib.rs.in

@@ -0,0 +1,30 @@
+use self::jsonrpc_core::{IoHandler, IoDelegate};
+
+pub mod v1;
+
+/// Http server.
+pub struct HttpServer {
+	handler: IoHandler,
+	threads: usize
+}
+
+impl HttpServer {
+	/// Construct new http server object with given number of threads.
+	pub fn new(threads: usize) -> HttpServer {
+		HttpServer {
+			handler: IoHandler::new(),
+			threads: threads
+		}
+	}
+
+	/// Add io delegate.
+	pub fn add_delegate<D>(&mut self, delegate: IoDelegate<D>) where D: Send + Sync + 'static {
+		self.handler.add_delegate(delegate);
+	}
+
+	/// Start server asynchronously in new thread
+	pub fn start_async(self, addr: &str) {
+		let server = jsonrpc_http_server::Server::new(self.handler, self.threads);
+		server.start_async(addr)
+	}
+}