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

Fix the transition to bitflags 1.0 #18958

Closed
wants to merge 1 commit into from
Closed

Fix the transition to bitflags 1.0 #18958

wants to merge 1 commit into from

Conversation

@Eijebong
Copy link
Member

Eijebong commented Oct 19, 2017 •
edited by SimonSapin

For some reasons helpers:vector_longhand doesn't want the flags parameter
to be between triple quotes leading to some wrong code generation (the
flags were just ignored...) leading to some test failures in m-c

This change is Reviewable
@Eijebong
Fix the transition to bitflags 1.0
Loading status checks…
7051f44 
For some reasons helpers:longhand doesn't want the flags parameter
to be between triple quotes leading to some wrong code generation (the
flags were just ignored...) leading to some test failures in m-c
@highfive
Copy link

highfive commented Oct 19, 2017

Heads up! This PR modifies the following files:

  • @bholley: components/style/properties/longhand/background.mako.rs, components/style/properties/longhand/font.mako.rs, components/style/properties/longhand/text.mako.rs
  • @canaltinova: components/style/properties/longhand/background.mako.rs, components/style/properties/longhand/font.mako.rs, components/style/properties/longhand/text.mako.rs
  • @emilio: components/style/properties/longhand/background.mako.rs, components/style/properties/longhand/font.mako.rs, components/style/properties/longhand/text.mako.rs
@highfive
Copy link

highfive commented Oct 19, 2017

warning Warning warning

  • These commits modify style code, but no tests are modified. Please consider adding a test!
@emilio
Copy link
Member

emilio commented Oct 19, 2017

As long as it works!

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

bors-servo commented Oct 19, 2017

📌 Commit 7051f44 has been approved by emilio
@highfive highfive assigned emilio and unassigned pcwalton Oct 19, 2017
@emilio
Copy link
Member

emilio commented Oct 19, 2017

@bors-servo p=100

  • Orange
@bors-servo
Copy link
Contributor

bors-servo commented Oct 19, 2017

⌛ Testing commit 7051f44 with merge cd354e7...
bors-servo added a commit that referenced this pull request Oct 19, 2017
@bors-servo
Auto merge of #18958 - Eijebong:fix_bitflags, r=emilio
Loading status checks…
cd354e7 
Fix the transition to bitflags 1.0

For some reasons helpers:vector_longhand doesn't want the flags parameter
to be between triple quotes leading to some wrong code generation (the
flags were just ignored...) leading to some test failures in m-c

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

bors-servo commented Oct 19, 2017

⛄ The build was interrupted to prioritize another pull request.
@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.
@Eijebong
Copy link
Member Author

Eijebong commented Oct 20, 2017

Closing this, I'll reopen a bitflags 1.0 PR later with that fix (and this time I'll run m-c tests on my PR first)
@Eijebong Eijebong closed this Oct 20, 2017
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
S-needs-rebase
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

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