Rename traits

Author: Sytten

src/loader/builder.rs

@@ -6,7 +6,7 @@ use rquickjs::{
 };
 
 use super::{GlobalInitializer, GlobalLoadFn, ModuleLoadFn, ModuleLoader, ModuleResolver};
-use crate::wrapper::{AsModule, HasModule};
+use crate::wrapper::{IntoModule, ModuleMeta};
 
 fn load_module_func<D: ModuleDef>(ctx: Ctx<'_>, name: Vec<u8>) -> Result<Module<'_>> {
     Module::declare_def::<D, _>(ctx, name)
@@ -53,8 +53,8 @@ impl ModuleLoaderBuilder {
     pub fn with_module<O, M, R>(mut self, module: M) -> Self
     where
         for<'js> O: JsLifetime<'js> + 'static,
-        R: ModuleDef + HasModule,
-        M: AsModule<O, R>,
+        R: ModuleDef + ModuleMeta,
+        M: IntoModule<O, R>,
     {
         self.process_module(module, None);
         self
@@ -64,8 +64,8 @@ impl ModuleLoaderBuilder {
     pub fn with_module_named<O, M, R>(mut self, module: M, name: &'static str) -> Self
     where
         for<'js> O: JsLifetime<'js> + 'static,
-        R: ModuleDef + HasModule,
-        M: AsModule<O, R>,
+        R: ModuleDef + ModuleMeta,
+        M: IntoModule<O, R>,
     {
         self.process_module(module, Some(name));
         self
@@ -74,26 +74,26 @@ impl ModuleLoaderBuilder {
     pub fn add_module<O, M, R>(&mut self, module: M) -> &mut Self
     where
         for<'js> O: JsLifetime<'js> + 'static,
-        R: ModuleDef + HasModule,
-        M: AsModule<O, R>,
+        R: ModuleDef + ModuleMeta,
+        M: IntoModule<O, R>,
     {
         self.process_module(module, None)
     }
 
     pub fn add_module_named<O, M, R>(&mut self, module: M, name: &'static str) -> &mut Self
     where
         for<'js> O: JsLifetime<'js> + 'static,
-        R: ModuleDef + HasModule,
-        M: AsModule<O, R>,
+        R: ModuleDef + ModuleMeta,
+        M: IntoModule<O, R>,
     {
         self.process_module(module, Some(name))
     }
 
     fn process_module<O, M, R>(&mut self, module: M, name: Option<&'static str>) -> &mut Self
     where
         for<'js> O: JsLifetime<'js> + 'static,
-        R: ModuleDef + HasModule,
-        M: AsModule<O, R>,
+        R: ModuleDef + ModuleMeta,
+        M: IntoModule<O, R>,
     {
         let o = module.options();
 

src/wrapper/globals.rs

@@ -3,7 +3,7 @@ use rquickjs::{
     Ctx, JsLifetime, Result,
 };
 
-use super::{AsModule, HasModule};
+use super::{IntoModule, ModuleMeta};
 use crate::{GlobalsOnly, ModuleDefExt};
 
 pub struct GlobalDefWrapper<T, O>
@@ -15,14 +15,14 @@ where
     _marker2: std::marker::PhantomData<O>,
 }
 
-impl<T, O> AsModule<O, GlobalDefWrapper<T, O>> for T
+impl<T, O> IntoModule<O, GlobalDefWrapper<T, O>> for T
 where
     T: ModuleDefExt<O, Implementation = GlobalsOnly>,
     for<'js> O: JsLifetime<'js>,
 {
 }
 
-impl<T, O> HasModule for GlobalDefWrapper<T, O>
+impl<T, O> ModuleMeta for GlobalDefWrapper<T, O>
 where
     T: ModuleDefExt<O, Implementation = GlobalsOnly>,
     for<'js> O: JsLifetime<'js>,

src/wrapper/mod.rs

@@ -11,16 +11,16 @@ mod module;
 /// converted it from a [`ModuleDefExt`] to a [`ModuleDef`].
 ///
 /// This is necessary for the loader to work.
-pub trait HasModule {
+pub trait ModuleMeta {
     fn name() -> &'static str;
     fn is_module() -> bool;
 }
 
-/// Semantically convert a [`ModuleDefExt`] to a [`ModuleDef`] and [`HasModule`]
-pub trait AsModule<O, R>
+/// Semantically convert a [`ModuleDefExt`] to a [`ModuleDef`] and [`ModuleMeta`]
+pub trait IntoModule<O, R>
 where
     Self: ModuleDefExt<O>,
-    R: ModuleDef + HasModule,
+    R: ModuleDef + ModuleMeta,
     for<'js> O: JsLifetime<'js>,
 {
 }

src/wrapper/module.rs

@@ -3,7 +3,7 @@ use rquickjs::{
     Ctx, JsLifetime, Result,
 };
 
-use super::{AsModule, HasModule};
+use super::{IntoModule, ModuleMeta};
 use crate::{ModuleDefExt, ModuleImpl};
 
 pub(crate) struct ModuleDefWrapper<T, O>
@@ -15,20 +15,14 @@ where
     _marker2: std::marker::PhantomData<O>,
 }
 
-impl<T, O> AsModule<O, ModuleDefWrapper<T, O>> for T
+impl<T, O> IntoModule<O, ModuleDefWrapper<T, O>> for T
 where
     T: ModuleDefExt<O, Implementation = ModuleImpl<O>>,
     for<'js> O: JsLifetime<'js> + 'static,
 {
-    // fn as_module(&self) -> ModuleDefWrapper<T, O> {
-    //     ModuleDefWrapper {
-    //         _marker: std::marker::PhantomData::<T>,
-    //         _marker2: std::marker::PhantomData::<O>,
-    //     }
-    // }
 }
 
-impl<T, O> HasModule for ModuleDefWrapper<T, O>
+impl<T, O> ModuleMeta for ModuleDefWrapper<T, O>
 where
     T: ModuleDefExt<O, Implementation = ModuleImpl<O>>,
     for<'c> O: JsLifetime<'c> + 'static,