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

src: re-sort the symbol macros #24382

Merged
merged 1 commit into from
Nov 16, 2018
Merged

Conversation

sam-github
Copy link
Contributor

The symbol macros were almost lexically sorted, but some were misplaced.

I noticed when I added a few, then sorted the symbol block expecting the new ones to just go into the right place, which they did, but a dozen pre-existing ones moved around, too.

I think this could be fast-tracked, it should make no functional difference.

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

@nodejs-github-bot nodejs-github-bot added the c++ Issues and PRs that require attention from people who are familiar with C++. label Nov 15, 2018
@sam-github
Copy link
Contributor Author

I don't see how this would need anything more than a ci lite to land, and perhaps it is a candidate for fast tracing? Not sure if we fast track based on triviality, or urgency.

@devsnek
Copy link
Member

devsnek commented Nov 15, 2018

code changes should always get the full ci. i have no opinion about the fast tracking beyond that

@refack
Copy link
Contributor

refack commented Nov 15, 2018

urgency

Urgency yes (regression and red CI fixers), and if the possible impact is minimal. Personally I'm not a big fan of fast tracking, but I won't block this on.

@sam-github
Copy link
Contributor Author

@addaleax
Copy link
Member

I’d be in favour of fast-tracking, since this PR is not complex and there’s a decent chance of generating merge conflicts that we could otherwise avoid.

@addaleax addaleax added the fast-track PRs that do not need to wait for 48 hours to land. label Nov 16, 2018
@refack refack added the author ready PRs that have at least one approval, no pending requests for changes, and a CI started. label Nov 16, 2018
The symbol macros were almost lexically sorted, but some were misplaced.

PR-URL: nodejs#24382
Reviewed-By: Gus Caplan <me@gus.host>
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Franziska Hinkelmann <franziska.hinkelmann@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
@refack
Copy link
Contributor

refack commented Nov 16, 2018

@refack refack merged commit 5f9b624 into nodejs:master Nov 16, 2018
targos pushed a commit that referenced this pull request Nov 18, 2018
The symbol macros were almost lexically sorted, but some were misplaced.

PR-URL: #24382
Reviewed-By: Gus Caplan <me@gus.host>
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Franziska Hinkelmann <franziska.hinkelmann@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
@sam-github sam-github deleted the sort-env-symbols branch November 27, 2018 22:00
rvagg pushed a commit that referenced this pull request Nov 28, 2018
The symbol macros were almost lexically sorted, but some were misplaced.

PR-URL: #24382
Reviewed-By: Gus Caplan <me@gus.host>
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Franziska Hinkelmann <franziska.hinkelmann@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
@BridgeAR BridgeAR mentioned this pull request Dec 5, 2018
4 tasks
@codebytere
Copy link
Member

@sam-github do you think this is worth trying to backport to v10.x? it's one huge conflict, unfortunately

@sam-github
Copy link
Contributor Author

Yes, I'll do it, because PRs on master that touch the sorted macros won't merge clean unless the 10.x macros are also sorted. Its trivial to backport, I'll just resort the macros that exist already in 10.x.

@sam-github
Copy link
Contributor Author

v10.x backport: #25500

sam-github added a commit to sam-github/node that referenced this pull request Feb 4, 2019
The symbol macros were almost lexically sorted, but some were misplaced.

Backport-PR-URL: nodejs#25500
PR-URL: nodejs#24382
Reviewed-By: Gus Caplan <me@gus.host>
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Franziska Hinkelmann <franziska.hinkelmann@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
BethGriggs pushed a commit that referenced this pull request Feb 5, 2019
The symbol macros were almost lexically sorted, but some were misplaced.

Backport-PR-URL: #25500
PR-URL: #24382
Reviewed-By: Gus Caplan <me@gus.host>
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Franziska Hinkelmann <franziska.hinkelmann@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
@BethGriggs BethGriggs mentioned this pull request Feb 12, 2019
rvagg pushed a commit that referenced this pull request Feb 28, 2019
The symbol macros were almost lexically sorted, but some were misplaced.

Backport-PR-URL: #25500
PR-URL: #24382
Reviewed-By: Gus Caplan <me@gus.host>
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Franziska Hinkelmann <franziska.hinkelmann@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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++. fast-track PRs that do not need to wait for 48 hours to land.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants