Simplify loader builder and ensure globals are never loaded as module

Author: Sytten

src/loader/builder.rs

@@ -95,8 +95,6 @@ impl ModuleLoaderBuilder {
         R: ModuleDef + HasModule,
         M: AsModule<O, R>,
     {
-        let name = name.unwrap_or(R::name());
-        let m = module.as_module();
         let o = module.options();
 
         // Create a new closure that explicitly captures 'js lifetime
@@ -111,19 +109,15 @@ impl ModuleLoaderBuilder {
         let boxed_globals: GlobalLoadFn = Box::new(globals_fn);
 
         if R::is_module() {
-            self.insert_module(name, m);
+            let name = name.unwrap_or(R::name());
+            self.names.insert(name);
+            self.modules.insert(name, load_module_func::<R>);
         }
 
         self.globals.push(boxed_globals);
         self
     }
 
-    fn insert_module<M: ModuleDef>(&mut self, name: &'static str, _module: M) -> &mut Self {
-        self.names.insert(name);
-        self.modules.insert(name, load_module_func::<M>);
-        self
-    }
-
     pub fn build(self) -> (ModuleLoader, ModuleResolver, GlobalInitializer) {
         (
             ModuleLoader::new(self.modules),

src/wrapper/globals.rs

@@ -34,7 +34,7 @@ where
     for<'js> O: JsLifetime<'js>,
 {
     fn name() -> &'static str {
-        ""
+        unimplemented!("Global modules do not have a name")
     }
 
     fn is_module() -> bool {
@@ -51,11 +51,11 @@ where
 {
     //unused
     fn declare(_decl: &Declarations) -> Result<()> {
-        Ok(())
+        unimplemented!("Global modules do not declare anything")
     }
 
     //unused
     fn evaluate<'a>(_ctx: &Ctx<'a>, _exports: &Exports<'a>) -> Result<()> {
-        Ok(())
+        unimplemented!("Global modules do not evaluate anything")
     }
 }