Skip to content

Rollup of 4 pull requests #29187

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
Merged
merged 8 commits into from
Oct 20, 2015
Merged

Rollup of 4 pull requests #29187

merged 8 commits into from
Oct 20, 2015

Conversation

steveklabnik
Copy link
Member

arcnmx and others added 8 commits October 19, 2015 00:54
@arcnmx
Add missing #[test] attribute to test
9c3a062
@solson
Fix minor syntax error in example.
8222970
@durka
fix markdown in nomicon/dropck
f1e06db
@huonw
Point core::ptr::Shared to tracking issue rust-lang#27730.
94e9a07
@steveklabnik
Rollup merge of rust-lang#29158 - arcnmx:process-test, r=alexcrichton
b314f84 
This test was mysteriously messed with as part of rust-lang#28500

r? @alexcrichton
@steveklabnik
Rollup merge of rust-lang#29162 - tsion:fix-nomicon-typo, r=alexcrichton
53c4b4d 
r? @steveklabnik
@steveklabnik
Rollup merge of rust-lang#29175 - durka:patch-8, r=Gankro
2fb3b85 
Yay, markdown isn't standardized and rustbook's parser has subtle incompatibilities with Github's! So in the Github preview you don't see that this list fails to separate from the previous paragraph. I think this should fix it, but I didn't check.
@steveklabnik
Rollup merge of rust-lang#29176 - huonw:shared-tracking, r=Gankro
e058318
@steveklabnik
Copy link
Member Author

@bors: r+ p=1

@bors
Copy link
Collaborator

bors commented Oct 20, 2015

📌 Commit e058318 has been approved by steveklabnik

@rust-highfive
Copy link
Contributor

r? @alexcrichton

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

bors added a commit that referenced this pull request Oct 20, 2015
@bors
Auto merge of #29187 - steveklabnik:rollup, r=steveklabnik
5e9f305 
- Successful merges: #29158, #29162, #29175, #29176
- Failed merges:
@bors
Copy link
Collaborator

bors commented Oct 20, 2015

⌛ Testing commit e058318 with merge 5e9f305...

@bors
Copy link
Collaborator

bors commented Oct 20, 2015

☀️ Test successful - auto-linux-32-nopt-t, auto-linux-32-opt, auto-linux-64-nopt-t, auto-linux-64-opt, auto-linux-64-x-android-t, auto-mac-32-opt, auto-mac-64-nopt-t, auto-mac-64-opt, auto-win-gnu-32-nopt-t, auto-win-gnu-32-opt, auto-win-gnu-64-nopt-t, auto-win-gnu-64-opt, auto-win-msvc-32-opt, auto-win-msvc-64-opt

@bors bors merged commit e058318 into rust-lang:master Oct 20, 2015
@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

@alexcrichton alexcrichton

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

Successfully merging this pull request may close these issues.
9 participants
@steveklabnik @bors @rust-highfive @alexcrichton @Centril @arcnmx @solson @durka @huonw