Skip to content

Rollup of 5 pull requests - #60030

Merged
bors merged 24 commits into
rust-lang:masterfrom
Centril:rollup-3d0t24t
Apr 17, 2019
Merged

Rollup of 5 pull requests#60030
bors merged 24 commits into
rust-lang:masterfrom
Centril:rollup-3d0t24t

Conversation

@Centril

Copy link
Copy Markdown
Contributor

Successful merges:

Failed merges:

r? @ghost

oli-obkand others added 24 commits April 2, 2019 16:14
Don't enable LLD when LTO is enabled on Darwin.
…ddyb
Emit ansi color codes in the `rendered` field of json diagnostics
cc @ljedrz
Implemented for rust-lang#56595 (comment) (x.py clippy)
const fn: Improve wording
fixesrust-lang#59611
This might need discussion. Feel free to close this PR if we don't need to fix.
Miri: refactor new allocation tagging
Tagging and initializing `AllocExtra` now go hand-in-hand so one cannot forget to do one when doing the other. In particular, `memory.allocate` is now much easier to use correctly (because it will already return a tagged pointer).
r? @oli-obk
LLD is not supported on Darwin
Don't enable LLD when LTO is enabled on Darwin.
Miri now supports entropy, but is still slow
Adjust the `cfg` and their comments in the test suites accordingly.
@Centril

Copy link
Copy Markdown
ContributorAuthor

@bors r+ p=5

@bors

bors commented Apr 17, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit eb958e1 has been approved by Centril

@borsbors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Apr 17, 2019
@bors

bors commented Apr 17, 2019

Copy link
Copy Markdown
Collaborator

⌛ Testing commit eb958e1 with merge efe2f32...

bors added a commit that referenced this pull request Apr 17, 2019
Rollup of 5 pull requests
Successful merges:
- #59128 (Emit ansi color codes in the `rendered` field of json diagnostics)
- #59646 (const fn: Improve wording)
- #59986 (Miri: refactor new allocation tagging)
- #60003 (LLD is not supported on Darwin)
- #60018 (Miri now supports entropy, but is still slow)
Failed merges:
r? @ghost
@bors

bors commented Apr 17, 2019

Copy link
Copy Markdown
Collaborator

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

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Apr 17, 2019
@bors
bors merged commit eb958e1 into rust-lang:masterApr 17, 2019
@Centril
Centril deleted the rollup-3d0t24t branch April 17, 2019 12:58
@rust-highfive

Copy link
Copy Markdown
Contributor

📣 Toolstate changed by #60030!

Tested on commit efe2f32.
Direct link to PR: #60030

💔 miri on windows: test-pass → build-fail (cc @oli-obk@RalfJung@eddyb, @rust-lang/infra).
💔 miri on linux: test-pass → build-fail (cc @oli-obk@RalfJung@eddyb, @rust-lang/infra).
🎉 rls on windows: test-fail → test-pass (cc @nrc@Xanewok, @rust-lang/infra).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Apr 17, 2019
Tested on commit rust-lang/rust@efe2f32.
Direct link to PR: <rust-lang/rust#60030>
💔 miri on windows: test-pass → build-fail (cc @oli-obk@RalfJung@eddyb, @rust-lang/infra).
💔 miri on linux: test-pass → build-fail (cc @oli-obk@RalfJung@eddyb, @rust-lang/infra).
🎉 rls on windows: test-fail → test-pass (cc @nrc@Xanewok, @rust-lang/infra).
@CentrilCentril added the rollup A PR which is a rollup label Oct 2, 2019
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merged-by-borsThis PR was explicitly merged by bors.rollupA PR which is a rollupS-waiting-on-borsStatus: 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.

7 participants

@Centril@bors@rust-highfive@oli-obk@JohnTitor@petrhosek@RalfJung