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.

Sign up for GitHub

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

Jump to bottom

Rollup of 4 pull requests #41459

Merged
merged 11 commits into from
Apr 22, 2017
Merged

Rollup of 4 pull requests #41459

merged 11 commits into from
Apr 22, 2017

Conversation

frewsxcv
Copy link
Member

GuillaumeGomez and others added 11 commits April 20, 2017 20:20
@GuillaumeGomez
Fix line display for hoedown
a654610
@abonander
Don't panic if an attribute macro fails to resolve at crate root
910532e 
Adds temporary regression test; this ideally should work as-is (rust-lang#41430)

Closes rust-lang#41211
@estebank
Add test for issue 33884
903bdfc 
Fix rust-lang#33884
@GuillaumeGomez
Add suggestion for & coercions
d360091
@GuillaumeGomez
Update tests
8fe3a9a
@GuillaumeGomez
Create a new method to run coercion inside probe
7d3284e
@GuillaumeGomez
Update ui test
7ce1eb7
@frewsxcv
Rollup merge of rust-lang#37658 - GuillaumeGomez:ref_suggestion, r=ni…
5da19f2 
…komatsakis,eddyb

Ref suggestion
@frewsxcv
Rollup merge of rust-lang#41405 - GuillaumeGomez:rustdoc-warning-impr…
aff40e2 
…ovement, r=steveklabnik

Fix line display for hoedown

Fixes rust-lang#41401.

r? @rust-lang/docs
@frewsxcv
Rollup merge of rust-lang#41432 - abonander:issue_41211, r=jseyfried
48a9d5f 
Don't panic if an attribute macro fails to resolve at crate root

Adds temporary regression test; this ideally should work as-is (rust-lang#41430)

Closes rust-lang#41211

r? @jseyfried
@frewsxcv
Rollup merge of rust-lang#41435 - estebank:issue-33884, r=nikomatsakis
df72158 
Add test for issue 33884

Fix rust-lang#33884.

r=nikomatsakis
@frewsxcv
Copy link
Member Author

@bors r+ p=10

@bors
Copy link
Contributor

bors commented Apr 22, 2017

📌 Commit df72158 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 @pnkfelix (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 Apr 22, 2017

⌛ Testing commit df72158 with merge ff13b7c...

bors added a commit that referenced this pull request Apr 22, 2017
@bors
Auto merge of #41459 - frewsxcv:rollup, r=frewsxcv
ff13b7c 
Rollup of 4 pull requests

- Successful merges: #37658, #41405, #41432, #41435
- Failed merges:
@bors
Copy link
Contributor

bors commented Apr 22, 2017

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

@bors bors merged commit df72158 into rust-lang:master Apr 22, 2017
@bors bors mentioned this pull request Apr 22, 2017
Merged
@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
Reviewers
No reviews
Assignees

@pnkfelix pnkfelix

Labels
rollup A PR which is a rollup
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@frewsxcv @bors @rust-highfive @pnkfelix @Centril @GuillaumeGomez @abonander @estebank