Use macro to create the register function

Author: Guillaume Fraux

src/lib.rs

@@ -3,13 +3,13 @@ extern crate cpython;
 extern crate lumol;
 
 #[macro_use]
-mod testing;
+mod macros;
 mod systems;
 
 py_module_initializer!(lumol, initlumol, PyInit_lumol, |py, m| {
     try!(m.add(py, "__doc__", "Modern and extensible molecular simulation engine"));
 
-    try!(systems::particle::register(py, m));
+    try!(systems::register(py, m));
 
     Ok(())
 });

src/testing.rs renamed to src/macros.rs

@@ -24,3 +24,11 @@ macro_rules! py_run {
          py_run!($py, $dict, $($tail),+);
     });
 }
+
+macro_rules! register {
+    (|$py: ident, $m: ident| $closure: expr) => (
+        pub fn register($py: ::cpython::Python, $m: &::cpython::PyModule) -> ::cpython::PyResult<()> {
+            return $closure;
+        }
+    );
+}

src/systems/mod.rs

@@ -1 +1,6 @@
-pub mod particle;
+mod particle;
+
+register!(|py, m| {
+    try!(particle::register(py, m));
+    Ok(())
+});

src/systems/particle.rs

@@ -1,12 +1,11 @@
-use cpython::{PyObject, PyResult, PyModule, Python};
+use cpython::{PyObject, PyResult};
 use lumol;
 use std::cell::RefCell;
 
-pub fn register(py: Python, m: &PyModule) -> PyResult<()> {
+register!(|py, m| {
     try!(m.add_class::<Particle>(py));
     Ok(())
-}
-
+});
 
 py_class!(class Particle |py| {
     data particle: RefCell<lumol::Particle>;