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

Rollup of 5 pull requests #61548

Merged
merged 13 commits into from
Jun 5, 2019
Merged

Rollup of 5 pull requests #61548

merged 13 commits into from
Jun 5, 2019

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Jun 5, 2019

Successful merges:

Failed merges:

r? @ghost

Jethro Beekman and others added 13 commits June 3, 2019 13:06
The documentation of [`ExitStatus`] are extended to be at the same depth as [`Output`].
Removed trailing whitespace from documentation of ExitStatus.
NetBSD ignores this note and marks the stack no-exec unconditionally
Looks like the Azure image changed recently so let's account for that!
Looks like Azure has updated images recently to install Rust by default,
but that can interfere with our own compiler (for example Cargo's test
suite we think) so be sure to uninstall it before proceeding.
…chton

Fix cfg(test) build for x86_64-fortanix-unknown-sgx
Edit docs of ExitStatus

The documentation of [`ExitStatus`] are extended to be at the same depth as [`Output`].
…t_fn, r=eddyb

Don't allow using const fn arguments as "args_required_const"

r? @eddyb
Don't use GNU noexec stack note

NetBSD ignores this note and marks the stack no-exec unconditionally
azure: Fix some minor issues which have broken our configuration

* Ensure that when we enable IPv6 for Docker on Linux that the various directories before writing a config file
* Delete a previously installed rustup if any since it seems to interfere with Cargo's test suite.
@Centril
Copy link
Contributor Author

Centril commented Jun 5, 2019

@bors r+ p=5 rollup=never

@bors
Copy link
Contributor

bors commented Jun 5, 2019

📌 Commit 694b048 has been approved by Centril

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jun 5, 2019
@bors
Copy link
Contributor

bors commented Jun 5, 2019

⌛ Testing commit 694b048 with merge 7cdaffd...

bors added a commit that referenced this pull request Jun 5, 2019
Rollup of 5 pull requests

Successful merges:

 - #61503 (Fix cfg(test) build for x86_64-fortanix-unknown-sgx)
 - #61534 (Edit docs of ExitStatus)
 - #61536 (Don't allow using const fn arguments as "args_required_const")
 - #61538 (Don't use GNU noexec stack note)
 - #61546 (azure: Fix some minor issues which have broken our configuration )

Failed merges:

r? @ghost
@bors
Copy link
Contributor

bors commented Jun 5, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: Centril
Pushing 7cdaffd to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 5, 2019
@bors bors merged commit 694b048 into rust-lang:master Jun 5, 2019
@Centril Centril deleted the rollup-5t6cvbk branch June 5, 2019 21:29
@Centril Centril added the rollup A PR which is a rollup label Oct 2, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants