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

Vendor nsstring bindings, use for text-overflow #13701

Merged
merged 2 commits into from Oct 12, 2016
Merged

Vendor nsstring bindings, use for text-overflow #13701

merged 2 commits into from Oct 12, 2016

Conversation

@Manishearth
Copy link
Member

Manishearth commented Oct 11, 2016 •
edited by larsbergstrom

From bug 1309165

This change is Reviewable
@highfive
Copy link

highfive commented Oct 11, 2016

Heads up! This PR modifies the following files:

  • @bholley: components/style/Cargo.toml, components/style/lib.rs, components/style/gecko_bindings/structs_debug.rs, components/style/gecko_bindings/structs_release.rs, components/style/gecko_bindings/nsstring_vendor/Cargo.toml, components/style/properties/gecko.mako.rs, components/style/properties/longhand/text.mako.rs, components/style/gecko_bindings/nsstring_vendor/src/lib.rs, components/style/binding_tools/regen.py
@highfive
Copy link

highfive commented Oct 11, 2016

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!
@Manishearth
Copy link
Member Author

Manishearth commented Oct 11, 2016

@bors-servo r=emilio,mystor

carry-over from bug 1309165
@bors-servo
Copy link
Contributor

bors-servo commented Oct 11, 2016

📌 Commit ea76568 has been approved by emilio,mystor
@highfive highfive assigned emilio and unassigned Ms2ger Oct 11, 2016
@Manishearth Manishearth mentioned this pull request Oct 11, 2016
Open
@Manishearth
Copy link
Member Author

Manishearth commented Oct 11, 2016

@bors-servo r-

I forgot, this is blocked on #13700
@Manishearth Manishearth mentioned this pull request Oct 11, 2016
Merged
@Manishearth Manishearth force-pushed the Manishearth:nsstring branch from ea76568 to 3583c49 Oct 12, 2016
@Manishearth Manishearth mentioned this pull request Oct 12, 2016
Closed
@bors-servo
Copy link
Contributor

bors-servo commented Oct 12, 2016

☔ The latest upstream changes (presumably #13700) made this pull request unmergeable. Please resolve the merge conflicts.
@Manishearth Manishearth force-pushed the Manishearth:nsstring branch from 3583c49 to e84d2c6 Oct 12, 2016
@Manishearth
Copy link
Member Author

Manishearth commented Oct 12, 2016

@bors-servo r=emilio,mystor
@bors-servo
Copy link
Contributor

bors-servo commented Oct 12, 2016

📌 Commit e84d2c6 has been approved by emilio,mystor
@Manishearth
Copy link
Member Author

Manishearth commented Oct 12, 2016 •
edited

@bors-servo p=1

blocks some properties, specifically quotes (which I plan to use for my Rc stuff). Also, doing a sync soon.
@bors-servo
Copy link
Contributor

bors-servo commented Oct 12, 2016

⌛ Testing commit e84d2c6 with merge b239175...
bors-servo added a commit that referenced this pull request Oct 12, 2016
@bors-servo
Auto merge of #13701 - Manishearth:nsstring, r=emilio,mystor
Loading status checks…
b239175 
Vendor nsstring bindings, use for text-overflow

From [bug 1309165](https://bugzilla.mozilla.org/show_bug.cgi?id=1309165)

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

bors-servo commented Oct 12, 2016

💔 Test failed - mac-rel-wpt1
@Manishearth Manishearth force-pushed the Manishearth:nsstring branch from e84d2c6 to e2f8578 Oct 12, 2016
@Manishearth
Copy link
Member Author

Manishearth commented Oct 12, 2016

@bors-servo r=emilio,mystor
@bors-servo
Copy link
Contributor

bors-servo commented Oct 12, 2016

📌 Commit e2f8578 has been approved by emilio,mystor
@bors-servo
Copy link
Contributor

bors-servo commented Oct 12, 2016

⌛ Testing commit e2f8578 with merge 0e31f6b...
bors-servo added a commit that referenced this pull request Oct 12, 2016
@bors-servo
Auto merge of #13701 - Manishearth:nsstring, r=emilio,mystor
Loading status checks…
0e31f6b 
Vendor nsstring bindings, use for text-overflow

From [bug 1309165](https://bugzilla.mozilla.org/show_bug.cgi?id=1309165)

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

bors-servo commented Oct 12, 2016

💔 Test failed - mac-dev-unit
Manishearth added 2 commits Oct 11, 2016
@Manishearth
Vendor m-c's nsstring in-tree
398a634 
It is called nsstring_vendor since libgkrust already depends on nsstring, and
we can't have two crates with the same name in-tree. We can't directly depend
on the in-tree one since this will stop independent `./mach build-geckolib` builds from working.

MozReview-Commit-ID: CR4tHgzXWFZ
@Manishearth
Implement text-overflow using nsstring bindings
Loading status checks…
0c793d7 
MozReview-Commit-ID: BxoFVigIOyV
@Manishearth Manishearth force-pushed the Manishearth:nsstring branch from e2f8578 to 0c793d7 Oct 12, 2016
@Manishearth
Copy link
Member Author

Manishearth commented Oct 12, 2016

@bors-servo r=emilio,mystor
@bors-servo
Copy link
Contributor

bors-servo commented Oct 12, 2016

📌 Commit 0c793d7 has been approved by emilio,mystor
@bors-servo
Copy link
Contributor

bors-servo commented Oct 12, 2016

⌛ Testing commit 0c793d7 with merge f584003...
bors-servo added a commit that referenced this pull request Oct 12, 2016
@bors-servo
Auto merge of #13701 - Manishearth:nsstring, r=emilio,mystor
Loading status checks…
f584003 
Vendor nsstring bindings, use for text-overflow

From [bug 1309165](https://bugzilla.mozilla.org/show_bug.cgi?id=1309165)

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

bors-servo commented Oct 12, 2016

☀️ Test successful - arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css, mac-rel-wpt1, mac-rel-wpt2, windows-dev
@bors-servo bors-servo merged commit 0c793d7 into servo:master Oct 12, 2016
1 of 3 checks passed
1 of 3 checks passed
continuous-integration/appveyor/pr AppVeyor build failed
Details
continuous-integration/travis-ci/pr The Travis CI build failed
Details
homu Test successful
Details
@Manishearth Manishearth deleted the Manishearth:nsstring branch Oct 12, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@emilio emilio

Labels
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

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