diff options
| author | Daniel Bevenius <daniel.bevenius@gmail.com> | 2018-05-08 13:04:09 +0200 |
|---|---|---|
| committer | Daniel Bevenius <daniel.bevenius@gmail.com> | 2018-05-10 05:30:26 +0200 |
| commit | b267d2aae6fc598ae0dd2d6134ec95ddd09891ba (patch) | |
| tree | 875a57763b203649c7c3df97e16033d78b9e2f26 /src/module_wrap.cc | |
| parent | 6446510066e1d8951a81ae0fe4ce8e6f3649ae54 (diff) | |
| download | node-new-b267d2aae6fc598ae0dd2d6134ec95ddd09891ba.tar.gz | |
src: use unqualified names in module_wrap.cc
This commit removes the usage of qualified names for consistency.
PR-URL: https://github.com/nodejs/node/pull/20594
Reviewed-By: Gus Caplan <me@gus.host>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Tiancheng "Timothy" Gu <timothygu99@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Diffstat (limited to 'src/module_wrap.cc')
| -rw-r--r-- | src/module_wrap.cc | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/module_wrap.cc b/src/module_wrap.cc index 71f1acdaf6..6e446c34fc 100644 --- a/src/module_wrap.cc +++ b/src/module_wrap.cc @@ -224,8 +224,7 @@ void ModuleWrap::Instantiate(const FunctionCallbackInfo<Value>& args) { Local<Context> context = obj->context_.Get(isolate); Local<Module> module = obj->module_.Get(isolate); TryCatch try_catch(isolate); - Maybe<bool> ok = - module->InstantiateModule(context, ModuleWrap::ResolveCallback); + Maybe<bool> ok = module->InstantiateModule(context, ResolveCallback); // clear resolve cache on instantiate obj->resolve_cache_.clear(); @@ -369,7 +368,7 @@ MaybeLocal<Module> ModuleWrap::ResolveCallback(Local<Context> context, return MaybeLocal<Module>(); } - ModuleWrap* dependent = ModuleWrap::GetFromModule(env, referrer); + ModuleWrap* dependent = GetFromModule(env, referrer); if (dependent == nullptr) { env->ThrowError("linking error, null dep"); @@ -749,7 +748,7 @@ void ModuleWrap::HostInitializeImportMetaObjectCallback( Local<Context> context, Local<Module> module, Local<Object> meta) { Isolate* isolate = context->GetIsolate(); Environment* env = Environment::GetCurrent(context); - ModuleWrap* module_wrap = ModuleWrap::GetFromModule(env, module); + ModuleWrap* module_wrap = GetFromModule(env, module); if (module_wrap == nullptr) { return; @@ -797,13 +796,13 @@ void ModuleWrap::Initialize(Local<Object> target, GetStaticDependencySpecifiers); target->Set(FIXED_ONE_BYTE_STRING(isolate, "ModuleWrap"), tpl->GetFunction()); - env->SetMethod(target, "resolve", node::loader::ModuleWrap::Resolve); + env->SetMethod(target, "resolve", Resolve); env->SetMethod(target, "setImportModuleDynamicallyCallback", - node::loader::ModuleWrap::SetImportModuleDynamicallyCallback); + SetImportModuleDynamicallyCallback); env->SetMethod(target, "setInitializeImportMetaObjectCallback", - ModuleWrap::SetInitializeImportMetaObjectCallback); + SetInitializeImportMetaObjectCallback); #define V(name) \ target->Set(context, \ |