summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarshan Sen <darshan.sen@postman.com>2021-10-02 19:21:40 +0530
committerNode.js GitHub Bot <github-bot@iojs.org>2021-10-05 05:34:21 +0000
commit7b8552f5078f209fd3bbb935724d81cf5705aa11 (patch)
tree3861b845007351a23b6b1f85084a04a0c3c1bf0e
parent8fc4169452516669a2f66c670b423b8e14be0f77 (diff)
downloadnode-new-7b8552f5078f209fd3bbb935724d81cf5705aa11.tar.gz
src: use `As()` instead of `Cast()` for conversions
We mostly use `As()` instead of `Cast()` in our code, so this change replaces the remaining calls to `Cast()` with calls to `As()` to maintain the consistency. Refs: https://github.com/nodejs/node/pull/39921/files#r702293529 Signed-off-by: Darshan Sen <darshan.sen@postman.com> PR-URL: https://github.com/nodejs/node/pull/40287 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Tobias Nießen <tniessen@tnie.de> Reviewed-By: Juan José Arboleda <soyjuanarbol@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Michaël Zasso <targos@protonmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Gerhard Stöbich <deb2001-github@yahoo.de>
-rw-r--r--src/cares_wrap.cc5
-rw-r--r--src/js_native_api_v8.cc7
-rw-r--r--src/module_wrap.cc4
-rw-r--r--src/node_contextify.h4
-rw-r--r--src/node_dtrace.cc16
-rw-r--r--src/process_wrap.cc4
6 files changed, 19 insertions, 21 deletions
diff --git a/src/cares_wrap.cc b/src/cares_wrap.cc
index edc8676187..30e27ecf70 100644
--- a/src/cares_wrap.cc
+++ b/src/cares_wrap.cc
@@ -1701,7 +1701,7 @@ void SetServers(const FunctionCallbackInfo<Value>& args) {
CHECK(args[0]->IsArray());
- Local<Array> arr = Local<Array>::Cast(args[0]);
+ Local<Array> arr = args[0].As<Array>();
uint32_t len = arr->Length();
@@ -1718,8 +1718,7 @@ void SetServers(const FunctionCallbackInfo<Value>& args) {
for (uint32_t i = 0; i < len; i++) {
CHECK(arr->Get(env->context(), i).ToLocalChecked()->IsArray());
- Local<Array> elm =
- Local<Array>::Cast(arr->Get(env->context(), i).ToLocalChecked());
+ Local<Array> elm = arr->Get(env->context(), i).ToLocalChecked().As<Array>();
CHECK(elm->Get(env->context(),
0).ToLocalChecked()->Int32Value(env->context()).FromJust());
diff --git a/src/js_native_api_v8.cc b/src/js_native_api_v8.cc
index 754d71f51d..26ec837ffd 100644
--- a/src/js_native_api_v8.cc
+++ b/src/js_native_api_v8.cc
@@ -175,7 +175,7 @@ inline static napi_status ConcludeDeferred(napi_env env,
v8::Local<v8::Value> v8_deferred =
v8::Local<v8::Value>::New(env->isolate, *deferred_ref);
- auto v8_resolver = v8::Local<v8::Promise::Resolver>::Cast(v8_deferred);
+ auto v8_resolver = v8_deferred.As<v8::Promise::Resolver>();
v8::Maybe<bool> success = is_resolved ?
v8_resolver->Resolve(context, v8impl::V8LocalValueFromJsValue(result)) :
@@ -293,7 +293,7 @@ class CallbackWrapperBase : public CallbackWrapper {
nullptr),
_cbinfo(cbinfo) {
_bundle = reinterpret_cast<CallbackBundle*>(
- v8::Local<v8::External>::Cast(cbinfo.Data())->Value());
+ cbinfo.Data().As<v8::External>()->Value());
_data = _bundle->cb_data;
}
@@ -3131,8 +3131,7 @@ napi_status napi_run_script(napi_env env,
v8::Local<v8::Context> context = env->context();
- auto maybe_script = v8::Script::Compile(context,
- v8::Local<v8::String>::Cast(v8_script));
+ auto maybe_script = v8::Script::Compile(context, v8_script.As<v8::String>());
CHECK_MAYBE_EMPTY(env, maybe_script, napi_generic_failure);
auto script_result =
diff --git a/src/module_wrap.cc b/src/module_wrap.cc
index f45ee7627b..f3ea419df1 100644
--- a/src/module_wrap.cc
+++ b/src/module_wrap.cc
@@ -292,8 +292,8 @@ void ModuleWrap::Link(const FunctionCallbackInfo<Value>& args) {
for (int i = 0; i < raw_assertions->Length(); i += 3) {
assertions
->Set(env->context(),
- Local<String>::Cast(raw_assertions->Get(env->context(), i)),
- Local<Value>::Cast(raw_assertions->Get(env->context(), i + 1)))
+ raw_assertions->Get(env->context(), i).As<String>(),
+ raw_assertions->Get(env->context(), i + 1).As<Value>())
.ToChecked();
}
diff --git a/src/node_contextify.h b/src/node_contextify.h
index 08ee97df77..c9ba78b8a5 100644
--- a/src/node_contextify.h
+++ b/src/node_contextify.h
@@ -74,8 +74,8 @@ class ContextifyContext {
}
inline v8::Local<v8::Object> sandbox() const {
- return v8::Local<v8::Object>::Cast(
- context()->GetEmbedderData(ContextEmbedderIndex::kSandboxObject));
+ return context()->GetEmbedderData(ContextEmbedderIndex::kSandboxObject)
+ .As<v8::Object>();
}
inline std::shared_ptr<v8::MicrotaskQueue> microtask_queue() const {
diff --git a/src/node_dtrace.cc b/src/node_dtrace.cc
index 7808a649a4..52e6399283 100644
--- a/src/node_dtrace.cc
+++ b/src/node_dtrace.cc
@@ -87,8 +87,8 @@ using v8::Value;
return node::THROW_ERR_INVALID_ARG_TYPE(env, \
"expected object for " #obj " to contain object member " #member); \
} \
- *valp = Local<Object>::Cast(obj->Get(env->context(), \
- OneByteString(env->isolate(), #member)).ToLocalChecked());
+ *valp = obj->Get(env->context(), \
+ OneByteString(env->isolate(), #member)).ToLocalChecked().As<Object>();
#define SLURP_CONNECTION(arg, conn) \
if (!(arg)->IsObject()) { \
@@ -96,7 +96,7 @@ using v8::Value;
"expected argument " #arg " to be a connection object"); \
} \
node_dtrace_connection_t conn; \
- Local<Object> _##conn = Local<Object>::Cast(arg); \
+ Local<Object> _##conn = arg.As<Object>(); \
Local<Value> _handle = \
(_##conn)->Get(env->context(), \
FIXED_ONE_BYTE_STRING(env->isolate(), "_handle")) \
@@ -116,7 +116,7 @@ using v8::Value;
"expected argument " #arg " to be a connection object"); \
} \
node_dtrace_connection_t conn; \
- Local<Object> _##conn = Local<Object>::Cast(arg); \
+ Local<Object> _##conn = arg.As<Object>(); \
SLURP_INT(_##conn, fd, &conn.fd); \
SLURP_STRING(_##conn, host, &conn.remote); \
SLURP_INT(_##conn, port, &conn.port); \
@@ -132,10 +132,10 @@ using v8::Value;
"expected argument " #arg1 " to be a connection object"); \
} \
node_dtrace_connection_t conn; \
- Local<Object> _##conn = Local<Object>::Cast(arg0); \
+ Local<Object> _##conn = arg0.As<Object>(); \
SLURP_INT(_##conn, fd, &conn.fd); \
SLURP_INT(_##conn, bufferSize, &conn.buffered); \
- _##conn = Local<Object>::Cast(arg1); \
+ _##conn = arg1.As<Object>(); \
SLURP_STRING(_##conn, host, &conn.remote); \
SLURP_INT(_##conn, port, &conn.port);
@@ -165,7 +165,7 @@ void DTRACE_HTTP_SERVER_REQUEST(const FunctionCallbackInfo<Value>& args) {
Environment* env = Environment::GetCurrent(args);
HandleScope scope(env->isolate());
- Local<Object> arg0 = Local<Object>::Cast(args[0]);
+ Local<Object> arg0 = args[0].As<Object>();
Local<Object> headers;
memset(&req, 0, sizeof(req));
@@ -217,7 +217,7 @@ void DTRACE_HTTP_CLIENT_REQUEST(const FunctionCallbackInfo<Value>& args) {
* caller here to retain their method and URL until the time at which
* DTRACE_HTTP_CLIENT_REQUEST can be called.
*/
- Local<Object> arg0 = Local<Object>::Cast(args[0]);
+ Local<Object> arg0 = args[0].As<Object>();
SLURP_STRING(arg0, _header, &header);
req.method = header;
diff --git a/src/process_wrap.cc b/src/process_wrap.cc
index 679429286b..6905cacb1c 100644
--- a/src/process_wrap.cc
+++ b/src/process_wrap.cc
@@ -186,7 +186,7 @@ class ProcessWrap : public HandleWrap {
Local<Value> argv_v =
js_options->Get(context, env->args_string()).ToLocalChecked();
if (!argv_v.IsEmpty() && argv_v->IsArray()) {
- Local<Array> js_argv = Local<Array>::Cast(argv_v);
+ Local<Array> js_argv = argv_v.As<Array>();
int argc = js_argv->Length();
CHECK_GT(argc + 1, 0); // Check for overflow.
@@ -214,7 +214,7 @@ class ProcessWrap : public HandleWrap {
Local<Value> env_v =
js_options->Get(context, env->env_pairs_string()).ToLocalChecked();
if (!env_v.IsEmpty() && env_v->IsArray()) {
- Local<Array> env_opt = Local<Array>::Cast(env_v);
+ Local<Array> env_opt = env_v.As<Array>();
int envc = env_opt->Length();
CHECK_GT(envc + 1, 0); // Check for overflow.
options.env = new char*[envc + 1]; // Heap allocated to detect errors.