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

Opt into field bounds when deriving ToCss, instead of opting out #20237

Merged
merged 4 commits into from Mar 8, 2018
Merged

Opt into field bounds when deriving ToCss, instead of opting out #20237

merged 4 commits into from Mar 8, 2018

Conversation

@nox
Copy link
Member

nox commented Mar 8, 2018 •
edited by SimonSapin

This change is Reviewable
@highfive
Copy link

highfive commented Mar 8, 2018

Heads up! This PR modifies the following files:

  • @bholley: components/style/values/generics/border.rs, components/style/values/generics/transform.rs, components/style/values/generics/font.rs, components/style/values/generics/svg.rs, components/style/values/generics/basic_shape.rs
  • @canaltinova: components/style/values/generics/border.rs, components/style/values/generics/transform.rs, components/style/values/generics/font.rs, components/style/values/generics/svg.rs, components/style/values/generics/basic_shape.rs
  • @emilio: components/style/values/generics/border.rs, components/style/values/generics/transform.rs, components/style/values/generics/font.rs, components/style/values/generics/svg.rs, components/style/values/generics/basic_shape.rs
@highfive
Copy link

highfive commented Mar 8, 2018

warning Warning warning

  • These commits modify style code, but no tests are modified. Please consider adding a test!
@emilio
emilio approved these changes Mar 8, 2018
View changes
components/style_derive/cg.rs Outdated
pub fn add_predicate(
where_clause: &mut Option<syn::WhereClause>,
pred: WherePredicate,
) {

This comment has been minimized.

Sign in to view
@emilio

emilio Mar 8, 2018

Member 
where_clause.or_insert_with(|| parse_quote!(where)).push(pred)
@nox nox force-pushed the derive-all-the-things branch from 17e4404 to 42fd479 Mar 8, 2018
@nox
Copy link
Member Author

nox commented Mar 8, 2018

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

bors-servo commented Mar 8, 2018

📌 Commit 42fd479 has been approved by emilio
@highfive highfive assigned emilio and unassigned metajack Mar 8, 2018
@bors-servo
Copy link
Contributor

bors-servo commented Mar 8, 2018

🔒 Merge conflict
@bors-servo
Copy link
Contributor

bors-servo commented Mar 8, 2018

☔ The latest upstream changes (presumably #20236) made this pull request unmergeable. Please resolve the merge conflicts.
@nox nox force-pushed the derive-all-the-things branch from 42fd479 to 5bc8db7 Mar 8, 2018
nox added 4 commits Mar 8, 2018
@nox
Opt into field bounds when deriving ToCss, instead of opting out
859002a
@nox
Derive ToCss for Transform<T>
91e1256 
Now that #[derive(ToCss)] unconditionally bounds type params, we can derive
the trait for Transform<T>.
@nox
Derive ToCss for FontSettings<T>
36db6f9
@nox
Derive ToCss for SVGStrokeDashArray<T>
Loading status checks…
2074e89
@nox nox force-pushed the derive-all-the-things branch from 5bc8db7 to 2074e89 Mar 8, 2018
@nox
Copy link
Member Author

nox commented Mar 8, 2018

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

bors-servo commented Mar 8, 2018

📌 Commit 2074e89 has been approved by emilio
@bors-servo
Copy link
Contributor

bors-servo commented Mar 8, 2018

⌛ Testing commit 2074e89 with merge b6de056...
bors-servo added a commit that referenced this pull request Mar 8, 2018
@bors-servo
Auto merge of #20237 - servo:derive-all-the-things, r=emilio
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
b6de056 
Opt into field bounds when deriving ToCss, instead of opting out

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

bors-servo commented Mar 8, 2018

☀️ 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: emilio
Pushing b6de056 to master...
@bors-servo bors-servo mentioned this pull request Mar 8, 2018
Merged
@bors-servo bors-servo merged commit 2074e89 into master Mar 8, 2018
4 of 5 checks passed
4 of 5 checks passed
Taskcluster (pull_request) TaskGroup: failure
Details
Tidelift Dependencies checked
Details
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

@emilio emilio

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
@nox @highfive @bors-servo @emilio @metajack
You can’t perform that action at this time.