Getting rid of syntex

openethereum · Aug 19, 2016 · d996754 · d996754
1 parent 070a215
commit d996754
Show file tree

Hide file tree

Showing 14 changed files with 14 additions and 40 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -8,7 +8,6 @@ build = "build.rs"
 
 [build-dependencies]
 rustc_version = "0.1"
-syntex = "*"
 ethcore-ipc-codegen = { path = "ipc/codegen" }
 ethcore-ipc-tests = { path = "ipc/tests" }
 

diff --git a/dapps/Cargo.toml b/dapps/Cargo.toml
@@ -33,7 +33,6 @@ clippy = { version = "0.0.82", optional = true}
 
 [build-dependencies]
 serde_codegen = { version = "0.7.0", optional = true }
-syntex = "*"
 
 [features]
 default = ["serde_codegen", "extra-dapps"]

diff --git a/dapps/build.rs b/dapps/build.rs
@@ -16,7 +16,6 @@
 
 #[cfg(not(feature = "serde_macros"))]
 mod inner {
-    extern crate syntex;
     extern crate serde_codegen;
 
     use std::env;
@@ -28,10 +27,7 @@ mod inner {
         let src = Path::new("./src/api/types.rs.in");
         let dst = Path::new(&out_dir).join("types.rs");
 
-        let mut registry = syntex::Registry::new();
-
-        serde_codegen::register(&mut registry);
-        registry.expand("", &src, &dst).unwrap();
+        serde_codegen::expand(&src, &dst).unwrap();
     }
 }
 

diff --git a/db/Cargo.toml b/db/Cargo.toml
@@ -8,7 +8,6 @@ authors = ["Ethcore <admin@ethcore.io>"]
 build = "build.rs"
 
 [build-dependencies]
-syntex = "*"
 ethcore-ipc-codegen = { path = "../ipc/codegen" }
 
 [dependencies]

diff --git a/db/build.rs b/db/build.rs
@@ -14,7 +14,6 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-extern crate syntex;
 extern crate ethcore_ipc_codegen as codegen;
 
 use std::env;
@@ -27,17 +26,13 @@ pub fn main() {
 	{
 		let src = Path::new("src/lib.rs.in");
 		let dst = Path::new(&out_dir).join("lib.intermediate.rs.in");
-		let mut registry = syntex::Registry::new();
-		codegen::register(&mut registry);
-		registry.expand("", &src, &dst).unwrap();
+		codegen::expand(&src, &dst);
 	}
 
 	// binary serialization pass
 	{
 		let src = Path::new(&out_dir).join("lib.intermediate.rs.in");
 		let dst = Path::new(&out_dir).join("lib.rs");
-		let mut registry = syntex::Registry::new();
-		codegen::register(&mut registry);
-		registry.expand("", &src, &dst).unwrap();
+		codegen::expand(&src, &dst);
 	}
 }
diff --git a/ethstore/Cargo.toml b/ethstore/Cargo.toml
@@ -21,7 +21,6 @@ itertools = "0.4"
 
 [build-dependencies]
 serde_codegen = { version = "0.7", optional = true }
-syntex = "0.33.0"
 
 [features]
 default = ["serde_codegen"]

diff --git a/ethstore/build.rs b/ethstore/build.rs
@@ -16,7 +16,6 @@
 
 #[cfg(not(feature = "serde_macros"))]
 mod inner {
-    extern crate syntex;
     extern crate serde_codegen;
 
     use std::env;
@@ -28,10 +27,7 @@ mod inner {
         let src = Path::new("src/json/mod.rs.in");
         let dst = Path::new(&out_dir).join("mod.rs");
 
-        let mut registry = syntex::Registry::new();
-
-        serde_codegen::register(&mut registry);
-        registry.expand("", &src, &dst).unwrap();
+        serde_codegen::expand(&src, &dst).unwrap();
     }
 }
 

diff --git a/ipc/codegen/src/lib.rs b/ipc/codegen/src/lib.rs
@@ -48,6 +48,13 @@ include!(concat!(env!("OUT_DIR"), "/lib.rs"));
 #[cfg(not(feature = "with-syntex"))]
 include!("lib.rs.in");
 
+#[cfg(feature = "with-syntex")]
+pub fn expand(src: &std::path::Path, dst: &std::path::Path) {
+	let mut registry = syntex::Registry::new();
+	register(&mut registry);
+	registry.expand("", src, dst).unwrap();
+}
+
 #[cfg(feature = "with-syntex")]
 pub fn register(reg: &mut syntex::Registry) {
 	use syntax::{ast, fold};

diff --git a/ipc/tests/Cargo.toml b/ipc/tests/Cargo.toml
@@ -17,5 +17,4 @@ ethcore-util = { path = "../../util" }
 log = "0.3"
 
 [build-dependencies]
-syntex = "0.33"
 ethcore-ipc-codegen = { path = "../codegen" }
diff --git a/json/Cargo.toml b/json/Cargo.toml
@@ -14,7 +14,6 @@ clippy = { version = "0.0.82", optional = true}
 
 [build-dependencies]
 serde_codegen = { version = "0.7.0", optional = true }
-syntex = "*"
 
 [features]
 default = ["serde_codegen"]

diff --git a/json/build.rs b/json/build.rs
@@ -16,7 +16,6 @@
 
 #[cfg(not(feature = "serde_macros"))]
 mod inner {
-    extern crate syntex;
     extern crate serde_codegen;
 
     use std::env;
@@ -28,10 +27,7 @@ mod inner {
         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();
+        serde_codegen::expand(&src, &dst).unwrap();
     }
 }
 

diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml
@@ -31,7 +31,6 @@ ethcore-ipc = { path = "../ipc/rpc" }
 
 [build-dependencies]
 serde_codegen = { version = "0.7.0", optional = true }
-syntex = "*"
 
 [features]
 default = ["serde_codegen"]

diff --git a/rpc/build.rs b/rpc/build.rs
@@ -16,7 +16,6 @@
 
 #[cfg(not(feature = "serde_macros"))]
 mod inner {
-    extern crate syntex;
     extern crate serde_codegen;
 
     use std::env;
@@ -28,10 +27,7 @@ mod inner {
         let src = Path::new("src/v1/types/mod.rs.in");
         let dst = Path::new(&out_dir).join("mod.rs");
 
-        let mut registry = syntex::Registry::new();
-
-        serde_codegen::register(&mut registry);
-        registry.expand("", &src, &dst).unwrap();
+        serde_codegen::expand(&src, &dst).unwrap();
     }
 }