aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2016-10-16 22:46:56 -0500
committerGitHub <noreply@github.com>2016-10-16 22:46:56 -0500
commitd80bf2ada73295bc91a267d0f8f7c4a5ffb1a03f (patch)
tree82aae84df91ec2e419f24d3e9e9f27368db98830
parentb468a191cd7ea4a77b55dc8621c13a5d5e204bb1 (diff)
parentc9eae16ece332ceeba81df9518503b62854de741 (diff)
downloadservo-d80bf2ada73295bc91a267d0f8f7c4a5ffb1a03f.tar.gz
servo-d80bf2ada73295bc91a267d0f8f7c4a5ffb1a03f.zip
Auto merge of #13793 - heycam:cleanup-2, r=Manishearth
Make use statements in gecko.mako.rs neater. <!-- Please describe your changes on the following line: --> Similarly to #13792 I find the grouped `use` statements in gecko.mako.rs hard to deal with. Splitting these out to one per line should help avoid rebasing problems (which I sometimes get), is easier to read, and easier to keep sorted. r? @emilio --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [ ] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [ ] These changes fix #__ (github issue number if applicable). <!-- Either: --> - [ ] There are tests for these changes OR - [ ] These changes do not require tests because _____ <!-- 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/13793) <!-- Reviewable:end -->
-rw-r--r--components/style/properties/gecko.mako.rs24
1 files changed, 16 insertions, 8 deletions
diff --git a/components/style/properties/gecko.mako.rs b/components/style/properties/gecko.mako.rs
index bbd94e1ca29..24602685308 100644
--- a/components/style/properties/gecko.mako.rs
+++ b/components/style/properties/gecko.mako.rs
@@ -17,20 +17,28 @@ use gecko_bindings::bindings::Gecko_Construct_${style_struct.gecko_ffi_name};
use gecko_bindings::bindings::Gecko_CopyConstruct_${style_struct.gecko_ffi_name};
use gecko_bindings::bindings::Gecko_Destroy_${style_struct.gecko_ffi_name};
% endfor
-use gecko_bindings::bindings::{Gecko_CopyMozBindingFrom, Gecko_CopyListStyleTypeFrom};
-use gecko_bindings::bindings::{Gecko_SetMozBinding, Gecko_SetListStyleType};
-use gecko_bindings::bindings::{Gecko_SetNullImageValue, Gecko_SetGradientImageValue};
-use gecko_bindings::bindings::{Gecko_EnsureImageLayersLength, Gecko_CreateGradient};
-use gecko_bindings::bindings::{Gecko_CopyImageValueFrom, Gecko_CopyFontFamilyFrom};
-use gecko_bindings::bindings::{Gecko_FontFamilyList_AppendGeneric, Gecko_FontFamilyList_AppendNamed};
-use gecko_bindings::bindings::{Gecko_FontFamilyList_Clear};
+use gecko_bindings::bindings::Gecko_CopyFontFamilyFrom;
+use gecko_bindings::bindings::Gecko_CopyImageValueFrom;
+use gecko_bindings::bindings::Gecko_CopyListStyleTypeFrom;
+use gecko_bindings::bindings::Gecko_CopyMozBindingFrom;
+use gecko_bindings::bindings::Gecko_CreateGradient;
+use gecko_bindings::bindings::Gecko_EnsureImageLayersLength;
+use gecko_bindings::bindings::Gecko_FontFamilyList_AppendGeneric;
+use gecko_bindings::bindings::Gecko_FontFamilyList_AppendNamed;
+use gecko_bindings::bindings::Gecko_FontFamilyList_Clear;
+use gecko_bindings::bindings::Gecko_SetGradientImageValue;
+use gecko_bindings::bindings::Gecko_SetListStyleType;
+use gecko_bindings::bindings::Gecko_SetMozBinding;
+use gecko_bindings::bindings::Gecko_SetNullImageValue;
use gecko_bindings::bindings::ServoComputedValuesBorrowedOrNull;
use gecko_bindings::structs;
use gecko_bindings::sugar::ns_style_coord::{CoordDataValue, CoordData, CoordDataMut};
use gecko_bindings::sugar::ownership::HasArcFFI;
-use gecko::values::{StyleCoordHelpers, GeckoStyleCoordConvertible, convert_nscolor_to_rgba};
+use gecko::values::convert_nscolor_to_rgba;
use gecko::values::convert_rgba_to_nscolor;
+use gecko::values::GeckoStyleCoordConvertible;
use gecko::values::round_border_to_device_pixels;
+use gecko::values::StyleCoordHelpers;
use logical_geometry::WritingMode;
use properties::CascadePropertyFn;
use properties::longhands;