Skip to content

Rollup of 5 pull requests - #40455

Merged
bors merged 11 commits into
rust-lang:masterfrom
frewsxcv:rollup
Mar 12, 2017
Merged

Rollup of 5 pull requests#40455
bors merged 11 commits into
rust-lang:masterfrom
frewsxcv:rollup

Conversation

@frewsxcv

@frewsxcvfrewsxcv commented Mar 12, 2017

Copy link
Copy Markdown
Contributor

petrochenkovand others added 11 commits March 10, 2017 08:21
@petrochenkov@alexcrichton
Give spans to individual path segments in AST
32575a0
@petrochenkov@alexcrichton
resolve: Use path segment spans in smart_resolve_path
ffdcf74
Charlie Fan@F001
Implement placement-in protocol for HashMap
584c798
@steveklabnik
Update mdbook to new version
80d3f3a
This brings back playpen integration for the books.
@ollie27
Add doc attributes to proc_macro crate
74ccbec
This adds the same logo and favicon as the rest of the std docs.
@tbg
Improve wording in the -{W,A,F,D} options
7bfc64a
Fixesrust-lang#28708.
@frewsxcv
Rollup merge ofrust-lang#40369- petrochenkov:segspan, r=eddyb
8d1c570
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.
Fixesrust-lang#38927 (comment)rust-lang#38890 (comment)
r? @nrc@eddyb
@frewsxcv
Rollup merge ofrust-lang#40390- F001:placementHashMap, r=nagisa
38e4853
Implement placement-in protocol for `HashMap`
CC rust-lang#30172
r? @nagisa
@frewsxcv
Rollup merge ofrust-lang#40426- steveklabnik:update-mdbook, r=alexc…
36632f3
…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...
@frewsxcv
Rollup merge ofrust-lang#40449- ollie27:docs_proc_macro, r=alexcric…
c085be5
…hton
Add doc attributes to proc_macro crate
This adds the same logo and favicon as the rest of the std docs.
@frewsxcv
Rollup merge ofrust-lang#40453- tschottdorf:lint-deny-wording, r=al…
3b002a8
…excrichton
Improve wording in the -{W,A,F,D} options
This was so trivial that I'm wondering whether I'm missing something.
Fixesrust-lang#28708.
@frewsxcv

frewsxcv commented Mar 12, 2017

Copy link
Copy Markdown
ContributorAuthor

@bors r+ p=10

@bors

bors commented Mar 12, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit 3b002a8 has been approved by frewsxcv

@rust-highfive

rust-highfive commented Mar 12, 2017

Copy link
Copy Markdown
Contributor

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

bors commented Mar 12, 2017

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 3b002a8 with merge 0066869...

bors added a commit that referenced this pull request Mar 12, 2017
@bors
Auto merge of#40455- frewsxcv:rollup, r=frewsxcv
0066869
Rollup of 5 pull requests
- Successful merges: #40369, #40390, #40426, #40449, #40453
- Failed merges:
@bors

bors commented Mar 12, 2017

Copy link
Copy Markdown
Collaborator

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

@bors
bors merged commit 3b002a8 into rust-lang:masterMar 12, 2017
@borsbors mentioned this pull request Mar 12, 2017
Merged
@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

Reviewers

No reviews

Assignees

No one assigned

Labels

rollupA PR which is a rollup

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

9 participants

@frewsxcv@bors@rust-highfive@brson@Centril@petrochenkov@steveklabnik@ollie27@tbg