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

flow::Flow should follow *_mut naming conventions #7178

Merged
merged 1 commit into from Aug 18, 2015
Merged

flow::Flow should follow *_mut naming conventions #7178

merged 1 commit into from Aug 18, 2015

Conversation

@frewsxcv
Copy link
Member

frewsxcv commented Aug 12, 2015

Fixes #7148

Review on Reviewable
@highfive
Copy link

highfive commented Aug 12, 2015

warning Warning warning

  • These commits modify layout code, but no reftests are modified. Please consider adding a reftest!
@frewsxcv frewsxcv force-pushed the frewsxcv:flow-api-mut branch from 094df86 to 960e75c Aug 14, 2015
@bors-servo
Copy link
Contributor

bors-servo commented Aug 15, 2015

☔ The latest upstream changes (presumably #7006) made this pull request unmergeable. Please resolve the merge conflicts.
@frewsxcv frewsxcv force-pushed the frewsxcv:flow-api-mut branch from 960e75c to 3d2f195 Aug 15, 2015
@frewsxcv
Copy link
Member Author

frewsxcv commented Aug 15, 2015

Rebased
@frewsxcv frewsxcv force-pushed the frewsxcv:flow-api-mut branch from 3d2f195 to e135e8d Aug 16, 2015
@bors-servo
Copy link
Contributor

bors-servo commented Aug 17, 2015

☔ The latest upstream changes (presumably #7222) made this pull request unmergeable. Please resolve the merge conflicts.
@frewsxcv frewsxcv force-pushed the frewsxcv:flow-api-mut branch from e135e8d to 6b5e847 Aug 18, 2015
@frewsxcv
Copy link
Member Author

frewsxcv commented Aug 18, 2015

Rebased
@nox nox removed the S-needs-rebase label Aug 18, 2015
@nox
Copy link
Member

nox commented Aug 18, 2015

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

bors-servo commented Aug 18, 2015

📌 Commit 6b5e847 has been approved by nox
@nox nox self-assigned this Aug 18, 2015
@bors-servo
Copy link
Contributor

bors-servo commented Aug 18, 2015

🔒 Merge conflict
@nox nox added the S-needs-rebase label Aug 18, 2015
@frewsxcv frewsxcv force-pushed the frewsxcv:flow-api-mut branch from 6b5e847 to 52aff0e Aug 18, 2015
@frewsxcv
flow::Flow should follow *_mut naming conventions
Loading status checks…
6aaada6 
Fixes #7148
@frewsxcv frewsxcv force-pushed the frewsxcv:flow-api-mut branch from 52aff0e to 6aaada6 Aug 18, 2015
@frewsxcv
Copy link
Member Author

frewsxcv commented Aug 18, 2015

Rebased
@nox
Copy link
Member

nox commented Aug 18, 2015

@bors-servo r+ p=1
@bors-servo
Copy link
Contributor

bors-servo commented Aug 18, 2015

📌 Commit 6aaada6 has been approved by nox
@bors-servo
Copy link
Contributor

bors-servo commented Aug 18, 2015

⌛ Testing commit 6aaada6 with merge 014608f...
bors-servo pushed a commit that referenced this pull request Aug 18, 2015
bors-servo
Auto merge of #7178 - frewsxcv:flow-api-mut, r=nox
Loading status checks…
014608f 
flow::Flow should follow *_mut naming conventions

Fixes #7148

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

bors-servo commented Aug 18, 2015

☀️ Test successful - android, gonk, linux1, linux2, mac1, mac2, mac3
@bors-servo bors-servo merged commit 6aaada6 into servo:master Aug 18, 2015
2 checks passed
2 checks passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@frewsxcv frewsxcv deleted the frewsxcv:flow-api-mut branch Aug 18, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@nox nox

Labels
S-awaiting-merge
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

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