Skip to content

/ servo

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

tidy check for vim and emacs modelines #10786

Merged
merged 2 commits into from Apr 23, 2016
Merged

tidy check for vim and emacs modelines #10786

merged 2 commits into from Apr 23, 2016
+22 −172

Conversation

@zwn
Copy link
Contributor

zwn commented Apr 21, 2016

See #10719.

It skips *.webidl files for now since I am not sure where they come from and if they should be edited in tree or not.

This change is Reviewable
@highfive
Copy link

highfive commented Apr 21, 2016

Thanks for the pull request, and welcome! The Servo team is excited to review your changes, and you should hear from @mbrubeck (or someone else) soon.
@highfive
Copy link

highfive commented Apr 21, 2016

Heads up! This PR modifies the following files:

  • @wafflespeanut: python/tidy/servo_tidy_tests/test_tidy.py, python/tidy/servo_tidy_tests/modeline.txt, python/tidy/servo_tidy/tidy.py
@Manishearth
Copy link
Member

Manishearth commented Apr 21, 2016

Editing webidl in-tree for stuff like this is fine.
@Manishearth
Copy link
Member

Manishearth commented Apr 21, 2016

r=me with the webidl check removed
@wafflespeanut
Copy link
Member

wafflespeanut commented Apr 21, 2016

Careful. @edunham had already done that in #10723
@Manishearth
Copy link
Member

Manishearth commented Apr 21, 2016

Yeah, but that didn't add a tidy check
@wafflespeanut
Copy link
Member

wafflespeanut commented Apr 21, 2016

Oh, right. I misunderstood
zwn added 2 commits Apr 21, 2016
@zwn
Remove emacs modelines.
4556228
@zwn
tidy check for vim and emacs modelines.
Loading status checks…
b6b8ac6 
See #10719.
@zwn
Copy link
Contributor Author

zwn commented Apr 21, 2016

I've added the modelines removal commit before the tidy check addition.
@Manishearth
Copy link
Member

Manishearth commented Apr 21, 2016

Could you keep attribution for that commit? Thanks.

(Or, we can just land that one first)
@zwn
Copy link
Contributor Author

zwn commented Apr 21, 2016

Oh, I see the edits of wpt were taken out of that PR so it can be landed. I didn't notice.
So feel free to land #10723 first. I can always delete it from here.
@wafflespeanut
Copy link
Member

wafflespeanut commented Apr 22, 2016

#10723 has landed
@Manishearth
Copy link
Member

Manishearth commented Apr 22, 2016

@bors-servo r+
@bors-servo
Copy link
Contributor

bors-servo commented Apr 22, 2016

📌 Commit b6b8ac6 has been approved by Manishearth
@bors-servo
Copy link
Contributor

bors-servo commented Apr 23, 2016

⌛ Testing commit b6b8ac6 with merge 558bef7...
bors-servo added a commit that referenced this pull request Apr 23, 2016
@bors-servo
Auto merge of #10786 - zwn:tidy-modelines, r=Manishearth
Loading status checks…
558bef7 
tidy check for vim and emacs modelines

See #10719.

It skips *.webidl files for now since I am not sure where they come from and if they should be edited in tree or not.

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

bors-servo commented Apr 23, 2016

💔 Test failed - linux-rel
@highfive
Copy link

highfive commented Apr 23, 2016 

  ▶ FAIL [expected PASS] /_mozilla/css/incremental_trailing_whitespace_a.html
  └   → /_mozilla/css/incremental_trailing_whitespace_a.html da54041086f2975f8e3c776d2283ad6609e6862a
/_mozilla/css/incremental_trailing_whitespace_ref.html f5d0147c8bddbdc772a7e5e86c7c9e433fcd486b
Testing da54041086f2975f8e3c776d2283ad6609e6862a == f5d0147c8bddbdc772a7e5e86c7c9e433fcd486b
@jdm
Copy link
Member

jdm commented Apr 23, 2016

@bors-servo: retry
#10473
@bors-servo
Copy link
Contributor

bors-servo commented Apr 23, 2016

⌛ Testing commit b6b8ac6 with merge 04f8ae5...
bors-servo added a commit that referenced this pull request Apr 23, 2016
@bors-servo
Auto merge of #10786 - zwn:tidy-modelines, r=Manishearth
Loading status checks…
04f8ae5 
tidy check for vim and emacs modelines

See #10719.

It skips *.webidl files for now since I am not sure where they come from and if they should be edited in tree or not.

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

bors-servo commented Apr 23, 2016

☀️ Test successful - android, arm32, arm64, linux-dev, linux-rel, mac-dev-unit, mac-rel-css, mac-rel-wpt
@bors-servo bors-servo merged commit b6b8ac6 into servo:master Apr 23, 2016
2 of 3 checks passed
2 of 3 checks passed
continuous-integration/appveyor/pr AppVeyor build failed
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@bors-servo bors-servo mentioned this pull request Apr 23, 2016
Closed
@wafflespeanut wafflespeanut mentioned this pull request May 10, 2016
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@Manishearth Manishearth

Labels
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

6 participants
@zwn @highfive @Manishearth @wafflespeanut @bors-servo @jdm
You can’t perform that action at this time.