@@ -224,8 +224,7 @@ void ModuleWrap::Instantiate(const FunctionCallbackInfo<Value>& args) {
224
224
Local<Context> context = obj->context_ .Get (isolate);
225
225
Local<Module> module = obj->module_ .Get (isolate);
226
226
TryCatch try_catch (isolate);
227
- Maybe<bool > ok =
228
- module ->InstantiateModule (context, ModuleWrap::ResolveCallback);
227
+ Maybe<bool > ok = module ->InstantiateModule (context, ResolveCallback);
229
228
230
229
// clear resolve cache on instantiate
231
230
obj->resolve_cache_ .clear ();
@@ -369,7 +368,7 @@ MaybeLocal<Module> ModuleWrap::ResolveCallback(Local<Context> context,
369
368
return MaybeLocal<Module>();
370
369
}
371
370
372
- ModuleWrap* dependent = ModuleWrap:: GetFromModule (env, referrer);
371
+ ModuleWrap* dependent = GetFromModule (env, referrer);
373
372
374
373
if (dependent == nullptr ) {
375
374
env->ThrowError (" linking error, null dep" );
@@ -749,7 +748,7 @@ void ModuleWrap::HostInitializeImportMetaObjectCallback(
749
748
Local<Context> context, Local<Module> module , Local<Object> meta) {
750
749
Isolate* isolate = context->GetIsolate ();
751
750
Environment* env = Environment::GetCurrent (context);
752
- ModuleWrap* module_wrap = ModuleWrap:: GetFromModule (env, module );
751
+ ModuleWrap* module_wrap = GetFromModule (env, module );
753
752
754
753
if (module_wrap == nullptr ) {
755
754
return ;
@@ -797,13 +796,13 @@ void ModuleWrap::Initialize(Local<Object> target,
797
796
GetStaticDependencySpecifiers);
798
797
799
798
target->Set (FIXED_ONE_BYTE_STRING (isolate, " ModuleWrap" ), tpl->GetFunction ());
800
- env->SetMethod (target, " resolve" , node::loader::ModuleWrap:: Resolve);
799
+ env->SetMethod (target, " resolve" , Resolve);
801
800
env->SetMethod (target,
802
801
" setImportModuleDynamicallyCallback" ,
803
- node::loader::ModuleWrap:: SetImportModuleDynamicallyCallback);
802
+ SetImportModuleDynamicallyCallback);
804
803
env->SetMethod (target,
805
804
" setInitializeImportMetaObjectCallback" ,
806
- ModuleWrap:: SetInitializeImportMetaObjectCallback);
805
+ SetInitializeImportMetaObjectCallback);
807
806
808
807
#define V (name ) \
809
808
target->Set (context, \
0 commit comments