Eliminate shared this from std/process.d #5466

andralex · 2017-06-11T17:41:07Z

cc @kyllingstad @CyberShadow @John-Colvin @braddr @markisaa @wilzbach @joakim-noah

CyberShadow · 2017-06-11T17:46:13Z

std/process.d

    }
    else
    {
        // Made available by the C runtime:
-        extern(C) extern __gshared const char** environ;
+        private extern(C) extern __gshared const char** environ;
+        private const(char**) getEnvironPtr() @property @trusted


Nit, get implies an action, so having the name start with get should be mutually exclusive with @property

BTW, as all this is in a private { } block, the private annotations here are redundant.

andralex · 2017-06-11T17:53:59Z

Oh, unindented private block. Thx. All blocks should be indented, @wilzbach how easy is this to enforce automatically?

@CyberShadow I rebeled by changing the indent, please don't make me create another PR for it. Thanks.

CyberShadow · 2017-06-11T18:41:59Z

please don't make me create another PR for it

IMO it's fine as long as it's a separate commit.

CyberShadow · 2017-06-11T18:42:48Z

Though, ideally, whitespace changes should be in their own commit.

John-Colvin · 2017-06-11T19:37:59Z

std/process.d

+        {
+            // Made available by the C runtime:
+            extern(C) extern __gshared const char** environ;
+            const(char**) getEnvironPtr() @property @trusted


getXXXXX and @property? One or the other I think.

John-Colvin · 2017-06-11T19:48:59Z

LGTM overall.

CyberShadow · 2017-06-11T20:53:12Z

Though, ideally, whitespace changes should be in their own commit.

@andralex Took the liberty of doing this myself.

wilzbach · 2017-06-11T20:54:58Z

Oh, unindented private block. Thx. All blocks should be indented, @wilzbach how easy is this to enforce automatically?

Should be fairly trivial do as a Dscanner plugin. I might be able to have a look at this tonight ;-)

wilzbach · 2017-06-11T20:58:12Z

@andralex Took the liberty of doing this myself.

@CyberShadow don't forget that a security feature, we remove auto-merge if the content of the PR changes.

CyberShadow · 2017-06-11T20:59:12Z

Oh, I didn't see that Andrei added it. The PR has been open only 3 hours, and I think we should allow 24 hours for review of non-trivial PRs.

wilzbach · 2017-06-12T04:05:20Z

Should be fairly trivial do as a Dscanner plugin. I might be able to have a look at this tonight ;-)

Have a look at #5477 and dlang-community/D-Scanner#441

kyllingstad · 2017-06-13T20:25:02Z

LGTM.

It's kind of embarrassing that I didn't implement it like this in the first place...

schveiguy · 2017-06-14T02:13:49Z

LGTM. Fix the merge conflict, and I think we are good.

wilzbach · 2017-06-15T13:29:48Z

LGTM. Fix the merge conflict, and I think we are good.

Done. No need to wait on Andrei for resolving merge conflicts - this actually didn't even require manual interaction ;-)

schveiguy · 2017-06-15T17:42:42Z

@wilzbach thanks, any idea bout the circleci failure? I can't understand what the problem there is.

wilzbach · 2017-06-15T19:34:54Z

@wilzbach thanks, any idea bout the circleci failure? I can't understand what the problem there is.

Seems like a problem with DUB - unfortunately the DUB registry isn't that stable (e.g. dlang/dub#1104). We really should setup a couple of mirror servers ...
I rekicked the build (top right) and it seems to work ...

andralex · 2017-06-16T00:23:15Z

Alrighty, let's do this!

CyberShadow · 2017-06-16T00:24:16Z

Why didn't auto-merge work? The label was added hours ago.

wilzbach · 2017-06-16T00:36:41Z

The log for the last hours looks like this - the bot tried really hard:

» 15 Jun 2017 21:50:44.853  179 <190>1 2017-06-15T19:50:44.471745+00:00 app web.1 - - PUT https://api.github.com/repos/dlang/phobos/pulls/5466/merge failed;  Conflict 409. Context
» 15 Jun 2017 22:20:35.257  179 <190>1 2017-06-15T20:20:34.864390+00:00 app web.1 - - PUT https://api.github.com/repos/dlang/phobos/pulls/5466/merge failed;  Conflict 409. Context
» 15 Jun 2017 22:26:17.994  179 <190>1 2017-06-15T20:26:17.609174+00:00 app web.1 - - PUT https://api.github.com/repos/dlang/phobos/pulls/5466/merge failed;  Conflict 409. Context
» 15 Jun 2017 22:29:13.831  179 <190>1 2017-06-15T20:29:13.436591+00:00 app web.1 - - PUT https://api.github.com/repos/dlang/phobos/pulls/5466/merge failed;  Conflict 409. Context
» 15 Jun 2017 22:35:31.403  179 <190>1 2017-06-15T20:35:31.022315+00:00 app web.1 - - PUT https://api.github.com/repos/dlang/phobos/pulls/5466/merge failed;  Conflict 409. Context
» 15 Jun 2017 22:52:18.933  179 <190>1 2017-06-15T20:52:18.528054+00:00 app web.1 - - PUT https://api.github.com/repos/dlang/phobos/pulls/5466/merge failed;  Conflict 409. Context
» 15 Jun 2017 22:58:42.781  179 <190>1 2017-06-15T20:58:42.397993+00:00 app web.1 - - PUT https://api.github.com/repos/dlang/phobos/pulls/5466/merge failed;  Conflict 409. Context
» 15 Jun 2017 23:03:41.316  179 <190>1 2017-06-15T21:03:40.924539+00:00 app web.1 - - PUT https://api.github.com/repos/dlang/phobos/pulls/5466/merge failed;  Conflict 409. Context
» 15 Jun 2017 23:13:07.129  179 <190>1 2017-06-15T21:13:06.740572+00:00 app web.1 - - PUT https://api.github.com/repos/dlang/phobos/pulls/5466/merge failed;  Conflict 409. Context
» 15 Jun 2017 23:21:09.421  179 <190>1 2017-06-15T21:21:09.021914+00:00 app web.1 - - PUT https://api.github.com/repos/dlang/phobos/pulls/5466/merge failed;  Conflict 409. Context
» 15 Jun 2017 23:26:49.682  179 <190>1 2017-06-15T21:26:49.283353+00:00 app web.1 - - PUT https://api.github.com/repos/dlang/phobos/pulls/5466/merge failed;  Conflict 409. Context
» 15 Jun 2017 23:32:37.949  179 <190>1 2017-06-15T21:32:37.558484+00:00 app web.1 - - PUT https://api.github.com/repos/dlang/phobos/pulls/5466/merge failed;  Conflict 409. Context
» 15 Jun 2017 23:35:34.252  179 <190>1 2017-06-15T21:35:33.848320+00:00 app web.1 - - PUT https://api.github.com/repos/dlang/phobos/pulls/5466/merge failed;  Conflict 409. Context
» 15 Jun 2017 23:40:36.383  179 <190>1 2017-06-15T21:40:36.079234+00:00 app web.1 - - PUT https://api.github.com/repos/dlang/phobos/pulls/5466/merge failed;  Conflict 409. Context
» 15 Jun 2017 23:43:46.548  179 <190>1 2017-06-15T21:43:46.159810+00:00 app web.1 - - PUT https://api.github.com/repos/dlang/phobos/pulls/5466/merge failed;  Conflict 409. Context
» 15 Jun 2017 23:55:04.150  179 <190>1 2017-06-15T21:55:03.753223+00:00 app web.1 - - PUT https://api.github.com/repos/dlang/phobos/pulls/5466/merge failed;  Conflict 409. Context
» 16 Jun 2017 00:00:47.471  179 <190>1 2017-06-15T22:00:47.100550+00:00 app web.1 - - PUT https://api.github.com/repos/dlang/phobos/pulls/5466/merge failed;  Conflict 409. Context
» 16 Jun 2017 00:27:47.523  179 <190>1 2017-06-15T22:27:47.108417+00:00 app web.1 - - PUT https://api.github.com/repos/dlang/phobos/pulls/5466/merge failed;  Conflict 409. Context
» 16 Jun 2017 00:56:51.056  179 <190>1 2017-06-15T22:56:50.647810+00:00 app web.1 - - PUT https://api.github.com/repos/dlang/phobos/pulls/5466/merge failed;  Conflict 409. Context
» 16 Jun 2017 01:01:53.754  179 <190>1 2017-06-15T23:01:53.448185+00:00 app web.1 - - PUT https://api.github.com/repos/dlang/phobos/pulls/5466/merge failed;  Conflict 409. Context
» 16 Jun 2017 01:03:09.562  179 <190>1 2017-06-15T23:03:09.231125+00:00 app web.1 - - PUT https://api.github.com/repos/dlang/phobos/pulls/5466/merge failed;  Conflict 409. Context
» 16 Jun 2017 01:26:11.308  179 <190>1 2017-06-15T23:26:10.928528+00:00 app web.1 - - PUT https://api.github.com/repos/dlang/phobos/pulls/5466/merge failed;  Conflict 409. Context
» 16 Jun 2017 01:47:54.604  179 <190>1 2017-06-15T23:47:54.298970+00:00 app web.1 - - PUT https://api.github.com/repos/dlang/phobos/pulls/5466/merge failed;  Conflict 409. Context
» 16 Jun 2017 01:53:42.220  179 <190>1 2017-06-15T23:53:41.846688+00:00 app web.1 - - PUT https://api.github.com/repos/dlang/phobos/pulls/5466/merge failed;  Conflict 409. Context
» 16 Jun 2017 02:05:47.226  179 <190>1 2017-06-16T00:05:46.838892+00:00 app web.1 - - PUT https://api.github.com/repos/dlang/phobos/pulls/5466/merge failed;  Conflict 409. Context
» 16 Jun 2017 02:11:36.124  179 <190>1 2017-06-16T00:11:35.743104+00:00 app web.1 - - PUT https://api.github.com/repos/dlang/phobos/pulls/5466/merge failed;  Conflict 409. Context
» 16 Jun 2017 02:11:38.957  179 <190>1 2017-06-16T00:11:38.570519+00:00 app web.1 - - PUT https://api.github.com/repos/dlang/phobos/pulls/5466/merge failed;  Conflict 409. Context
» 16 Jun 2017 02:17:22.053  179 <190>1 2017-06-16T00:17:21.650132+00:00 app web.1 - - PUT https://api.github.com/repos/dlang/phobos/pulls/5466/merge failed;  Conflict 409. Context
» 16 Jun 2017 02:22:50.521  179 <190>1 2017-06-16T00:22:50.213019+00:00 app web.1 - - PUT https://api.github.com/repos/dlang/phobos/pulls/5466/merge failed;  Conflict 409. Context

And the context for one event looks like this:

» 16 Jun 2017 02:22:50.521  179 <190>1 2017-06-16T00:22:50.213019+00:00 app web.1 - - PUT https://api.github.com/repos/dlang/phobos/pulls/5466/merge failed;  Conflict 409.
» 16 Jun 2017 02:22:50.596  260 <190>1 2017-06-16T00:22:50.213034+00:00 app web.1 - - {"message":"Head branch was modified. Review and try the merge again.","documentation_url":"https://developer.github.com/v3/pulls/#merge-a-pull-request-merge-button"}
» 16 Jun 2017 02:22:52.772  305 <158>1 2017-06-16T00:22:52.596359+00:00 heroku router - - at=info method=POST path="/github_hook" host=dlang-bot.herokuapp.com request_id=cf45912b-7266-46ac-ad38-e5bdf171c069 fwd="192.30.252.40" dyno=web.1 connect=0ms service=2ms status=200 bytes=146 protocol=https

Maybe there's sth. weird with the GitHub API going on (e.g. it doesn't allow API merges if a maintainer has force-pushed the PR and it isn't reviewed yet)?

wilzbach · 2017-06-16T00:39:23Z

It's probably DLang-Bot's fault to send the wrong sha -> dlang/dlang-bot#77

CyberShadow approved these changes Jun 11, 2017

View reviewed changes

John-Colvin reviewed Jun 11, 2017

View reviewed changes

andralex force-pushed the nononosharedstaticzisinprocess branch from 1c23ab8 to 5722113 Compare June 11, 2017 20:35

andralex added the auto-merge label Jun 11, 2017

CyberShadow force-pushed the nononosharedstaticzisinprocess branch from 5722113 to ddfe6ad Compare June 11, 2017 20:52

dlang-bot removed the auto-merge label Jun 11, 2017

CyberShadow self-assigned this Jun 11, 2017

wilzbach added the auto-merge label Jun 11, 2017

wilzbach removed the auto-merge label Jun 11, 2017

wilzbach mentioned this pull request Jun 12, 2017

Remove redundant access specifier from Phobos #5477

Merged

schveiguy added the auto-merge label Jun 14, 2017

wilzbach force-pushed the nononosharedstaticzisinprocess branch from ddfe6ad to 5ac8ce7 Compare June 15, 2017 13:28

dlang-bot removed the auto-merge label Jun 15, 2017

wilzbach added the auto-merge label Jun 15, 2017

wilzbach force-pushed the nononosharedstaticzisinprocess branch from 5ac8ce7 to 3b3cd77 Compare June 15, 2017 15:01

dlang-bot removed the auto-merge label Jun 15, 2017

wilzbach added the auto-merge label Jun 15, 2017

Eliminate shared this from std/process.d

2f16ae7

CyberShadow and others added 2 commits June 15, 2017 17:01

std.process: Correct indentation of private block

442a94a

Adjust private

3b3cd77

andralex merged commit f91f8e2 into dlang:master Jun 16, 2017

wilzbach mentioned this pull request Jun 16, 2017

Handle head sha changes correctly dlang/dlang-bot#77

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Eliminate shared this from std/process.d #5466

Eliminate shared this from std/process.d #5466

andralex commented Jun 11, 2017 •

edited

Loading

CyberShadow Jun 11, 2017

CyberShadow Jun 11, 2017

andralex commented Jun 11, 2017

CyberShadow commented Jun 11, 2017

CyberShadow commented Jun 11, 2017

John-Colvin Jun 11, 2017

andralex Jun 11, 2017

John-Colvin commented Jun 11, 2017

CyberShadow commented Jun 11, 2017

wilzbach commented Jun 11, 2017

wilzbach commented Jun 11, 2017

CyberShadow commented Jun 11, 2017

wilzbach commented Jun 12, 2017 •

edited

Loading

kyllingstad commented Jun 13, 2017

schveiguy commented Jun 14, 2017

wilzbach commented Jun 15, 2017

schveiguy commented Jun 15, 2017

wilzbach commented Jun 15, 2017

andralex commented Jun 16, 2017

CyberShadow commented Jun 16, 2017

wilzbach commented Jun 16, 2017

wilzbach commented Jun 16, 2017

Eliminate shared this from std/process.d #5466

Eliminate shared this from std/process.d #5466

Conversation

andralex commented Jun 11, 2017 • edited Loading

CyberShadow Jun 11, 2017

Choose a reason for hiding this comment

CyberShadow Jun 11, 2017

Choose a reason for hiding this comment

andralex commented Jun 11, 2017

CyberShadow commented Jun 11, 2017

CyberShadow commented Jun 11, 2017

John-Colvin Jun 11, 2017

Choose a reason for hiding this comment

andralex Jun 11, 2017

Choose a reason for hiding this comment

John-Colvin commented Jun 11, 2017

CyberShadow commented Jun 11, 2017

wilzbach commented Jun 11, 2017

wilzbach commented Jun 11, 2017

CyberShadow commented Jun 11, 2017

wilzbach commented Jun 12, 2017 • edited Loading

kyllingstad commented Jun 13, 2017

schveiguy commented Jun 14, 2017

wilzbach commented Jun 15, 2017

schveiguy commented Jun 15, 2017

wilzbach commented Jun 15, 2017

andralex commented Jun 16, 2017

CyberShadow commented Jun 16, 2017

wilzbach commented Jun 16, 2017

wilzbach commented Jun 16, 2017

andralex commented Jun 11, 2017 •

edited

Loading

wilzbach commented Jun 12, 2017 •

edited

Loading