Skip to content

Rollup of 8 pull requests #53400

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

Merged
merged 17 commits into from
Aug 15, 2018
Merged

Rollup of 8 pull requests #53400

merged 17 commits into from
Aug 15, 2018

Conversation

GuillaumeGomez
Copy link
Member

Successful merges:

Failed merges:

r? @ghost

srijs and others added 17 commits August 11, 2018 14:36
improve diagnostics for tests with custom return values

This is an attempt at getting the ball rolling to improve the diagnostics for test functions that return custom `impl Termination` values (see rust-lang#52436).

An alternative could be to use `eprintln!`, but including this in the panic message felt nicely consistent with how failing test assertions would be reported.

Let me know what you think!
…iplett

use ? to simplify `TransitiveRelation.maybe_map`

I think this looks much clearer than the original.
…illaumeGomez

Extend documentation of `rustc_on_unimplemented`
fix error for unsized packed struct field

It was really confusing to be told "only the last field of a struct may have a dynamically sized type" when only the last field *was* unsized.
Add doc examples for std::alloc::{alloc,alloc_zeroed}.

None
Ignore test that fails on stage1

The error code is not emitted on stage1, so ignore this test there.
…rewsxcv

Fix links' color

Fixes rust-lang#53375.

Problem was coming from the minifier.

r? @frewsxcv
Fix since of Iterator::flatten to be a proper semver

r? @kennytm
@GuillaumeGomez
Copy link
Member Author

@bors: r+ p=8

@bors
Copy link
Collaborator

bors commented Aug 15, 2018

📌 Commit b9a51ce has been approved by GuillaumeGomez

@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 Aug 15, 2018
@bors
Copy link
Collaborator

bors commented Aug 15, 2018

⌛ Testing commit b9a51ce with merge d767ee1...

bors added a commit that referenced this pull request Aug 15, 2018
Rollup of 8 pull requests

Successful merges:

 - #52453 (improve diagnostics for tests with custom return values)
 - #53271 (use ? to simplify `TransitiveRelation.maybe_map`)
 - #53279 (Extend documentation of `rustc_on_unimplemented`)
 - #53342 (fix error for unsized packed struct field)
 - #53344 (Add doc examples for std::alloc::{alloc,alloc_zeroed}.)
 - #53368 (Ignore test that fails on stage1)
 - #53388 (Fix links' color)
 - #53396 (Fix since of Iterator::flatten to be a proper semver)

Failed merges:

r? @ghost
@bors
Copy link
Collaborator

bors commented Aug 15, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: GuillaumeGomez
Pushing d767ee1 to master...

@bors bors merged commit b9a51ce into rust-lang:master Aug 15, 2018
@GuillaumeGomez GuillaumeGomez deleted the rollup branch August 16, 2018 09:41
@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
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.

10 participants