Skip to content

Papercut - #40312

Merged
bors merged 1 commit into
rust-lang:masterfrom
jdhorwitz:papercut
Mar 21, 2017
Merged

Papercut#40312
bors merged 1 commit into
rust-lang:masterfrom
jdhorwitz:papercut

Conversation

@jdhorwitz

@jdhorwitzjdhorwitz commented Mar 7, 2017

Copy link
Copy Markdown
Contributor

@rust-highfive

rust-highfive commented Mar 7, 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 @steveklabnik (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.

@steveklabnik

steveklabnik commented Mar 7, 2017

Copy link
Copy Markdown
Contributor

Hey @jdhorwitz ! This looks like a start, but you have the commit from your other PR in here as well. Ping me on IRC if you need help sorting that out!

Also, rustfmt has betrayed you again 😄

@jdhorwitz
jdhorwitzforce-pushed the papercut branch 2 times, most recently from 65a02ff to d506b90CompareMarch 8, 2017 03:58
steveklabnik
steveklabnik suggested changes Mar 8, 2017
View reviewed changes
Comment threadsrc/libstd/process.rs Outdated

@steveklabniksteveklabnikMar 8, 2017

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this shouldn't be on a newline, just put it after the previous sentence

@jdhorwitzjdhorwitzMar 8, 2017

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch, fixed!

Comment threadsrc/libstd/process.rs Outdated

@steveklabniksteveklabnikMar 8, 2017

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

an extra /// above this would be good, so there's space below just like the space above

@jdhorwitzjdhorwitzMar 8, 2017

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed!

@jdhorwitz
jdhorwitzforce-pushed the papercut branch 3 times, most recently from 0e163a1 to db021e5CompareMarch 8, 2017 04:17
@jdhorwitz

jdhorwitz commented Mar 8, 2017

Copy link
Copy Markdown
ContributorAuthor

r? @steveklabnik

@steveklabnik

steveklabnik commented Mar 8, 2017

Copy link
Copy Markdown
Contributor

@bors: r+ rollup

@bors

bors commented Mar 8, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit db021e5 has been approved by steveklabnik

@steveklabnik

steveklabnik commented Mar 8, 2017

Copy link
Copy Markdown
Contributor

@bors: r-

whoops, travis failure is legit for once.

@jdhorwitz you need to use

```ignore

on those examples, as they don't compile on their own

@jdhorwitz

jdhorwitz commented Mar 8, 2017

Copy link
Copy Markdown
ContributorAuthor

r? @steveklabnik

@jdhorwitz

jdhorwitz commented Mar 8, 2017

Copy link
Copy Markdown
ContributorAuthor

Fixed!, Thanks @steveklabnik

@steveklabnik

steveklabnik commented Mar 8, 2017

Copy link
Copy Markdown
Contributor

Looks great! Thanks again 😄

@bors: r+ rollup

@bors

bors commented Mar 8, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit c51a39d has been approved by steveklabnik

@bors

bors commented Mar 9, 2017

Copy link
Copy Markdown
Collaborator

🔒 Merge conflict

@arielb1

arielb1 commented Mar 9, 2017

Copy link
Copy Markdown
Contributor

@bors retry

@bors

bors commented Mar 9, 2017

Copy link
Copy Markdown
Collaborator

🔒 Merge conflict

@alexcrichton

alexcrichton commented Mar 9, 2017

Copy link
Copy Markdown
Member

@bors: retry

frewsxcv added a commit to frewsxcv/rust that referenced this pull request Mar 9, 2017
@frewsxcv
Rollup merge ofrust-lang#40312- jdhorwitz:papercut, r=steveklabnik
c134617
Papercut
r? @steveklabnik
@frewsxcvfrewsxcv mentioned this pull request Mar 9, 2017
Closed
frewsxcv added a commit to frewsxcv/rust that referenced this pull request Mar 9, 2017
@frewsxcv
Rollup merge ofrust-lang#40312- jdhorwitz:papercut, r=steveklabnik
02cc699
Papercut
r? @steveklabnik
@frewsxcvfrewsxcv mentioned this pull request Mar 9, 2017
Closed
arielb1 pushed a commit to arielb1/rust that referenced this pull request Mar 9, 2017
Ariel Ben-Yehuda
Rollup merge ofrust-lang#40312- jdhorwitz:papercut, r=steveklabnik
cb1d4c9
Papercut
r? @steveklabnik
@arielb1arielb1 mentioned this pull request Mar 9, 2017
Closed
@steveklabnik

steveklabnik commented Mar 20, 2017

Copy link
Copy Markdown
Contributor

@bors: r+ rollup

@bors

bors commented Mar 20, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit e2b4824 has been approved by steveklabnik

@frewsxcvfrewsxcv mentioned this pull request Mar 20, 2017
Closed
frewsxcv added a commit to frewsxcv/rust that referenced this pull request Mar 21, 2017
@frewsxcv
Rollup merge ofrust-lang#40312- jdhorwitz:papercut, r=steveklabnik
42cfdc1
Papercut
r? @steveklabnik
@frewsxcvfrewsxcv mentioned this pull request Mar 21, 2017
Merged
bors added a commit that referenced this pull request Mar 21, 2017
@bors
Auto merge of#40693- frewsxcv:rollup, r=frewsxcv
58c701f
Rollup of 10 pull requests
- Successful merges: #40229, #40312, #40332, #40502, #40556, #40576, #40667, #40671, #40681, #40685
- Failed merges:
@bors
bors merged commit e2b4824 into rust-lang:masterMar 21, 2017
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer
@steveklabniksteveklabniksteveklabnik approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

@steveklabniksteveklabnik

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@jdhorwitz@rust-highfive@steveklabnik@bors@arielb1@alexcrichton