Skip to content
This repository was archived by the owner on Oct 15, 2020. It is now read-only.

Commit 8dca89d

Browse files
committed
src: changing node_file's usage of v8::Resolver
node_file was casting back and forth between v8::Resolver and v8::Promise This is unnecessary; most of the time it just wants the v8::Resolver, converting to the v8::Promise only as a return value.
1 parent 354e306 commit 8dca89d

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

Diff for: src/node_file.cc

+4-6
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,8 @@ void FSReqWrap::SetReturnValue(const FunctionCallbackInfo<Value>& args) {
283283
void FSReqPromise::SetReturnValue(const FunctionCallbackInfo<Value>& args) {
284284
Local<Context> context = env()->context();
285285
args.GetReturnValue().Set(
286-
object()->Get(context, env()->promise_string()).ToLocalChecked());
286+
object()->Get(context, env()->promise_string()).ToLocalChecked()
287+
.As<Promise::Resolver>()->GetPromise());
287288
}
288289

289290
void NewFSReqWrap(const FunctionCallbackInfo<Value>& args) {
@@ -300,7 +301,7 @@ FSReqPromise::FSReqPromise(Environment* env)
300301
stats_field_array_(env->isolate(), 14) {
301302
auto resolver = Promise::Resolver::New(env->context()).ToLocalChecked();
302303
object()->Set(env->context(), env->promise_string(),
303-
resolver.As<Promise>()).FromJust();
304+
resolver).FromJust();
304305
}
305306

306307
FSReqPromise::~FSReqPromise() {
@@ -315,9 +316,7 @@ void FSReqPromise::Reject(Local<Value> reject) {
315316
Local<Value> value =
316317
object()->Get(env()->context(),
317318
env()->promise_string()).ToLocalChecked();
318-
CHECK(value->IsPromise());
319-
Local<Promise> promise = value.As<Promise>();
320-
Local<Promise::Resolver> resolver = promise.As<Promise::Resolver>();
319+
Local<Promise::Resolver> resolver = value.As<Promise::Resolver>();
321320
resolver->Reject(env()->context(), reject).FromJust();
322321
}
323322

@@ -336,7 +335,6 @@ void FSReqPromise::Resolve(Local<Value> value) {
336335
Local<Value> val =
337336
object()->Get(env()->context(),
338337
env()->promise_string()).ToLocalChecked();
339-
CHECK(val->IsPromise());
340338
Local<Promise::Resolver> resolver = val.As<Promise::Resolver>();
341339
resolver->Resolve(env()->context(), value).FromJust();
342340
}

0 commit comments

Comments
 (0)