Skip to content
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

Rollup of 5 pull requests #40455

Merged
merged 11 commits into from
Mar 12, 2017
Merged

Rollup of 5 pull requests #40455

merged 11 commits into from
Mar 12, 2017

Conversation

petrochenkov and others added 11 commits March 10, 2017 08:21
This brings back playpen integration for the books.
This adds the same logo and favicon as the rest of the std docs.
Give spans to individual path segments in AST

And use these spans in path resolution diagnostics.

The spans are spans of identifiers in segments, not whole segments. I'm not sure what spans are more useful in general, but identifier spans are a better fit for resolve errors.

HIR still doesn't have spans.

Fixes rust-lang#38927 (comment) rust-lang#38890 (comment)

r? @nrc @eddyb
Implement placement-in protocol for `HashMap`

CC rust-lang#30172

r? @nagisa
…richton

Update mdbook to new version

This brings back playpen integration for the books.

It'd be nice to land this before beta, but realistically that's probably not going to happen...
…hton

Add doc attributes to proc_macro crate

This adds the same logo and favicon as the rest of the std docs.
…excrichton

Improve wording in the -{W,A,F,D} options

This was so trivial that I'm wondering whether I'm missing something.

Fixes rust-lang#28708.
@frewsxcv
Copy link
Member Author

@bors r+ p=10

@bors
Copy link
Contributor

bors commented Mar 12, 2017

📌 Commit 3b002a8 has been approved by frewsxcv

@rust-highfive
Copy link
Collaborator

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @brson (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@bors
Copy link
Contributor

bors commented Mar 12, 2017

⌛ Testing commit 3b002a8 with merge 0066869...

bors added a commit that referenced this pull request Mar 12, 2017
Rollup of 5 pull requests

- Successful merges: #40369, #40390, #40426, #40449, #40453
- Failed merges:
@bors
Copy link
Contributor

bors commented Mar 12, 2017

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

@bors bors merged commit 3b002a8 into rust-lang:master Mar 12, 2017
@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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants