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.

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

Add initial tidy support #794

Merged
merged 1 commit into from Jan 30, 2017
Merged

Add initial tidy support #794

merged 1 commit into from Jan 30, 2017

Conversation

@mrobinson
Copy link
Member

mrobinson commented Jan 27, 2017

Currently many directories are ignored, but we can add them as we tidy
things up


This change is Reviewable

@mrobinson mrobinson force-pushed the mrobinson:tidy branch from c7a9ac2 to b670e74 Jan 27, 2017
@kvark
kvark approved these changes Jan 27, 2017
Copy link
Member

kvark left a comment

Sweeeet

# gradually.
directories = [
# Generated and upstream code combined with our own. Could use cleanup
"./target",

This comment has been minimized.

@kvark

kvark Jan 27, 2017

Member

why do we need to tidy up the generated code?

This comment has been minimized.

@mrobinson

mrobinson Jan 29, 2017

Author Member

The comment is indeed a little unclear, but this is a list of directories excluded from the tidy. We will gradually remove entries.

@glennw
Copy link
Member

glennw commented Jan 30, 2017

@bors-servo
Copy link
Contributor

bors-servo commented Jan 30, 2017

📌 Commit b670e74 has been approved by glennw

@bors-servo
Copy link
Contributor

bors-servo commented Jan 30, 2017

🔒 Merge conflict

@bors-servo
Copy link
Contributor

bors-servo commented Jan 30, 2017

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

@glennw
Copy link
Member

glennw commented Jan 30, 2017

@mrobinson Needs a rebase. Also, the removal of replay/ dir has landed now - so we can remove that from the config file.

Currently many directories are ignored, but we can add them as we tidy
things up
@mrobinson mrobinson force-pushed the mrobinson:tidy branch from b670e74 to 4c389dc Jan 30, 2017
@mrobinson
Copy link
Member Author

mrobinson commented Jan 30, 2017

@glennw Thanks for the review.

@mrobinson
Copy link
Member Author

mrobinson commented Jan 30, 2017

@bors-servo r=glennw

@bors-servo
Copy link
Contributor

bors-servo commented Jan 30, 2017

📌 Commit 4c389dc has been approved by glennw

@bors-servo
Copy link
Contributor

bors-servo commented Jan 30, 2017

Testing commit 4c389dc with merge 1501c4c...

bors-servo added a commit that referenced this pull request Jan 30, 2017
Add initial tidy support

Currently many directories are ignored, but we can add them as we tidy
things up

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/webrender/794)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Jan 30, 2017

☀️ Test successful - status-travis

@bors-servo bors-servo merged commit 4c389dc into servo:master Jan 30, 2017
2 of 3 checks passed
2 of 3 checks passed
continuous-integration/travis-ci/pr The Travis CI build is in progress
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
homu Test successful
Details
@mrobinson mrobinson deleted the mrobinson:tidy branch Feb 6, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants
You can’t perform that action at this time.