Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(core,ext): Fix not to be affected by Promise.prototype.then #16326

Merged
merged 18 commits into from
Oct 29, 2022
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'main' into fix/promise-then
  • Loading branch information
petamoriken committed Oct 25, 2022
commit d0f4a10518b57c15d5aeec28fed66bd15873ad44
9 changes: 0 additions & 9 deletions ext/net/01_net.js
Original file line number Diff line number Diff line change
Expand Up @@ -160,15 +160,6 @@
} else {
throw new Error("unreachable");
}
return PromisePrototypeThen(promise, (res) => {
if (this.addr.transport == "tcp") {
return new TcpConn(res.rid, res.remoteAddr, res.localAddr);
} else if (this.addr.transport == "unix") {
return new UnixConn(res.rid, res.remoteAddr, res.localAddr);
} else {
throw new Error("unreachable");
}
});
}

async next() {
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.