Skip to content

Rollup of 7 pull requests #61317

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 18 commits into from
May 29, 2019
Merged

Rollup of 7 pull requests #61317

merged 18 commits into from
May 29, 2019

Conversation

oli-obk
Copy link
Contributor

@oli-obk oli-obk commented May 29, 2019

Successful merges:

Failed merges:

r? @ghost

euclio and others added 18 commits May 16, 2019 14:32
…illaumeGomez

do not print panic message on doctest failures

This PR cleans up rustdoc test output by silently unwinding on failure instead of using `panic!`. It also improves the clarity and consistency of the output on test failure, and adds test cases for failure modes that were previously untested.
…=GuillaumeGomez

strip synstructure consts from compiler docs

Fixes rust-lang#60150.

Unfortunately this PR depends on the use of the deprecated `--passes` flag in bootstrap to keep the `--strip-hidden` pass while still documenting private items. I've opened rust-lang#60884 to track stabilization of a new flag that encapsulates this behavior.

r? @QuietMisdreavus
Account for short-hand init structs when suggesting conversion

Fix rust-lang#52820.
…i-obk

is_union returns ty to avoid computing it twice

r? @oli-obk
… r=GuillaumeGomez

Print const generics properly in rustdoc

Now that rust-lang#59276 is merged, we can print consts properly in rustdoc.

Fixes rust-lang#60737.
Fixes rust-lang#61257.

r? @GuillaumeGomez
split libcore::mem into multiple files

r? @Centril
@oli-obk
Copy link
Contributor Author

oli-obk commented May 29, 2019

@bors r+ p=7

@bors
Copy link
Collaborator

bors commented May 29, 2019

📌 Commit b742d7e has been approved by oli-obk

@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 May 29, 2019
@Centril
Copy link
Contributor

Centril commented May 29, 2019

@bors rollup=never

@pietroalbini
Copy link
Member

@bors retry

@bors
Copy link
Collaborator

bors commented May 29, 2019

⌛ Testing commit b742d7e with merge 37d001e...

bors added a commit that referenced this pull request May 29, 2019
Rollup of 7 pull requests

Successful merges:

 - #60549 (do not print panic message on doctest failures)
 - #60885 (strip synstructure consts from compiler docs)
 - #61217 (Account for short-hand init structs when suggesting conversion)
 - #61261 (is_union returns ty to avoid computing it twice)
 - #61293 (Print const generics properly in rustdoc)
 - #61310 (split libcore::mem into multiple files)
 - #61313 (Simplify Set1::insert)

Failed merges:

r? @ghost
@bors
Copy link
Collaborator

bors commented May 29, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: oli-obk
Pushing 37d001e to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label May 29, 2019
@bors bors merged commit b742d7e into rust-lang:master May 29, 2019
@Centril Centril added the rollup A PR which is a rollup label Oct 2, 2019
@oli-obk oli-obk deleted the rollup-tm5qivq branch March 16, 2021 12:13
# for free to join this conversation on GitHub. Already have an account? # 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.

10 participants