diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2017-08-23 17:18:31 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-08-23 17:18:31 -0500 |
commit | 474369618965569407d127b1e8c481e757cc59d3 (patch) | |
tree | 0b8de77ba9886000baf5c421f26364b1f77b8fcc /components/script/dom/canvasrenderingcontext2d.rs | |
parent | bde7135a3be80f8d8a4d15719394eddc97934392 (diff) | |
parent | c5fe2351124c673d1dc4d59355a03654b4fcc541 (diff) | |
download | servo-474369618965569407d127b1e8c481e757cc59d3.tar.gz servo-474369618965569407d127b1e8c481e757cc59d3.zip |
Auto merge of #18179 - davidcl:master, r=jdm
Automatically verify that derive() lists are alphabetically ordered #…
<!-- Please describe your changes on the following line: -->
Automatically verify that derive() lists are alphabetically ordered #18172
---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes fix #18172 (github issue number if applicable).
<!-- Either: -->
- [X] There are tests for these changes OR
- [ ] These changes do not require tests because _____
<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->
<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
<!-- 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/18179)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/canvasrenderingcontext2d.rs')
-rw-r--r-- | components/script/dom/canvasrenderingcontext2d.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/components/script/dom/canvasrenderingcontext2d.rs b/components/script/dom/canvasrenderingcontext2d.rs index db71c10551b..399c1faf30f 100644 --- a/components/script/dom/canvasrenderingcontext2d.rs +++ b/components/script/dom/canvasrenderingcontext2d.rs @@ -51,7 +51,7 @@ use std::sync::Arc; use unpremultiplytable::UNPREMULTIPLY_TABLE; #[must_root] -#[derive(JSTraceable, Clone, HeapSizeOf)] +#[derive(Clone, HeapSizeOf, JSTraceable)] #[allow(dead_code)] enum CanvasFillOrStrokeStyle { Color(RGBA), @@ -81,7 +81,7 @@ pub struct CanvasRenderingContext2D { } #[must_root] -#[derive(JSTraceable, Clone, HeapSizeOf)] +#[derive(Clone, HeapSizeOf, JSTraceable)] struct CanvasContextState { global_alpha: f64, global_composition: CompositionOrBlending, |