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

Fix PEP8 style issues in bootstrap code #45121

Merged
merged 3 commits into from
Oct 13, 2017
Merged

Fix PEP8 style issues in bootstrap code #45121

merged 3 commits into from
Oct 13, 2017

Conversation

johnthagen
Copy link
Contributor

This fixes PEP8 style issues (other than line-length) in the bootstrap Python code.

The most important fix is in the set function where the code was indented with 6 spaces instead of 4.

@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 @aturon (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.

@carols10cents carols10cents added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 9, 2017
@carols10cents
Copy link
Member

Actually, @aturon wasn't available last week and is on PTO this week, so let's try....

r? @alexcrichton

@rust-highfive rust-highfive assigned alexcrichton and unassigned aturon Oct 9, 2017
@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented Oct 9, 2017

📌 Commit a263a78 has been approved by alexcrichton

@alexcrichton
Copy link
Member

@bors: rollup

@bors
Copy link
Contributor

bors commented Oct 10, 2017

☔ The latest upstream changes (presumably #45141) made this pull request unmergeable. Please resolve the merge conflicts.

@johnthagen
Copy link
Contributor Author

@alexcrichton I'll work on resolving these conflicts later today.

@steveklabnik steveklabnik mentioned this pull request Oct 11, 2017
Merged
@johnthagen
Copy link
Contributor Author

Conflicts resolved.

bors added a commit that referenced this pull request Oct 11, 2017
@bors
Auto merge of #45192 - steveklabnik:rollup, r=steveklabnik
c0d40a1 
Rollup of 5 pull requests

- Successful merges: #45071, #45139, #45148, #45171, #45180
- Failed merges: #45121
@alexcrichton
Copy link
Member

@bors: r+ rollup

@bors
Copy link
Contributor

bors commented Oct 11, 2017

📌 Commit 3cb5294 has been approved by alexcrichton

@kennytm kennytm mentioned this pull request Oct 11, 2017
Closed
kennytm added a commit to kennytm/rust that referenced this pull request Oct 11, 2017
@kennytm
Rollup merge of rust-lang#45121 - johnthagen:pep8-bootstrap, r=alexcr…
fcded52 
…ichton

Fix PEP8 style issues in bootstrap code

This fixes PEP8 style issues (other than line-length) in the bootstrap Python code.

The most important fix is in the `set` function where the code was indented with 6 spaces instead of 4.
@kennytm kennytm mentioned this pull request Oct 11, 2017
Closed
kennytm added a commit to kennytm/rust that referenced this pull request Oct 12, 2017
@kennytm
Rollup merge of rust-lang#45121 - johnthagen:pep8-bootstrap, r=alexcr…
79ed52a 
…ichton

Fix PEP8 style issues in bootstrap code

This fixes PEP8 style issues (other than line-length) in the bootstrap Python code.

The most important fix is in the `set` function where the code was indented with 6 spaces instead of 4.
@kennytm kennytm mentioned this pull request Oct 12, 2017
Merged
kennytm added a commit to kennytm/rust that referenced this pull request Oct 12, 2017
@kennytm
Rollup merge of rust-lang#45121 - johnthagen:pep8-bootstrap, r=alexcr…
6944768 
…ichton

Fix PEP8 style issues in bootstrap code

This fixes PEP8 style issues (other than line-length) in the bootstrap Python code.

The most important fix is in the `set` function where the code was indented with 6 spaces instead of 4.
bors added a commit that referenced this pull request Oct 12, 2017
@bors
Auto merge of #45233 - kennytm:rollup, r=<try>
6f8b325 
[WIP] Rollup of 10 pull requests

- Successful merges: #44989, #45005, #45049, #45105, #45121, #45163, #45166, #45172, #45190, #45231
- Failed merges: #45138
bors added a commit that referenced this pull request Oct 12, 2017
@bors
Auto merge of #45233 - kennytm:rollup, r=kennytm
64ee7d1 
Rollup of 9 pull requests

- Successful merges: #44989, #45005, #45049, #45105, #45121, #45166, #45172, #45190, #45231
- Failed merges: #45138
@bors bors merged commit 3cb5294 into rust-lang:master Oct 13, 2017
@johnthagen johnthagen deleted the pep8-bootstrap branch October 13, 2017 10:47
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
S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@johnthagen @rust-highfive @carols10cents @alexcrichton @bors @aturon