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

Bump string-cache to 0.2.18 #11376

Merged
merged 1 commit into from May 25, 2016
Merged

Bump string-cache to 0.2.18 #11376

merged 1 commit into from May 25, 2016
+38 −38

Conversation

@creativcoder
Copy link
Contributor

creativcoder commented May 24, 2016 •
edited by larsbergstrom

  • ./mach build -d does not report any errors
  • ./mach test-tidy --faster does not report any errors
  • These changes do not require tests because its a crate version bump.

This change is Reviewable
@highfive
Copy link

highfive commented May 24, 2016

Heads up! This PR modifies the following files:
@highfive
Copy link

highfive commented May 24, 2016

warning Warning warning

  • These commits modify gfx, layout, style, and script code, but no tests are modified. Please consider adding a test!
@nox
Copy link
Member

nox commented May 24, 2016

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

bors-servo commented May 24, 2016

📌 Commit 7b5759f has been approved by nox
@highfive highfive assigned nox and unassigned metajack May 24, 2016
@Ms2ger
Copy link
Contributor

Ms2ger commented May 24, 2016

@bors-servo r-

Forgot ports/geckolib/string_cache/Cargo.toml
@nox
Copy link
Member

nox commented May 24, 2016

There is always a string_cache version lurking somewhere. Good catch @Ms2ger.
@creativcoder
Copy link
Contributor Author

creativcoder commented May 24, 2016

@Ms2ger You are referring to this one, right ? https://github.com/servo/servo/pull/11376/files#diff-5a16eb2cfbd531b6837d925b09389868R4 . its updated.
And i did a clean build once again, and it compiles fine.
@Ms2ger
Copy link
Contributor

Ms2ger commented May 24, 2016

Sorry, overlooked that.

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

bors-servo commented May 24, 2016

📌 Commit 7b5759f has been approved by nox
@bors-servo
Copy link
Contributor

bors-servo commented May 25, 2016

☔ The latest upstream changes (presumably #11381) made this pull request unmergeable. Please resolve the merge conflicts.
@creativcoder
Bump string-cache to 0.2.18
Loading status checks…
6a0dde6
@creativcoder creativcoder force-pushed the creativcoder:update-string-cache branch from 7b5759f to 6a0dde6 May 25, 2016
@jdm
Copy link
Member

jdm commented May 25, 2016

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

bors-servo commented May 25, 2016

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

bors-servo commented May 25, 2016

⌛ Testing commit 6a0dde6 with merge 116faa7...
bors-servo added a commit that referenced this pull request May 25, 2016
@bors-servo
Auto merge of #11376 - creativcoder:update-string-cache, r=nox
Loading status checks…
116faa7 
Bump string-cache to 0.2.18

- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy --faster` does not report any errors
- [X] These changes do not require tests because its a crate version bump.

<!-- 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/11376)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented May 25, 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 6a0dde6 into servo:master May 25, 2016
3 checks passed
3 checks passed
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
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

7 participants
@creativcoder @highfive @nox @bors-servo @Ms2ger @jdm @metajack
You can’t perform that action at this time.