Skip to content

Fix PEP8 style issues in bootstrap code - #45121

Merged
bors merged 3 commits into
rust-lang:masterfrom
johnthagen:pep8-bootstrap
Oct 13, 2017
Merged

Fix PEP8 style issues in bootstrap code#45121
bors merged 3 commits into
rust-lang:masterfrom
johnthagen:pep8-bootstrap

Conversation

@johnthagen

@johnthagenjohnthagen commented Oct 9, 2017

Copy link
Copy Markdown
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

rust-highfive commented Oct 9, 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 @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.

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

carols10cents commented Oct 9, 2017

Copy link
Copy Markdown
Member

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

r? @alexcrichton

@alexcrichton

alexcrichton commented Oct 9, 2017

Copy link
Copy Markdown
Member

@bors: r+

@bors

bors commented Oct 9, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit a263a78 has been approved by alexcrichton

@alexcrichton

alexcrichton commented Oct 9, 2017

Copy link
Copy Markdown
Member

@bors: rollup

@bors

bors commented Oct 10, 2017

Copy link
Copy Markdown
Collaborator

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

@johnthagen

johnthagen commented Oct 10, 2017

Copy link
Copy Markdown
ContributorAuthor

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

@steveklabniksteveklabnik mentioned this pull request Oct 11, 2017
Merged
@johnthagen

johnthagen commented Oct 11, 2017

Copy link
Copy Markdown
ContributorAuthor

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

alexcrichton commented Oct 11, 2017

Copy link
Copy Markdown
Member

@bors: r+ rollup

@bors

bors commented Oct 11, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit 3cb5294 has been approved by alexcrichton

@kennytmkennytm 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 ofrust-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.
@kennytmkennytm 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 ofrust-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.
@kennytmkennytm 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 ofrust-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:masterOct 13, 2017
@johnthagen
johnthagen deleted the pep8-bootstrap branch October 13, 2017 10:47
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@alexcrichtonalexcrichton

Labels

S-waiting-on-reviewStatus: 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