Skip to content

Rollup of 6 pull requests - #64616

Merged
bors merged 24 commits into
rust-lang:masterfrom
Centril:rollup-du6728f
Sep 20, 2019
Merged

Rollup of 6 pull requests#64616
bors merged 24 commits into
rust-lang:masterfrom
Centril:rollup-du6728f

Conversation

@Centril

Copy link
Copy Markdown
Contributor

Successful merges:

Failed merges:

r? @ghost

RalfJungand others added 24 commits September 16, 2019 12:33
Fixesrust-lang#64590
When we emit an 'unreachable' lint, we now add a note pointing at the
expression that actually causes the code to be unreachable (e.g.
`return`, `break`, `panic`).
This is especially useful when macros are involved, since a diverging
expression might be hidden inside of a macro invocation.
Co-Authored-By: Mazdak Farrokhzad <twingoow@gmail.com>
Rename the existing Diverges.always method to Diverges.is_always
Co-Authored-By: Mazdak Farrokhzad <twingoow@gmail.com>
Looks like the packaging step for the standard library was happening
twice on CI, but it only needs to happen once! The `Analysis` packaging
step accidentally packaged `Std` instead of relying on compiling `Std`,
which meant that we ended up packaging it twice erroneously.
Previously when building documentation for the standard library we'd
copy all the files 5 times, and these files include libcore/libstd docs
which are huge! This commit instead only copies the files after rustdoc
has been run for each crate, reducing the number of redundant copies
we're making.
fix Miri discriminant handling
This can be reviewed commit-by-commit fairly well.
The Miri side is at rust-lang/miri#903.
Fixesrust-lang#62138
r? @eddyb@oli-obk
… r=Centril
Point at original span when emitting unreachable lint
Fixesrust-lang#64590
When we emit an 'unreachable' lint, we now add a note pointing at the
expression that actually causes the code to be unreachable (e.g.
`return`, `break`, `panic`).
This is especially useful when macros are involved, since a diverging
expression might be hidden inside of a macro invocation.
…ievink
Fix backticks in documentation
Fix a few typos in comments/documentation where backticks were doubled-up on one side.
…k-Simulacrum
rustbuild: Don't package libstd twice
Looks like the packaging step for the standard library was happening
twice on CI, but it only needs to happen once! The `Analysis` packaging
step accidentally packaged `Std` instead of relying on compiling `Std`,
which meant that we ended up packaging it twice erroneously.
…k-Simulacrum
rustbuild: Copy crate doc files fewer times
Previously when building documentation for the standard library we'd
copy all the files 5 times, and these files include libcore/libstd docs
which are huge! This commit instead only copies the files after rustdoc
has been run for each crate, reducing the number of redundant copies
we're making.
@Centril

Copy link
Copy Markdown
ContributorAuthor

@bors r+ p=6 rollup=never

@bors

bors commented Sep 19, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 99cbffb 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 Sep 19, 2019
@bors

bors commented Sep 19, 2019

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 99cbffb with merge 3a302cd...

bors added a commit that referenced this pull request Sep 19, 2019
Rollup of 6 pull requests
Successful merges:
- #63448 (fix Miri discriminant handling)
- #64592 (Point at original span when emitting unreachable lint)
- #64601 (Fix backticks in documentation)
- #64606 (Remove unnecessary `mut` in doc example)
- #64611 (rustbuild: Don't package libstd twice)
- #64613 (rustbuild: Copy crate doc files fewer times)
Failed merges:
r? @ghost
@bors

bors commented Sep 19, 2019

Copy link
Copy Markdown
Collaborator

💥 Test timed out

@borsbors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Sep 19, 2019
@Centril

Copy link
Copy Markdown
ContributorAuthor

@bors retry

@borsbors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Sep 19, 2019
@bors

bors commented Sep 19, 2019

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 99cbffb with merge 53b352e...

bors added a commit that referenced this pull request Sep 19, 2019
Rollup of 6 pull requests
Successful merges:
- #63448 (fix Miri discriminant handling)
- #64592 (Point at original span when emitting unreachable lint)
- #64601 (Fix backticks in documentation)
- #64606 (Remove unnecessary `mut` in doc example)
- #64611 (rustbuild: Don't package libstd twice)
- #64613 (rustbuild: Copy crate doc files fewer times)
Failed merges:
r? @ghost
@bors

bors commented Sep 20, 2019

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-azure
Approved by: Centril
Pushing 53b352e to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Sep 20, 2019
@bors
bors merged commit 99cbffb into rust-lang:masterSep 20, 2019
@Centril
Centril deleted the rollup-du6728f branch September 20, 2019 02:47
@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@RalfJung@Aaron1011@grovesNL@adrianheine@alexcrichton