Skip to content

Rollup of 10 pull requests #48017

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 25 commits into from
Feb 6, 2018
Merged

Rollup of 10 pull requests #48017

merged 25 commits into from
Feb 6, 2018

Conversation

QuietMisdreavus and others added 25 commits January 16, 2018 13:31
This path was considered to be unreachable. However,
`&mut` could potentially live inside `static`.
For example, `static TAB: [&mut [u8]; 0] = [];`.
This text was copy-pasted from the `AsRef` docs to `AsMut`, but needed
some additional adjustments for correctness.
and improve printing of errors
When looking up a field defintion, since the name might be incorrect in the field init shorthand case.

cc rust-lang/rls#699
Make inline assembly volatile if it has no outputs. Fixes rust-lang#46026
…estebank

add documentation from doc(include) to analysis data

cc rust-lang#44732

Currently save-analysis only loads docs from plain doc comments and doc attributes. Since `#[doc(include="filename.md")]` doesn't create a plain doc attribute when it loads the file, we need to be sure to pick up this info for the analysis data.
…akis

Disallow mutable borrow to non-mut statics

Closes rust-lang#42344.
Add a regression test for rust-lang#44415

This PR adds a regression test for issue rust-lang#44415.

Fixes rust-lang#44415.
…chton

Update book

This PR does two things:

1. update the book to include rust-lang/book#1088
2. update to mdbook 0.1

Both of these things are big changes, so I want to land them now, well before the next branch, so we can kick the tires.

------------------------------

Locally, I'm seeing some weirdness around the reference and this:

![image](https://user-images.githubusercontent.com/27786/35411917-8dcbb31a-01e8-11e8-8c30-0bd280d93b9d.png)

Putting this PR up so others can try and build and see if it reproduces for them.
…eveklabnik

Make wording around 0-cost casts more precise
…ilize, r=petrochenkov

Stabilize use_nested_groups

As requested in rust-lang#44494. Documentation PRs already sent.
…ulacrum

Fix rustdoc ICE on macros defined within functions

fixes rust-lang#47639
Fix info about generic impls in AsMut docs

This text was copy-pasted from the `AsRef` docs to `AsMut`, but needed some additional adjustments for correctness.
save-analysis: avoid implicit unwrap

When looking up a field defintion, since the name might be incorrect in the field init shorthand case.

cc rust-lang/rls#699

r? @eddyb
@rust-highfive
Copy link
Contributor

r? @estebank

(rust_highfive has picked a reviewer for you, use r? to override)

@kennytm
Copy link
Member Author

kennytm commented Feb 5, 2018

@bors r+ p=2

@bors
Copy link
Collaborator

bors commented Feb 5, 2018

📌 Commit 0553dc8 has been approved by kennytm

@kennytm kennytm added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Feb 5, 2018
@bors
Copy link
Collaborator

bors commented Feb 5, 2018

⌛ Testing commit 0553dc8 with merge 759ae2d61ccb535e05fa38c12585a21aa14994b5...

@bors
Copy link
Collaborator

bors commented Feb 5, 2018

💔 Test failed - status-appveyor

@bors bors 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 Feb 5, 2018
@kennytm
Copy link
Member Author

kennytm commented Feb 6, 2018

@bors retry #46903

@bors bors 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 Feb 6, 2018
@bors
Copy link
Collaborator

bors commented Feb 6, 2018

⌛ Testing commit 0553dc8 with merge b224fc8...

bors added a commit that referenced this pull request Feb 6, 2018
Rollup of 10 pull requests

- Successful merges: #46030, #47496, #47543, #47704, #47753, #47807, #47948, #47959, #48003, #48007
- Failed merges:
@bors
Copy link
Collaborator

bors commented Feb 6, 2018

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

@bors bors merged commit 0553dc8 into rust-lang:master Feb 6, 2018
@Centril Centril added the rollup A PR which is a rollup label Oct 2, 2019
# for free to join this conversation on GitHub. Already have an account? # 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.