Merge pull request RustPython#546 from rickyhan/master

windelbouwman · web-flow · commit 53f54e4d761b · 2019-02-26T17:21:59.000+01:00
Use closure instead of function pointer for StdlibInitFunc
diff --git a/vm/src/stdlib/mod.rs b/vm/src/stdlib/mod.rs
@@ -21,33 +21,33 @@ mod os;
 
 use crate::pyobject::{PyContext, PyObjectRef};
 
-pub type StdlibInitFunc = fn(&PyContext) -> PyObjectRef;
+pub type StdlibInitFunc = Box<dyn Fn(&PyContext) -> PyObjectRef>;
 
 pub fn get_module_inits() -> HashMap<String, StdlibInitFunc> {
     let mut modules = HashMap::new();
-    modules.insert("ast".to_string(), ast::mk_module as StdlibInitFunc);
-    modules.insert("dis".to_string(), dis::mk_module as StdlibInitFunc);
-    modules.insert("json".to_string(), json::mk_module as StdlibInitFunc);
-    modules.insert("keyword".to_string(), keyword::mk_module as StdlibInitFunc);
-    modules.insert("math".to_string(), math::mk_module as StdlibInitFunc);
-    modules.insert("re".to_string(), re::mk_module as StdlibInitFunc);
-    modules.insert("random".to_string(), random::mk_module as StdlibInitFunc);
-    modules.insert("string".to_string(), string::mk_module as StdlibInitFunc);
-    modules.insert("struct".to_string(), pystruct::mk_module as StdlibInitFunc);
-    modules.insert("time".to_string(), time_module::mk_module as StdlibInitFunc);
     modules.insert(
-        "tokenize".to_string(),
-        tokenize::mk_module as StdlibInitFunc,
+        "ast".to_string(),
+        Box::new(ast::mk_module) as StdlibInitFunc,
     );
-    modules.insert("types".to_string(), types::mk_module as StdlibInitFunc);
-    modules.insert("_weakref".to_string(), weakref::mk_module as StdlibInitFunc);
+    modules.insert("dis".to_string(), Box::new(dis::mk_module));
+    modules.insert("json".to_string(), Box::new(json::mk_module));
+    modules.insert("keyword".to_string(), Box::new(keyword::mk_module));
+    modules.insert("math".to_string(), Box::new(math::mk_module));
+    modules.insert("re".to_string(), Box::new(re::mk_module));
+    modules.insert("random".to_string(), Box::new(random::mk_module));
+    modules.insert("string".to_string(), Box::new(string::mk_module));
+    modules.insert("struct".to_string(), Box::new(pystruct::mk_module));
+    modules.insert("time".to_string(), Box::new(time_module::mk_module));
+    modules.insert("tokenize".to_string(), Box::new(tokenize::mk_module));
+    modules.insert("types".to_string(), Box::new(types::mk_module));
+    modules.insert("_weakref".to_string(), Box::new(weakref::mk_module));
 
     // disable some modules on WASM
     #[cfg(not(target_arch = "wasm32"))]
     {
-        modules.insert("io".to_string(), io::mk_module as StdlibInitFunc);
-        modules.insert("os".to_string(), os::mk_module as StdlibInitFunc);
-        modules.insert("socket".to_string(), socket::mk_module as StdlibInitFunc);
+        modules.insert("io".to_string(), Box::new(io::mk_module));
+        modules.insert("os".to_string(), Box::new(os::mk_module));
+        modules.insert("socket".to_string(), Box::new(socket::mk_module));
     }
 
     modules
diff --git a/wasm/lib/src/browser_module.rs b/wasm/lib/src/browser_module.rs
@@ -134,5 +134,6 @@ pub fn mk_module(ctx: &PyContext) -> PyObjectRef {
 }
 
 pub fn setup_browser_module(vm: &mut VirtualMachine) {
-    vm.stdlib_inits.insert(BROWSER_NAME.to_string(), mk_module);
+    vm.stdlib_inits
+        .insert(BROWSER_NAME.to_string(), Box::new(mk_module));
 }

Original file line number	Diff line number	Diff line change
`@@ -134,5 +134,6 @@ pub fn mk_module(ctx: &PyContext) -> PyObjectRef {`
`134`	`134`	`}`
`135`	`135`
`136`	`136`	`pub fn setup_browser_module(vm: &mut VirtualMachine) {`
`137`		`- vm.stdlib_inits.insert(BROWSER_NAME.to_string(), mk_module);`
	`137`	`+ vm.stdlib_inits`
	`138`	`+ .insert(BROWSER_NAME.to_string(), Box::new(mk_module));`
`138`	`139`	`}`