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

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
+16 −81

Conversation

@Ms2ger
Copy link
Contributor

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
@nox
Copy link
Member

nox commented Jul 7, 2016

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

bors-servo commented Jul 7, 2016

📌 Commit 6b2ae6e has been approved by nox
@Ms2ger Ms2ger force-pushed the Ms2ger:cache branch from 6b2ae6e to 2e11b98 Jul 7, 2016
@nox
Copy link
Member

nox commented Jul 7, 2016

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

bors-servo commented Jul 7, 2016

📌 Commit 2e11b98 has been approved by nox
@Ms2ger Ms2ger force-pushed the Ms2ger:cache branch from 2e11b98 to 5fb1e60 Jul 7, 2016
@Ms2ger
Copy link
Contributor Author

Ms2ger commented Jul 7, 2016

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

bors-servo commented Jul 7, 2016

📌 Commit 5fb1e60 has been approved by nox
@bors-servo
Copy link
Contributor

bors-servo commented Jul 7, 2016

⌛ Testing commit 5fb1e60 with merge 33020e6...
bors-servo added a commit that referenced this pull request Jul 7, 2016
@bors-servo
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

bors-servo commented Jul 7, 2016

💔 Test failed - mac-rel-css
@larsbergstrom
Copy link
Contributor

larsbergstrom commented Jul 7, 2016

@bors-servo retry
@bors-servo
Copy link
Contributor

bors-servo commented Jul 7, 2016

☔ The latest upstream changes (presumably #12294) made this pull request unmergeable. Please resolve the merge conflicts.
@bors-servo
Copy link
Contributor

bors-servo commented Jul 8, 2016

🔒 Merge conflict
Ms2ger added 4 commits Jul 7, 2016
@Ms2ger
Stop using HashCache in gfx::font.
24fe6bc 
It does not seem to make the code any more understandable.
@Ms2ger
Remove HashCache.
fa05a30
@Ms2ger
Move util::cache to style.
8dd711d
@Ms2ger
Fix a build warning in animation.rs.
Loading status checks…
e7f9959
@Ms2ger Ms2ger force-pushed the Ms2ger:cache branch from 5fb1e60 to e7f9959 Jul 8, 2016
@Ms2ger
Copy link
Contributor Author

Ms2ger commented Jul 8, 2016

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

bors-servo commented Jul 8, 2016

📌 Commit e7f9959 has been approved by nox
bors-servo added a commit that referenced this pull request Jul 8, 2016
@bors-servo
Auto merge of #12311 - Ms2ger:cache, r=nox
Loading status checks…
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

bors-servo commented Jul 8, 2016

⌛ Testing commit e7f9959 with merge d475a27...
@bors-servo
Copy link
Contributor

bors-servo commented Jul 8, 2016

☀️ 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
2 checks passed
2 checks passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@Ms2ger Ms2ger deleted the Ms2ger:cache branch Jul 11, 2016
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
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
@Ms2ger @highfive @nox @bors-servo @larsbergstrom
You can’t perform that action at this time.