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

Papercut #40312

Merged
merged 1 commit into from
Mar 21, 2017
Merged

Papercut #40312

merged 1 commit into from
Mar 21, 2017

Conversation

jdhorwitz
Copy link
Contributor

@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 @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
Copy link
Member

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 jdhorwitz force-pushed the papercut branch 2 times, most recently from 65a02ff to d506b90 Compare March 8, 2017 03:58
steveklabnik
steveklabnik suggested changes Mar 8, 2017
View reviewed changes
src/libstd/process.rs Outdated
@@ -343,6 +359,23 @@ impl Command {

/// Add an argument to pass to the program.
///
/// Only one argument can be passed per use.
/// So instead of:
Copy link
Member

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

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Good catch, fixed!

src/libstd/process.rs Outdated
/// ```
/// .arg("-C /path/to/repo")
/// ```
/// usage would be:
Copy link
Member

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

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed!

@jdhorwitz jdhorwitz force-pushed the papercut branch 3 times, most recently from 0e163a1 to db021e5 Compare March 8, 2017 04:17
@jdhorwitz
Copy link
Contributor Author

r? @steveklabnik

@steveklabnik
Copy link
Member

@bors: r+ rollup

@bors
Copy link
Contributor

bors commented Mar 8, 2017

📌 Commit db021e5 has been approved by steveklabnik

@steveklabnik
Copy link
Member

@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
Copy link
Contributor Author

r? @steveklabnik

@jdhorwitz
Copy link
Contributor Author

Fixed!, Thanks @steveklabnik

@steveklabnik
Copy link
Member

Looks great! Thanks again 😄

@bors: r+ rollup

@bors
Copy link
Contributor

bors commented Mar 8, 2017

📌 Commit c51a39d has been approved by steveklabnik

@bors
Copy link
Contributor

bors commented Mar 9, 2017

🔒 Merge conflict

@arielb1
Copy link
Contributor

arielb1 commented Mar 9, 2017

@bors retry

@bors
Copy link
Contributor

bors commented Mar 9, 2017

🔒 Merge conflict

@alexcrichton
Copy link
Member

@bors: retry

frewsxcv added a commit to frewsxcv/rust that referenced this pull request Mar 9, 2017
@frewsxcv
Rollup merge of rust-lang#40312 - jdhorwitz:papercut, r=steveklabnik
c134617 
Papercut

r? @steveklabnik
@frewsxcv frewsxcv 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 of rust-lang#40312 - jdhorwitz:papercut, r=steveklabnik
02cc699 
Papercut

r? @steveklabnik
@frewsxcv frewsxcv mentioned this pull request Mar 9, 2017
Closed
arielb1 pushed a commit to arielb1/rust that referenced this pull request Mar 9, 2017
Rollup merge of rust-lang#40312 - jdhorwitz:papercut, r=steveklabnik
cb1d4c9 
Papercut

r? @steveklabnik
@arielb1 arielb1 mentioned this pull request Mar 9, 2017
Closed
@steveklabnik
Copy link
Member

@bors: r+ rollup

@bors
Copy link
Contributor

bors commented Mar 20, 2017

📌 Commit e2b4824 has been approved by steveklabnik

@frewsxcv frewsxcv 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 of rust-lang#40312 - jdhorwitz:papercut, r=steveklabnik
42cfdc1 
Papercut

r? @steveklabnik
@frewsxcv frewsxcv 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:master Mar 21, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@steveklabnik steveklabnik steveklabnik approved these changes

Assignees

@steveklabnik steveklabnik

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