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.

Sign up for GitHub

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

Jump to bottom

n-api: remove napi_env::CallIntoModuleThrow #33570

Closed
wants to merge 3 commits into from
Closed

n-api: remove napi_env::CallIntoModuleThrow #33570

wants to merge 3 commits into from

Conversation

gabrielschulhof
Copy link
Contributor

Give napi_env::CallIntoModule the thrower used by
CallIntoModuleThrow as its default second argument. That way we do
not need two different methods on napi_env for calling into the
addon.

Checklist
  • make -j4 test (UNIX), or vcbuild test (Windows) passes
  • commit message follows commit guidelines

Re: #33508

n-api: remove napi_env::CallIntoModuleThrow
129c7ae 
Give `napi_env::CallIntoModule` the thrower used by
`CallIntoModuleThrow` as its default second argument. That way we do
not need two different methods on `napi_env` for calling into the
addon.
@gabrielschulhof gabrielschulhof added c++ Issues and PRs that require attention from people who are familiar with C++. i18n-api Issues and PRs related to the i18n implementation. labels May 26, 2020
@nodejs-github-bot nodejs-github-bot added the node-api Issues and PRs related to the Node-API. label May 26, 2020
@gabrielschulhof gabrielschulhof mentioned this pull request May 26, 2020
Closed
3 tasks
addaleax
addaleax reviewed May 26, 2020
View reviewed changes
src/js_native_api_v8.h Outdated Show resolved Hide resolved
@gabrielschulhof
Copy link
Contributor Author

@addaleax I have made the changes you requested.

mhdawson
mhdawson approved these changes May 26, 2020
View reviewed changes
Copy link
Member

@mhdawson mhdawson left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@nodejs-github-bot
Copy link
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/31571/

@BridgeAR BridgeAR added the author ready PRs that have at least one approval, no pending requests for changes, and a CI started. label May 26, 2020
@nodejs-github-bot
Copy link
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/31573/

@gabrielschulhof gabrielschulhof removed the i18n-api Issues and PRs related to the i18n implementation. label May 27, 2020
@mhdawson
Copy link
Member

CI looks, good will plan to land tomorrow afternoon once 24 hours is up.

gabrielschulhof pushed a commit that referenced this pull request May 28, 2020
n-api: remove napi_env::CallIntoModuleThrow
6a1df3b 
Give `napi_env::CallIntoModule` the thrower used by
`CallIntoModuleThrow` as its default second argument. That way we do
not need two different methods on `napi_env` for calling into the
addon.

PR-URL: #33570
Signed-off-by: Gabriel Schulhof <gabriel.schulhof@intel.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Chengzhong Wu <legendecas@gmail.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
@gabrielschulhof
Copy link
Contributor Author

Landed in 6a1df3b. @mhdawson you're good to go with #33508 👍

@mhdawson
Copy link
Member

@gabrielschulhof Thanks !

gabrielschulhof pushed a commit to gabrielschulhof/node that referenced this pull request Jun 9, 2020
n-api: remove napi_env::CallIntoModuleThrow
a405569 
Give `napi_env::CallIntoModule` the thrower used by
`CallIntoModuleThrow` as its default second argument. That way we do
not need two different methods on `napi_env` for calling into the
addon.

PR-URL: nodejs#33570
Signed-off-by: Gabriel Schulhof <gabriel.schulhof@intel.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Chengzhong Wu <legendecas@gmail.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
@gabrielschulhof gabrielschulhof mentioned this pull request Jun 10, 2020
Closed
3 tasks
@gabrielschulhof gabrielschulhof mentioned this pull request Jun 10, 2020
Closed
3 tasks
codebytere pushed a commit that referenced this pull request Jun 18, 2020
@codebytere
n-api: remove napi_env::CallIntoModuleThrow
e83642f 
Give `napi_env::CallIntoModule` the thrower used by
`CallIntoModuleThrow` as its default second argument. That way we do
not need two different methods on `napi_env` for calling into the
addon.

PR-URL: #33570
Signed-off-by: Gabriel Schulhof <gabriel.schulhof@intel.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Chengzhong Wu <legendecas@gmail.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
@codebytere codebytere mentioned this pull request Jun 28, 2020
Merged
codebytere pushed a commit that referenced this pull request Jun 30, 2020
@codebytere
n-api: remove napi_env::CallIntoModuleThrow
3acb6f2 
Give `napi_env::CallIntoModule` the thrower used by
`CallIntoModuleThrow` as its default second argument. That way we do
not need two different methods on `napi_env` for calling into the
addon.

PR-URL: #33570
Signed-off-by: Gabriel Schulhof <gabriel.schulhof@intel.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Chengzhong Wu <legendecas@gmail.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
codebytere pushed a commit that referenced this pull request Jul 8, 2020
@codebytere
n-api: remove napi_env::CallIntoModuleThrow
ed741ec 
Give `napi_env::CallIntoModule` the thrower used by
`CallIntoModuleThrow` as its default second argument. That way we do
not need two different methods on `napi_env` for calling into the
addon.

PR-URL: #33570
Signed-off-by: Gabriel Schulhof <gabriel.schulhof@intel.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Chengzhong Wu <legendecas@gmail.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
@codebytere codebytere mentioned this pull request Jul 13, 2020
Merged
@gabrielschulhof gabrielschulhof deleted the consistent-call-into-module branch January 28, 2021 00:14
@gabrielschulhof gabrielschulhof restored the consistent-call-into-module branch January 28, 2021 05:37
@gabrielschulhof gabrielschulhof deleted the consistent-call-into-module branch February 3, 2021 07:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jasnell jasnell jasnell approved these changes

@addaleax addaleax addaleax approved these changes

@legendecas legendecas legendecas approved these changes

@mhdawson mhdawson mhdawson approved these changes

@bnoordhuis bnoordhuis Awaiting requested review from bnoordhuis

Assignees
No one assigned
Labels
author ready PRs that have at least one approval, no pending requests for changes, and a CI started. c++ Issues and PRs that require attention from people who are familiar with C++. node-api Issues and PRs related to the Node-API.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@gabrielschulhof @nodejs-github-bot @mhdawson @jasnell @addaleax @legendecas @BridgeAR