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 nsstring from gecko into servo/support/gecko/nsstring #18941

Merged
merged 1 commit into from Oct 20, 2017
Merged

Move nsstring from gecko into servo/support/gecko/nsstring #18941

merged 1 commit into from Oct 20, 2017

Conversation

@mystor
Copy link
Contributor

mystor commented Oct 18, 2017 •
edited by SimonSapin

This is the servo side of bug 1403213.

This cannot merge until https://bugzilla.mozilla.org/show_bug.cgi?id=1377351 merges. It is currently on inbound. This will break autoland when it merges until the gecko-side part has also landed.

This change is Reviewable
@highfive
Copy link

highfive commented Oct 18, 2017

Heads up! This PR modifies the following files:

  • @bholley: components/style/Cargo.toml, components/style/lib.rs, ports/geckolib/Cargo.toml, components/style/gecko_bindings/nsstring_vendor/Cargo.toml, components/style/gecko_bindings/nsstring_vendor/src/lib.rs
  • @canaltinova: components/style/Cargo.toml, components/style/lib.rs, components/style/gecko_bindings/nsstring_vendor/Cargo.toml, components/style/gecko_bindings/nsstring_vendor/src/lib.rs
  • @emilio: components/style/Cargo.toml, components/style/lib.rs, ports/geckolib/Cargo.toml, components/style/gecko_bindings/nsstring_vendor/Cargo.toml, components/style/gecko_bindings/nsstring_vendor/src/lib.rs
@highfive
Copy link

highfive commented Oct 18, 2017

warning Warning warning

  • These commits modify unsafe code. Please review it carefully!
  • These commits modify style code, but no tests are modified. Please consider adding a test!
@mystor
Copy link
Contributor Author

mystor commented Oct 18, 2017

r? @Manishearth
@highfive highfive assigned Manishearth and unassigned KiChjang Oct 18, 2017
@Manishearth
Copy link
Member

Manishearth commented Oct 18, 2017

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

bors-servo commented Oct 18, 2017

✌️ @mystor can now approve this pull request
@bors-servo
Copy link
Contributor

bors-servo commented Oct 18, 2017

📌 Commit d2114cc has been approved by Manishearth
@Manishearth
Copy link
Member

Manishearth commented Oct 18, 2017

@bors-servo r-

(seems like it needs to wait?)
@mystor mystor force-pushed the mystor:nsstring branch from d2114cc to dd752d3 Oct 18, 2017
@bors-servo
Copy link
Contributor

bors-servo commented Oct 19, 2017

☔ The latest upstream changes (presumably #18921) made this pull request unmergeable. Please resolve the merge conflicts.
@mystor mystor force-pushed the mystor:nsstring branch from dd752d3 to 6cc525f Oct 19, 2017
@mystor
Copy link
Contributor Author

mystor commented Oct 19, 2017

@Manishearth When you're around, I'd love it if you'd merge this & then land https://bugzilla.mozilla.org/attachment.cgi?id=8920141&action=edit on autoland to unbust it.
@Manishearth
Copy link
Member

Manishearth commented Oct 19, 2017

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

bors-servo commented Oct 19, 2017

📌 Commit 6cc525f has been approved by Manishearth
@bors-servo
Copy link
Contributor

bors-servo commented Oct 19, 2017

🔒 Merge conflict
@bors-servo
Copy link
Contributor

bors-servo commented Oct 19, 2017

☔ The latest upstream changes (presumably #18809) made this pull request unmergeable. Please resolve the merge conflicts.
@mystor mystor force-pushed the mystor:nsstring branch from 6cc525f to d64e2ff Oct 19, 2017
@bors-servo
Copy link
Contributor

bors-servo commented Oct 20, 2017

☔ The latest upstream changes (presumably #18960) made this pull request unmergeable. Please resolve the merge conflicts.
@mystor
Move nsstring from gecko into servo/support/gecko/nsstring
Loading status checks…
ec5cf5c 
This is the servo side of bug 1403213.

MozReview-Commit-ID: HFdQiuMnGhJ
@mystor mystor force-pushed the mystor:nsstring branch from d64e2ff to ec5cf5c Oct 20, 2017
@mystor
Copy link
Contributor Author

mystor commented Oct 20, 2017

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

bors-servo commented Oct 20, 2017

📌 Commit ec5cf5c has been approved by mystor
@bors-servo
Copy link
Contributor

bors-servo commented Oct 20, 2017

⌛ Testing commit ec5cf5c with merge 7e0f5af...
bors-servo added a commit that referenced this pull request Oct 20, 2017
@bors-servo
Auto merge of #18941 - mystor:nsstring, r=mystor
Loading status checks…
7e0f5af 
Move nsstring from gecko into servo/support/gecko/nsstring

This is the servo side of bug 1403213.

This cannot merge until https://bugzilla.mozilla.org/show_bug.cgi?id=1377351 merges. It is currently on inbound. This will break autoland when it merges until the gecko-side part has also landed.

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

bors-servo commented Oct 20, 2017

☀️ Test successful - android, arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css1, mac-rel-css2, mac-rel-wpt1, mac-rel-wpt2, mac-rel-wpt3, mac-rel-wpt4, windows-msvc-dev
Approved by: mystor
Pushing 7e0f5af to master...
@bors-servo bors-servo merged commit ec5cf5c into servo:master Oct 20, 2017
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
@bors-servo bors-servo mentioned this pull request Oct 20, 2017
Merged
moz-servo-sync added a commit to moz-servo-sync/servo that referenced this pull request Oct 20, 2017
Gecko Backout @moz-servo-sync
Backed out changeset 196206f129ef (bug 1403213) for referencing non-e…
662b2e7 
…xisting xpcom/rust/gtest/moz.build in xpcom/moz.build. r=backout on a CLOSED TREE

Backs out servo#18941
@moz-servo-sync moz-servo-sync mentioned this pull request Oct 20, 2017
Merged
@emilio emilio mentioned this pull request Oct 20, 2017
Merged
bors-servo added a commit that referenced this pull request Oct 20, 2017
@bors-servo
Auto merge of #18975 - emilio:gecko-backout-manually, r=emilio
Loading status checks…
e40d76d 
Backed out changeset 196206f129ef (bug 1403213) for referencing non-e…

…xisting xpcom/rust/gtest/moz.build in xpcom/moz.build. r=backout on a CLOSED TREE

Backs out #18941

Manual backout because moz-servo-sync is drunk.

<!-- 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/18975)
<!-- Reviewable:end -->
@mystor mystor mentioned this pull request Oct 23, 2017
Merged
bors-servo added a commit that referenced this pull request Oct 23, 2017
@bors-servo
Auto merge of #18993 - mystor:nsstring2, r=mystor
Loading status checks…
0e6946f 
Move nsstring from gecko into servo/support/gecko/nsstring

This is the servo side of bug 1403213.

Take 2 of #18941 which got backed out because we botched the landing of the gecko side and I wasn't able to fix it in time.

<!-- 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/18993)
<!-- Reviewable:end -->
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@Manishearth Manishearth

Labels
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
@mystor @highfive @Manishearth @bors-servo @KiChjang
You can’t perform that action at this time.