Skip to content

Use custom cargo/rustc paths when parsing flags. - #42695

Merged
bors merged 1 commit into
rust-lang:masterfrom
Mark-Simulacrum:fix-verbose
Jun 18, 2017
Merged

Use custom cargo/rustc paths when parsing flags.#42695
bors merged 1 commit into
rust-lang:masterfrom
Mark-Simulacrum:fix-verbose

Conversation

@Mark-Simulacrum

@Mark-SimulacrumMark-Simulacrum commented Jun 16, 2017

Copy link
Copy Markdown
Member

Fixes#41779, probably also #42543 (I think they're duplicates).

I'm not entirely happy with the implementation, since it means we parse the configuration twice, but it's the minimal solution. I think the other choice is to move both calls to Config::parse inside Flags::parse and merge them, but I don't know if that's a good idea.

r? @alexcrichton

@alexcrichton

alexcrichton commented Jun 16, 2017

Copy link
Copy Markdown
Member

@bors: r+

@bors

bors commented Jun 16, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit 7326737 has been approved by alexcrichton

@semarie

semarie commented Jun 17, 2017

Copy link
Copy Markdown
Contributor

I confirm it fixes #41779 for me (I applied it on 1.18.0)

@devurandom

devurandom commented Jun 17, 2017

Copy link
Copy Markdown
Contributor

The patch indeed fixes #41779. Should the commit message be amended to mention that it Fixes: #41779?

@devurandomdevurandom mentioned this pull request Jun 17, 2017
Closed
@Mark-SimulacrumMark-Simulacrum added beta-nominated Nominated for backporting to the compiler in the beta channel. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. labels Jun 17, 2017
@bors

bors commented Jun 17, 2017

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 7326737 with merge 362a323...

@bors

bors commented Jun 17, 2017

Copy link
Copy Markdown
Collaborator

💔 Test failed - status-travis

@Mark-Simulacrum

Mark-Simulacrum commented Jun 17, 2017

Copy link
Copy Markdown
MemberAuthor

Presumably spurious timeout

@bors retry

[01:19:36] test process::tests::test_process_output_fail_to_start ... test process::tests::test_process_output_fail_to_start has been running for over 60 seconds
No output has been received in the last 30m0s, this potentially indicates a stalled build or something wrong with the build itself.
Check the details on how to adjust your build configuration on: https://docs.travis-ci.com/user/common-build-problems/#Build-times-out-because-no-output-was-received
The build has been terminated

@alexcrichtonalexcrichton added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Jun 17, 2017
@Mark-SimulacrumMark-Simulacrum added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jun 17, 2017
@Mark-Simulacrum

Mark-Simulacrum commented Jun 18, 2017

Copy link
Copy Markdown
MemberAuthor

@bors rollup

Mark-Simulacrum added a commit to Mark-Simulacrum/rust that referenced this pull request Jun 18, 2017
@Mark-Simulacrum
Rollup merge ofrust-lang#42695- Mark-Simulacrum:fix-verbose, r=alex…
7eff974
…crichton
Use custom cargo/rustc paths when parsing flags.
Fixesrust-lang#41779, probably also rust-lang#42543 (I think they're duplicates).
I'm not entirely happy with the implementation, since it means we parse the configuration twice, but it's the minimal solution. I think the other choice is to move both calls to Config::parse inside Flags::parse and merge them, but I don't know if that's a good idea.
r? @alexcrichton
@Mark-SimulacrumMark-Simulacrum mentioned this pull request Jun 18, 2017
Merged
frewsxcv added a commit to frewsxcv/rust that referenced this pull request Jun 18, 2017
@frewsxcv
Rollup merge ofrust-lang#42695- Mark-Simulacrum:fix-verbose, r=alex…
998ee7b
…crichton
Use custom cargo/rustc paths when parsing flags.
Fixesrust-lang#41779, probably also rust-lang#42543 (I think they're duplicates).
I'm not entirely happy with the implementation, since it means we parse the configuration twice, but it's the minimal solution. I think the other choice is to move both calls to Config::parse inside Flags::parse and merge them, but I don't know if that's a good idea.
r? @alexcrichton
@frewsxcvfrewsxcv mentioned this pull request Jun 18, 2017
Closed
bors added a commit that referenced this pull request Jun 18, 2017
@bors
Auto merge of#42738- Mark-Simulacrum:rollup, r=Mark-Simulacrum
247a018
Rollup of 7 pull requests
- Successful merges: #42695, #42714, #42720, #42723, #42730, #42731, #42734
- Failed merges: #42722
@bors
bors merged commit 7326737 into rust-lang:masterJun 18, 2017
@kyriaskyrias mentioned this pull request Jun 20, 2017
Closed
@Mark-Simulacrum
Mark-Simulacrum deleted the fix-verbose branch June 20, 2017 16:17
@Mark-Simulacrum
Mark-Simulacrum restored the fix-verbose branch June 20, 2017 16:17
@Mark-Simulacrum
Mark-Simulacrum deleted the fix-verbose branch June 20, 2017 23:04
@infinity0infinity0 mentioned this pull request Jun 21, 2017
Merged
@brsonbrson mentioned this pull request Jun 22, 2017
Closed
@alexcrichtonalexcrichton removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jun 22, 2017
bors added a commit that referenced this pull request Jun 25, 2017
@bors
Auto merge of#42841- brson:beta-next, r=alexcrichton
5181b24
[beta] backports
- #42785
- #42740
- #42735
- #42728
- #42695
- #42659
- #42634
- #42566
I just unilaterally accepted all the non-accepted nominations. Everything picked cleanly.
Still testing locally.
cc @rust-lang/compiler
r? @alexcrichton
bors added a commit that referenced this pull request Jun 25, 2017
@bors
Auto merge of#42841- brson:beta-next, r=alexcrichton
046a91e
[beta] backports
- #42785
- #42740
- #42735
- #42728
- #42695
- #42659
- #42634
- #42566
I just unilaterally accepted all the non-accepted nominations. Everything picked cleanly.
Still testing locally.
cc @rust-lang/compiler
r? @alexcrichton
@Mark-SimulacrumMark-Simulacrum mentioned this pull request Jun 27, 2017
Merged
bors added a commit that referenced this pull request Jun 27, 2017
@bors
Auto merge of#42927- brson:beta-next, r=alexcrichton
9987ed4
[beta] backports
Reopening #42841 as a new PR due to bors flakiness.
- #42785
- #42740
- #42735
- #42728
- #42695
- #42659
- #42634
- #42566
I just unilaterally accepted all the non-accepted nominations. Everything picked cleanly.
bors added a commit that referenced this pull request Jun 27, 2017
@bors
Auto merge of#42927- brson:beta-next, r=alexcrichton
2abccac
[beta] backports
Reopening #42841 as a new PR due to bors flakiness.
- #42785
- #42740
- #42735
- #42728
- #42695
- #42659
- #42634
- #42566
I just unilaterally accepted all the non-accepted nominations. Everything picked cleanly.
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@alexcrichtonalexcrichton

Labels

beta-acceptedAccepted for backporting to the compiler in the beta channel.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-infraRelevant to the infrastructure team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@Mark-Simulacrum@alexcrichton@bors@semarie@devurandom