diff options
| author | Anna Henningsen <anna@addaleax.net> | 2018-07-27 00:10:46 +0200 |
|---|---|---|
| committer | Anna Henningsen <anna@addaleax.net> | 2018-08-05 02:08:51 +0200 |
| commit | a196aa2e24ef7069289fa4a9aa8c6862d82e6b5f (patch) | |
| tree | 0afac910a02db2fc3ae81d9d81206cb1f05cfade /src/module_wrap.cc | |
| parent | f8d34b902e487f6bec0eb49967f9a37a19caccd3 (diff) | |
| download | android-node-v8-a196aa2e24ef7069289fa4a9aa8c6862d82e6b5f.tar.gz android-node-v8-a196aa2e24ef7069289fa4a9aa8c6862d82e6b5f.tar.bz2 android-node-v8-a196aa2e24ef7069289fa4a9aa8c6862d82e6b5f.zip | |
src: clean up PackageConfig pseudo-boolean fields
PR-URL: https://github.com/nodejs/node/pull/21987
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Tiancheng "Timothy" Gu <timothygu99@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Diffstat (limited to 'src/module_wrap.cc')
| -rw-r--r-- | src/module_wrap.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/module_wrap.cc b/src/module_wrap.cc index ab1950311a..63e886ab0d 100644 --- a/src/module_wrap.cc +++ b/src/module_wrap.cc @@ -488,8 +488,12 @@ Maybe<uv_file> CheckFile(const std::string& path, return Just(fd); } +using Exists = PackageConfig::Exists; +using IsValid = PackageConfig::IsValid; +using HasMain = PackageConfig::HasMain; + const PackageConfig& GetPackageConfig(Environment* env, - const std::string path) { + const std::string& path) { auto existing = env->package_json_cache.find(path); if (existing != env->package_json_cache.end()) { return existing->second; @@ -530,7 +534,7 @@ const PackageConfig& GetPackageConfig(Environment* env, } Local<Value> pkg_main; - HasMain::Bool has_main = HasMain::No; + HasMain has_main = HasMain::No; std::string main_std; if (pkg_json->Get(env->context(), env->main_string()).ToLocal(&pkg_main)) { has_main = HasMain::Yes; |