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

Fix unrooted_must_root lint to handle arguments/return types properly #8030

Merged
merged 2 commits into from Oct 15, 2015
Merged

Fix unrooted_must_root lint to handle arguments/return types properly #8030

merged 2 commits into from Oct 15, 2015
+44 −11

Conversation

@Manishearth
Copy link
Member

Manishearth commented Oct 15, 2015

r? @jdm

Review on Reviewable
@highfive
Copy link

highfive commented Oct 15, 2015

warning Warning warning

  • These commits modify unsafe code. Please review it carefully!
@nox
Copy link
Member

nox commented Oct 15, 2015 

./components/plugins/utils.rs:12: use statement is not in alphabetical order
    expected: syntax::codemap::{ExpnFormat, Span}
    found: syntax::ptr::P
./components/plugins/utils.rs:13: use statement is not in alphabetical order
    expected: syntax::ptr::P
    found: syntax::codemap::{ExpnFormat, Span}
@Manishearth Manishearth force-pushed the Manishearth:fix-lint-fn branch from 894c242 to c077a86 Oct 15, 2015
@jdm jdm removed the S-fails-tidy label Oct 15, 2015
@frewsxcv
Copy link
Member

frewsxcv commented Oct 15, 2015

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

bors-servo commented Oct 15, 2015

📌 Commit c077a86 has been approved by frewsxcv
@bors-servo
Copy link
Contributor

bors-servo commented Oct 15, 2015

⌛ Testing commit c077a86 with merge 7799358...
bors-servo pushed a commit that referenced this pull request Oct 15, 2015
bors-servo
Auto merge of #8030 - Manishearth:fix-lint-fn, r=frewsxcv
7799358 
Fix unrooted_must_root lint to handle arguments/return types properly

r? @jdm

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8030)
<!-- Reviewable:end -->
@frewsxcv frewsxcv closed this Oct 15, 2015
@frewsxcv frewsxcv reopened this Oct 15, 2015
@frewsxcv
Copy link
Member

frewsxcv commented Oct 15, 2015

Reopened because the workers were stuck
@bors-servo
Copy link
Contributor

bors-servo commented Oct 15, 2015

☔ The latest upstream changes (presumably #8020) made this pull request unmergeable. Please resolve the merge conflicts.
Manishearth added 2 commits Oct 15, 2015
@Manishearth
Fix unrooted_must_root lint to handle arguments/return types properly (…
7022bed 
…fixes #8022)
@Manishearth
Update script to work with lint changes
Loading status checks…
8819f0d
@Manishearth Manishearth force-pushed the Manishearth:fix-lint-fn branch from c077a86 to 8819f0d Oct 15, 2015
@Manishearth
Copy link
Member Author

Manishearth commented Oct 15, 2015

@bors-servo r=frewsxcv
@bors-servo
Copy link
Contributor

bors-servo commented Oct 15, 2015

📌 Commit 8819f0d has been approved by frewsxcv
@bors-servo
Copy link
Contributor

bors-servo commented Oct 15, 2015

⌛ Testing commit 8819f0d with merge 9d5f09e...
bors-servo pushed a commit that referenced this pull request Oct 15, 2015
bors-servo
Auto merge of #8030 - Manishearth:fix-lint-fn, r=frewsxcv
Loading status checks…
9d5f09e 
Fix unrooted_must_root lint to handle arguments/return types properly

r? @jdm

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8030)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Oct 15, 2015

☀️ Test successful - android, gonk, linux-dev, linux-rel, mac-dev-ref-unit, mac-rel-css, mac-rel-wpt
@bors-servo bors-servo merged commit 8819f0d into servo:master Oct 15, 2015
2 checks passed
2 checks passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@Manishearth Manishearth deleted the Manishearth:fix-lint-fn branch Oct 15, 2015
@jdm jdm mentioned this pull request Mar 29, 2018
Closed
0 of 3 tasks complete
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
A-content/dom I-safety S-awaiting-merge
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

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