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.

Sign up for GitHub

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

Jump to bottom

Move the cache module out of util. #12311

Merged
merged 4 commits into from Jul 8, 2016
Merged

Move the cache module out of util. #12311

merged 4 commits into from Jul 8, 2016

Conversation

Ms2ger
Copy link
Contributor

@Ms2ger Ms2ger commented Jul 7, 2016 •
edited by larsbergstrom

This change is Reviewable

@highfive
Copy link

highfive commented Jul 7, 2016

Heads up! This PR modifies the following files:

  • @bholley: components/style/lib.rs, components/style/cache.rs, components/style/matching.rs

@highfive highfive added the S-awaiting-review There is new code that needs to be reviewed. label Jul 7, 2016
@nox
Copy link
Contributor

nox commented Jul 7, 2016

@bors-servo r+

@bors-servo
Copy link
Contributor

📌 Commit 6b2ae6e has been approved by nox

@highfive highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-awaiting-review There is new code that needs to be reviewed. labels Jul 7, 2016
@highfive highfive added S-awaiting-review There is new code that needs to be reviewed. and removed S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. labels Jul 7, 2016
@nox
Copy link
Contributor

nox commented Jul 7, 2016

@bors-servo r+

@bors-servo
Copy link
Contributor

📌 Commit 2e11b98 has been approved by nox

@highfive highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-awaiting-review There is new code that needs to be reviewed. labels Jul 7, 2016
@highfive highfive added S-awaiting-review There is new code that needs to be reviewed. and removed S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. labels Jul 7, 2016
@Ms2ger
Copy link
Contributor Author

Ms2ger commented Jul 7, 2016

@bors-servo r=nox

@bors-servo
Copy link
Contributor

📌 Commit 5fb1e60 has been approved by nox

@highfive highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-awaiting-review There is new code that needs to be reviewed. labels Jul 7, 2016
@bors-servo
Copy link
Contributor

⌛ Testing commit 5fb1e60 with merge 33020e6...

bors-servo pushed a commit that referenced this pull request Jul 7, 2016
Auto merge of #12311 - Ms2ger:cache, r=nox
33020e6 
Move the cache module out of util.

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

💔 Test failed - mac-rel-css

@highfive highfive added S-tests-failed The changes caused existing tests to fail. and removed S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. labels Jul 7, 2016
@larsbergstrom
Copy link
Contributor

@bors-servo retry

@bors-servo
Copy link
Contributor

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

@highfive highfive added the S-needs-rebase There are merge conflict errors. label Jul 7, 2016
@bors-servo
Copy link
Contributor

🔒 Merge conflict

@highfive highfive added S-awaiting-review There is new code that needs to be reviewed. and removed S-tests-failed The changes caused existing tests to fail. labels Jul 8, 2016
@Ms2ger
Copy link
Contributor Author

Ms2ger commented Jul 8, 2016

@bors-servo r=nox

@bors-servo
Copy link
Contributor

📌 Commit e7f9959 has been approved by nox

@highfive highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-awaiting-review There is new code that needs to be reviewed. S-needs-rebase There are merge conflict errors. labels Jul 8, 2016
bors-servo pushed a commit that referenced this pull request Jul 8, 2016
Auto merge of #12311 - Ms2ger:cache, r=nox
d475a27 
Move the cache module out of util.

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

⌛ Testing commit e7f9959 with merge d475a27...

@bors-servo
Copy link
Contributor

☀️ Test successful - android, arm32, arm64, linux-dev, linux-rel, mac-dev-unit, mac-rel-css, mac-rel-wpt, windows

@bors-servo bors-servo merged commit e7f9959 into servo:master Jul 8, 2016
@highfive highfive removed the S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. label Jul 8, 2016
@Ms2ger Ms2ger deleted the cache branch July 11, 2016 09:15
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
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@Ms2ger @highfive @nox @bors-servo @larsbergstrom