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

src: replace some deprecated uses of Get() and Set() #24060

Merged
merged 4 commits into from
Nov 7, 2018
Merged

src: replace some deprecated uses of Get() and Set() #24060

merged 4 commits into from
Nov 7, 2018

Conversation

cjihrig
Copy link
Contributor

@cjihrig cjihrig commented Nov 3, 2018

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

@nodejs-github-bot
Copy link
Collaborator

@cjihrig build started: https://ci.nodejs.org/blue/organizations/jenkins/node-test-pull-request-lite-pipeline/detail/node-test-pull-request-lite-pipeline/1470/pipeline

@nodejs-github-bot nodejs-github-bot added c++ Issues and PRs that require attention from people who are familiar with C++. lib / src Issues and PRs related to general changes in the lib or src directory. labels Nov 3, 2018
joyeecheung
joyeecheung reviewed Nov 3, 2018
View reviewed changes
src/env-inl.h
@@ -736,7 +736,7 @@ inline void Environment::SetMethod(v8::Local<v8::Object> that,
const v8::NewStringType type = v8::NewStringType::kInternalized;
v8::Local<v8::String> name_string =
v8::String::NewFromUtf8(isolate(), name, type).ToLocalChecked();
that->Set(name_string, function);
that->Set(context, name_string, function).FromJust();
Copy link
Member

Choose a reason for hiding this comment

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

Shouldn't this return if it's empty? Also other FromJust below

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@joyeecheung I'm not sure that it matters in these two cases.

Copy link
Member

Choose a reason for hiding this comment

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

I don’t think we can really signal an error here without making SetMethod() itself return a Maybe<>…

Copy link
Member

Choose a reason for hiding this comment

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

@addaleax hmm, yeah, the caller can handle that as well, but this is mostly used in Initialize anyways

@danbev
Copy link
Contributor

danbev commented Nov 7, 2018 •
edited by cjihrig
Loading

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

EDIT(cjihrig): CI was yellow

addaleax
addaleax approved these changes Nov 7, 2018
View reviewed changes
src/env-inl.h
@@ -736,7 +736,7 @@ inline void Environment::SetMethod(v8::Local<v8::Object> that,
const v8::NewStringType type = v8::NewStringType::kInternalized;
v8::Local<v8::String> name_string =
v8::String::NewFromUtf8(isolate(), name, type).ToLocalChecked();
that->Set(name_string, function);
that->Set(context, name_string, function).FromJust();
Copy link
Member

Choose a reason for hiding this comment

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

I don’t think we can really signal an error here without making SetMethod() itself return a Maybe<>…

@cjihrig
src: fix Get() usage in async_wrap.cc
312baac 
PR-URL: nodejs#24060
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
@cjihrig
src: fix Get() usage in tls_wrap.cc
5c9a4b2 
PR-URL: nodejs#24060
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
@cjihrig
src: fix Set() usage in node.h
ff0719d 
PR-URL: nodejs#24060
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
@cjihrig
src: fix Set() usage in env-inl.h
7c64133 
PR-URL: nodejs#24060
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
@cjihrig cjihrig merged commit 7c64133 into nodejs:master Nov 7, 2018
@cjihrig cjihrig deleted the get branch November 7, 2018 17:43
@danbev danbev mentioned this pull request Nov 8, 2018
Closed
2 tasks
BridgeAR pushed a commit that referenced this pull request Nov 14, 2018
@cjihrig @BridgeAR
src: fix Get() usage in async_wrap.cc
9437aaa 
PR-URL: #24060
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
BridgeAR pushed a commit that referenced this pull request Nov 14, 2018
@cjihrig @BridgeAR
src: fix Get() usage in tls_wrap.cc
2a93882 
PR-URL: #24060
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
BridgeAR pushed a commit that referenced this pull request Nov 14, 2018
@cjihrig @BridgeAR
src: fix Set() usage in node.h
bef1c3b 
PR-URL: #24060
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
BridgeAR pushed a commit that referenced this pull request Nov 14, 2018
@cjihrig @BridgeAR
src: fix Set() usage in env-inl.h
1cda9b3 
PR-URL: #24060
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
@BridgeAR BridgeAR mentioned this pull request Nov 14, 2018
Merged
kiyomizumia pushed a commit to kiyomizumia/node that referenced this pull request Nov 15, 2018
@cjihrig @kiyomizumia
src: fix Get() usage in async_wrap.cc
8f8c380 
PR-URL: nodejs#24060
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
kiyomizumia pushed a commit to kiyomizumia/node that referenced this pull request Nov 15, 2018
@cjihrig @kiyomizumia
src: fix Get() usage in tls_wrap.cc
ce7df49 
PR-URL: nodejs#24060
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
kiyomizumia pushed a commit to kiyomizumia/node that referenced this pull request Nov 15, 2018
@cjihrig @kiyomizumia
src: fix Set() usage in node.h
266f04b 
PR-URL: nodejs#24060
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
kiyomizumia pushed a commit to kiyomizumia/node that referenced this pull request Nov 15, 2018
@cjihrig @kiyomizumia
src: fix Set() usage in env-inl.h
0eaa915 
PR-URL: nodejs#24060
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
@beevelop beevelop mentioned this pull request Nov 15, 2018
Closed
This was referenced Nov 15, 2018
Closed
Closed
Closed
Closed
Closed
@codebytere
Copy link
Member

@cjihrig should this be backported to v10.x?

@cjihrig
Copy link
Contributor Author

cjihrig commented Nov 29, 2018

No, I don't believe so.

addaleax pushed a commit to addaleax/node that referenced this pull request May 30, 2019
@cjihrig @addaleax
src: fix Get() usage in tls_wrap.cc
6bcc06e 
PR-URL: nodejs#24060
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
@addaleax addaleax mentioned this pull request May 30, 2019
Closed
BethGriggs pushed a commit that referenced this pull request Jul 16, 2019
@cjihrig @BethGriggs
src: fix Get() usage in tls_wrap.cc
502555a 
Backport-PR-URL: #27967
PR-URL: #24060
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
BethGriggs pushed a commit that referenced this pull request Jul 17, 2019
@cjihrig @BethGriggs
src: fix Get() usage in tls_wrap.cc
f9e8e88 
Backport-PR-URL: #27967
PR-URL: #24060
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
@BethGriggs BethGriggs mentioned this pull request Jul 17, 2019
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@joyeecheung joyeecheung joyeecheung approved these changes

@addaleax addaleax addaleax approved these changes

@danbev danbev danbev approved these changes

Assignees
No one assigned
Labels
c++ Issues and PRs that require attention from people who are familiar with C++. lib / src Issues and PRs related to general changes in the lib or src directory.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@cjihrig @nodejs-github-bot @danbev @codebytere @addaleax @joyeecheung